From commitssandrahenderson@example.org Tue Nov 04 00:11:53 2008 Return-Path: <commitssandrahenderson@example.org> Delivered-To: sandrahenderson@example.org Received: (qmail 49159 invoked from network); 4 Nov 2008 00:11:53 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 4 Nov 2008 00:11:53 -0000 Received: (qmail 56788 invoked by uid 500); 4 Nov 2008 00:11:59 -0000 Delivered-To: sandrahenderson@example.org Received: (qmail 56760 invoked by uid 500); 4 Nov 2008 00:11:59 -0000 Mailing-List: contact sandrahenderson@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:sandrahenderson@example.org> List-Unsubscribe: <mailto:sandrahenderson@example.org> List-Post: <mailto:sandrahenderson@example.org> List-Id: <commits.velocity.apache.org> Reply-To: sandrahenderson@example.org Delivered-To: mailing list sandrahenderson@example.org Received: (qmail 56751 invoked by uid 99); 4 Nov 2008 00:11:59 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 03 Nov 2008 16:11:59 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 Nov 2008 00:10:51 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id D94F023889BA; Mon, 3 Nov 2008 16:11:32 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r711134 - /velocity/tools/trunk/src/main/java/org/apache/velocity/tools/generic/ValueParser.java Date: Tue, 04 Nov 2008 00:11:32 -0000 To: sandrahenderson@example.org From: sandrahenderson@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <sandrahenderson@example.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: nbubna Date: Mon Nov 3 16:11:32 2008 New Revision: 711134 URL: http://svn.apache.org/viewvc?rev=711134&view=rev Log: improve some exception messages Modified: velocity/tools/trunk/src/main/java/org/apache/velocity/tools/generic/ValueParser.java Modified: velocity/tools/trunk/src/main/java/org/apache/velocity/tools/generic/ValueParser.java URL: http://svn.apache.org/viewvc/velocity/tools/trunk/src/main/java/org/apache/velocity/tools/generic/ValueParser.java?rev=711134&r1=711133&r2=711134&view=diff ============================================================================== --- velocity/tools/trunk/src/main/java/org/apache/velocity/tools/generic/ValueParser.java (original) +++ velocity/tools/trunk/src/main/java/org/apache/velocity/tools/generic/ValueParser.java Mon Nov 3 16:11:32 2008 @@ -102,6 +102,7 @@ * at any time, while preventing templates from doing so when * configure(Map) is locked. */ + @Override protected void configure(ValueParser values) { super.configure(values); @@ -534,19 +535,19 @@ } public Object put(String key, Object value) { - throw new UnsupportedOperationException("ValueParser is read-only"); + throw new UnsupportedOperationException("Cannot put("+key+","+value+"); "+getClass().getName()+" is read-only"); } public Object remove(Object key) { - throw new UnsupportedOperationException("ValueParser is read-only"); + throw new UnsupportedOperationException("Cannot remove("+key+"); "+getClass().getName()+" is read-only"); } public void putAll(Map<? extends String,? extends Object> m) { - throw new UnsupportedOperationException("ValueParser is read-only"); + throw new UnsupportedOperationException("Cannot putAll("+m+"); "+getClass().getName()+" is read-only"); } public void clear() { - throw new UnsupportedOperationException("ValueParser is read-only"); + throw new UnsupportedOperationException("Cannot clear(); "+getClass().getName()+" is read-only"); } public Set<String> keySet() { From commitssandrahenderson@example.org Tue Nov 04 00:11:57 2008 Return-Path: <commitssandrahenderson@example.org> Delivered-To: sandrahenderson@example.org Received: (qmail 49235 invoked from network); 4 Nov 2008 00:11:57 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 4 Nov 2008 00:11:57 -0000 Received: (qmail 56854 invoked by uid 500); 4 Nov 2008 00:12:03 -0000 Delivered-To: sandrahenderson@example.org Received: (qmail 56819 invoked by uid 500); 4 Nov 2008 00:12:03 -0000 Mailing-List: contact sandrahenderson@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:sandrahenderson@example.org> List-Unsubscribe: <mailto:sandrahenderson@example.org> List-Post: <mailto:sandrahenderson@example.org> List-Id: <commits.velocity.apache.org> Reply-To: sandrahenderson@example.org Delivered-To: mailing list sandrahenderson@example.org Received: (qmail 56810 invoked by uid 99); 4 Nov 2008 00:12:03 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 03 Nov 2008 16:12:03 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 Nov 2008 00:10:54 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 44BDD2388879; Mon, 3 Nov 2008 16:11:06 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r711133 - /velocity/tools/trunk/download.xml Date: Tue, 04 Nov 2008 00:11:06 -0000 To: sandrahenderson@example.org From: sandrahenderson@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <sandrahenderson@example.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: nbubna Date: Mon Nov 3 16:11:05 2008 New Revision: 711133 URL: http://svn.apache.org/viewvc?rev=711133&view=rev Log: move velocity to m2-download target Modified: velocity/tools/trunk/download.xml Modified: velocity/tools/trunk/download.xml URL: http://svn.apache.org/viewvc/velocity/tools/trunk/download.xml?rev=711133&r1=711132&r2=711133&view=diff ============================================================================== --- velocity/tools/trunk/download.xml (original) +++ velocity/tools/trunk/download.xml Mon Nov 3 16:11:05 2008 @@ -298,10 +298,10 @@ </target> <target name="velocity-download"> - <property name="download.groupId" value="velocity" /> + <property name="download.groupId" value="org/apache/velocity" /> <property name="download.artifactId" value="velocity" /> <property name="download.version" value="${jar.velocity.version}" /> - <antcall target="http-m1-download"/> + <antcall target="http-m2-download"/> </target> <target name="velocity-dvsl-download"> From commitssandrahenderson@example.org Tue Nov 04 00:13:06 2008 Return-Path: <commitssandrahenderson@example.org> Delivered-To: sandrahenderson@example.org Received: (qmail 49786 invoked from network); 4 Nov 2008 00:13:06 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 4 Nov 2008 00:13:06 -0000 Received: (qmail 57548 invoked by uid 500); 4 Nov 2008 00:13:12 -0000 Delivered-To: sandrahenderson@example.org Received: (qmail 57522 invoked by uid 500); 4 Nov 2008 00:13:12 -0000 Mailing-List: contact sandrahenderson@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:sandrahenderson@example.org> List-Unsubscribe: <mailto:sandrahenderson@example.org> List-Post: <mailto:sandrahenderson@example.org> List-Id: <commits.velocity.apache.org> Reply-To: sandrahenderson@example.org Delivered-To: mailing list sandrahenderson@example.org Received: (qmail 57513 invoked by uid 99); 4 Nov 2008 00:13:12 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 03 Nov 2008 16:13:12 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 Nov 2008 00:12:04 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 8BDC923889BA; Mon, 3 Nov 2008 16:12:15 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r711136 - in /velocity/tools/trunk/src: main/java/org/apache/velocity/tools/generic/ConversionTool.java main/java/org/apache/velocity/tools/view/ParameterTool.java test/java/org/apache/velocity/tools/ClassToolTests.java Date: Tue, 04 Nov 2008 00:12:15 -0000 To: sandrahenderson@example.org From: sandrahenderson@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <sandrahenderson@example.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: nbubna Date: Mon Nov 3 16:12:15 2008 New Revision: 711136 URL: http://svn.apache.org/viewvc?rev=711136&view=rev Log: skip setters on ConversionTool and subclasses Modified: velocity/tools/trunk/src/main/java/org/apache/velocity/tools/generic/ConversionTool.java velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view/ParameterTool.java velocity/tools/trunk/src/test/java/org/apache/velocity/tools/ClassToolTests.java Modified: velocity/tools/trunk/src/main/java/org/apache/velocity/tools/generic/ConversionTool.java URL: http://svn.apache.org/viewvc/velocity/tools/trunk/src/main/java/org/apache/velocity/tools/generic/ConversionTool.java?rev=711136&r1=711135&r2=711136&view=diff ============================================================================== --- velocity/tools/trunk/src/main/java/org/apache/velocity/tools/generic/ConversionTool.java (original) +++ velocity/tools/trunk/src/main/java/org/apache/velocity/tools/generic/ConversionTool.java Mon Nov 3 16:12:15 2008 @@ -28,6 +28,7 @@ import java.util.TimeZone; import org.apache.velocity.tools.ConversionUtils; import org.apache.velocity.tools.config.DefaultKey; +import org.apache.velocity.tools.config.SkipSetters; /** * <p>Utility class for easy conversion of String values to richer types.</p> @@ -53,6 +54,7 @@ * @since VelocityTools 2.0 */ @DefaultKey("convert") +@SkipSetters public class ConversionTool extends LocaleConfig { public static final String STRINGS_DELIMITER_FORMAT_KEY = "stringsDelimiter"; Modified: velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view/ParameterTool.java URL: http://svn.apache.org/viewvc/velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view/ParameterTool.java?rev=711136&r1=711135&r2=711136&view=diff ============================================================================== --- velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view/ParameterTool.java (original) +++ velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view/ParameterTool.java Mon Nov 3 16:12:15 2008 @@ -78,6 +78,15 @@ setRequest(request); } + @Override + protected void configure(ValueParser values) + { + super.configure(values); + + ServletRequest req = (ServletRequest)values.get(ViewContext.REQUEST); + setRequest(req); + } + /** * Sets the current {@link ServletRequest} * Modified: velocity/tools/trunk/src/test/java/org/apache/velocity/tools/ClassToolTests.java URL: http://svn.apache.org/viewvc/velocity/tools/trunk/src/test/java/org/apache/velocity/tools/ClassToolTests.java?rev=711136&r1=711135&r2=711136&view=diff ============================================================================== --- velocity/tools/trunk/src/test/java/org/apache/velocity/tools/ClassToolTests.java (original) +++ velocity/tools/trunk/src/test/java/org/apache/velocity/tools/ClassToolTests.java Mon Nov 3 16:12:15 2008 @@ -107,7 +107,8 @@ classTool.setType(MyDeprecated.class); assertEquals(1, classTool.getAnnotations().size()); classTool.setType(ValueParser.class); - Annotation defaultKey = classTool.getAnnotations().get(0); + assertEquals(2, classTool.getAnnotations().size()); + Annotation defaultKey = classTool.getAnnotations().get(1); assertEquals(defaultKey.annotationType(), DefaultKey.class); } From commitssandrahenderson@example.org Wed Nov 05 20:21:35 2008 Return-Path: <commitssandrahenderson@example.org> Delivered-To: sandrahenderson@example.org Received: (qmail 67134 invoked from network); 5 Nov 2008 20:21:34 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 5 Nov 2008 20:21:34 -0000 Received: (qmail 30665 invoked by uid 500); 5 Nov 2008 20:21:41 -0000 Delivered-To: sandrahenderson@example.org Received: (qmail 30635 invoked by uid 500); 5 Nov 2008 20:21:41 -0000 Mailing-List: contact sandrahenderson@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:sandrahenderson@example.org> List-Unsubscribe: <mailto:sandrahenderson@example.org> List-Post: <mailto:sandrahenderson@example.org> List-Id: <commits.velocity.apache.org> Reply-To: sandrahenderson@example.org Delivered-To: mailing list sandrahenderson@example.org Received: (qmail 30626 invoked by uid 99); 5 Nov 2008 20:21:41 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 05 Nov 2008 12:21:41 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 05 Nov 2008 20:20:32 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 1B36523888A2; Wed, 5 Nov 2008 12:21:14 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r711683 - /velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view/VelocityViewServlet.java Date: Wed, 05 Nov 2008 20:21:12 -0000 To: sandrahenderson@example.org From: sandrahenderson@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <sandrahenderson@example.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: nbubna Date: Wed Nov 5 12:21:11 2008 New Revision: 711683 URL: http://svn.apache.org/viewvc?rev=711683&view=rev Log: de-deprecate handleRequest, as users (like Martin Thelian) have more valid use-cases for it than were guessed Modified: velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view/VelocityViewServlet.java Modified: velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view/VelocityViewServlet.java URL: http://svn.apache.org/viewvc/velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view/VelocityViewServlet.java?rev=711683&r1=711682&r2=711683&view=diff ============================================================================== --- velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view/VelocityViewServlet.java (original) +++ velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view/VelocityViewServlet.java Wed Nov 5 12:21:11 2008 @@ -225,16 +225,15 @@ /** - * <p>This was a common extension point, but has been deprecated. - * It has no single replacement. Instead, you should override - * {@link #fillContext} to add custom things to the {@link Context} - * or override a {@link #getTemplate} method to change how - * {@link Template}s are retrieved</p> + * <p>This was a common extension point, but now it is usually + * simpler to override {@link #fillContext} to add custom things + * to the {@link Context} or override a {@link #getTemplate} + * method to change how {@link Template}s are retrieved. + * This is only recommended for more complicated use-cases.</p> * * @param request client request * @param response client response * @param ctx VelocityContext to fill - * @deprecated This will be removed in VelocityTools 2.1. * @return Velocity Template object or null */ protected Template handleRequest(HttpServletRequest request, From commitssandrahenderson@example.org Wed Nov 05 21:27:32 2008 Return-Path: <commitssandrahenderson@example.org> Delivered-To: sandrahenderson@example.org Received: (qmail 86854 invoked from network); 5 Nov 2008 21:27:31 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 5 Nov 2008 21:27:31 -0000 Received: (qmail 91610 invoked by uid 500); 5 Nov 2008 21:27:38 -0000 Delivered-To: sandrahenderson@example.org Received: (qmail 91586 invoked by uid 500); 5 Nov 2008 21:27:38 -0000 Mailing-List: contact sandrahenderson@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:sandrahenderson@example.org> List-Unsubscribe: <mailto:sandrahenderson@example.org> List-Post: <mailto:sandrahenderson@example.org> List-Id: <commits.velocity.apache.org> Reply-To: sandrahenderson@example.org Delivered-To: mailing list sandrahenderson@example.org Received: (qmail 91577 invoked by uid 99); 5 Nov 2008 21:27:38 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 05 Nov 2008 13:27:38 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 05 Nov 2008 21:26:29 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id F181323888A2; Wed, 5 Nov 2008 13:26:40 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r711703 - in /velocity/engine/trunk/src: java/org/apache/velocity/util/introspection/UberspectImpl.java test/org/apache/velocity/test/VarargMethodsTestCase.java Date: Wed, 05 Nov 2008 21:26:40 -0000 To: sandrahenderson@example.org From: sandrahenderson@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <sandrahenderson@example.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: nbubna Date: Wed Nov 5 13:26:40 2008 New Revision: 711703 URL: http://svn.apache.org/viewvc?rev=711703&view=rev Log: VELOCITY-642 take more care in handling arrays passed to vararg methods Modified: velocity/engine/trunk/src/java/org/apache/velocity/util/introspection/UberspectImpl.java velocity/engine/trunk/src/test/org/apache/velocity/test/VarargMethodsTestCase.java Modified: velocity/engine/trunk/src/java/org/apache/velocity/util/introspection/UberspectImpl.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/java/org/apache/velocity/util/introspection/UberspectImpl.java?rev=711703&r1=711702&r2=711703&view=diff ============================================================================== --- velocity/engine/trunk/src/java/org/apache/velocity/util/introspection/UberspectImpl.java (original) +++ velocity/engine/trunk/src/java/org/apache/velocity/util/introspection/UberspectImpl.java Wed Nov 5 13:26:40 2008 @@ -437,8 +437,10 @@ else if (actual.length == index + 1) { // make sure the last arg is an array of the expected type - if (IntrospectionUtils.isMethodInvocationConvertible(type, - actual[index].getClass(), + Class argClass = actual[index].getClass(); + if (!argClass.isArray() && + IntrospectionUtils.isMethodInvocationConvertible(type, + argClass, false)) { // create a 1-length array to hold and replace the last param Modified: velocity/engine/trunk/src/test/org/apache/velocity/test/VarargMethodsTestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/test/org/apache/velocity/test/VarargMethodsTestCase.java?rev=711703&r1=711702&r2=711703&view=diff ============================================================================== --- velocity/engine/trunk/src/test/org/apache/velocity/test/VarargMethodsTestCase.java (original) +++ velocity/engine/trunk/src/test/org/apache/velocity/test/VarargMethodsTestCase.java Wed Nov 5 13:26:40 2008 @@ -19,6 +19,7 @@ * under the License. */ +import java.util.Arrays; import org.apache.velocity.VelocityContext; /** @@ -109,6 +110,12 @@ assertEvalEquals("noargs", "$nasty.test()"); } + public void testPassingArrayToVarArgVelocity642() + { + assertEvalEquals("[one, two]", "$nasty.test642($strings)"); + assertEvalEquals("[1, 2]", "#set( $list = [1..2] )$nasty.test642($list.toArray())"); + } + public static class NiceTool @@ -192,6 +199,11 @@ return "object,string"; } + public String test642(Object[] array) + { + return Arrays.deepToString(array); + } + } } From commitssandrahenderson@example.org Wed Nov 05 21:29:35 2008 Return-Path: <commitssandrahenderson@example.org> Delivered-To: sandrahenderson@example.org Received: (qmail 89301 invoked from network); 5 Nov 2008 21:29:28 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 5 Nov 2008 21:29:28 -0000 Received: (qmail 97183 invoked by uid 500); 5 Nov 2008 21:29:34 -0000 Delivered-To: sandrahenderson@example.org Received: (qmail 97156 invoked by uid 500); 5 Nov 2008 21:29:34 -0000 Mailing-List: contact sandrahenderson@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:sandrahenderson@example.org> List-Unsubscribe: <mailto:sandrahenderson@example.org> List-Post: <mailto:sandrahenderson@example.org> List-Id: <commits.velocity.apache.org> Reply-To: sandrahenderson@example.org Delivered-To: mailing list sandrahenderson@example.org Received: (qmail 97147 invoked by uid 99); 5 Nov 2008 21:29:34 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 05 Nov 2008 13:29:34 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 05 Nov 2008 21:28:25 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id AA27A23889A0; Wed, 5 Nov 2008 13:29:07 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r711705 - /velocity/engine/trunk/src/changes/changes.xml Date: Wed, 05 Nov 2008 21:29:07 -0000 To: sandrahenderson@example.org From: sandrahenderson@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <sandrahenderson@example.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: nbubna Date: Wed Nov 5 13:29:07 2008 New Revision: 711705 URL: http://svn.apache.org/viewvc?rev=711705&view=rev Log: document vararg fix Modified: velocity/engine/trunk/src/changes/changes.xml Modified: velocity/engine/trunk/src/changes/changes.xml URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/changes/changes.xml?rev=711705&r1=711704&r2=711705&view=diff ============================================================================== --- velocity/engine/trunk/src/changes/changes.xml (original) +++ velocity/engine/trunk/src/changes/changes.xml Wed Nov 5 13:29:07 2008 @@ -27,6 +27,11 @@ <body> <release version="1.6" date="In Subversion"> + <action type="fix" dev="nbubna" issue="VELOCITY-642" due-to="Ilkka Priha"> + Fix bug in vararg support where an array passed to a vararg method + was being wrapped in another array. + </action> + <action type="fix" dev="nbubna" issue="VELOCITY-638" due-to="Benjamin Bentmann"> Locked down versions for reporting plugins in Maven POM. </action> From commitssandrahenderson@example.org Thu Nov 06 23:36:14 2008 Return-Path: <commitssandrahenderson@example.org> Delivered-To: sandrahenderson@example.org Received: (qmail 89648 invoked from network); 6 Nov 2008 23:36:13 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 6 Nov 2008 23:36:13 -0000 Received: (qmail 27612 invoked by uid 500); 6 Nov 2008 23:36:20 -0000 Delivered-To: sandrahenderson@example.org Received: (qmail 27576 invoked by uid 500); 6 Nov 2008 23:36:20 -0000 Mailing-List: contact sandrahenderson@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:sandrahenderson@example.org> List-Unsubscribe: <mailto:sandrahenderson@example.org> List-Post: <mailto:sandrahenderson@example.org> List-Id: <commits.velocity.apache.org> Reply-To: sandrahenderson@example.org Delivered-To: mailing list sandrahenderson@example.org Received: (qmail 27566 invoked by uid 99); 6 Nov 2008 23:36:20 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 06 Nov 2008 15:36:20 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 06 Nov 2008 23:35:10 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id D14CE2388975; Thu, 6 Nov 2008 15:35:52 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r712011 - /velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view/WebappResourceLoader.java Date: Thu, 06 Nov 2008 23:35:49 -0000 To: sandrahenderson@example.org From: sandrahenderson@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <sandrahenderson@example.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: nbubna Date: Thu Nov 6 15:35:43 2008 New Revision: 712011 URL: http://svn.apache.org/viewvc?rev=712011&view=rev Log: small logging and exception handling improvements Modified: velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view/WebappResourceLoader.java Modified: velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view/WebappResourceLoader.java URL: http://svn.apache.org/viewvc/velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view/WebappResourceLoader.java?rev=712011&r1=712010&r2=712011&view=diff ============================================================================== --- velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view/WebappResourceLoader.java (original) +++ velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view/WebappResourceLoader.java Thu Nov 6 15:35:43 2008 @@ -58,6 +58,7 @@ protected HashMap templatePaths = null; protected ServletContext servletContext = null; + /** * This is abstract in the base class, so we need it. * <br> @@ -138,9 +139,10 @@ Exception exception = null; for (int i = 0; i < paths.length; i++) { + String path = paths[i] + name; try { - result = servletContext.getResourceAsStream(paths[i] + name); + result = servletContext.getResourceAsStream(path); /* save the path and exit the loop if we found the template */ if (result != null) @@ -149,11 +151,20 @@ break; } } + catch (NullPointerException npe) + { + /* no servletContext was set, whine about it! */ + throw npe; + } catch (Exception e) { /* only save the first one for later throwing */ if (exception == null) { + if (log.isDebugEnabled()) + { + log.debug("WebappResourceLoader: Could not load "+path, e); + } exception = e; } } @@ -162,19 +173,19 @@ /* if we never found the template */ if (result == null) { - String msg; + String msg = "WebappResourceLoader: Resource '" + name + "' not found."; + + /* convert to a general Velocity ResourceNotFoundException */ if (exception == null) { - msg = "WebappResourceLoader: Resource '" + name + "' not found."; + throw new ResourceNotFoundException(msg); } else { - msg = exception.getMessage(); + msg += " Due to: " + exception; + throw new ResourceNotFoundException(msg, exception); } - /* convert to a general Velocity ResourceNotFoundException */ - throw new ResourceNotFoundException(msg); } - return result; } From commitssandrahenderson@example.org Thu Nov 06 23:37:38 2008 Return-Path: <commitssandrahenderson@example.org> Delivered-To: sandrahenderson@example.org Received: (qmail 90023 invoked from network); 6 Nov 2008 23:37:38 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 6 Nov 2008 23:37:37 -0000 Received: (qmail 28679 invoked by uid 500); 6 Nov 2008 23:37:44 -0000 Delivered-To: sandrahenderson@example.org Received: (qmail 28651 invoked by uid 500); 6 Nov 2008 23:37:44 -0000 Mailing-List: contact sandrahenderson@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:sandrahenderson@example.org> List-Unsubscribe: <mailto:sandrahenderson@example.org> List-Post: <mailto:sandrahenderson@example.org> List-Id: <commits.velocity.apache.org> Reply-To: sandrahenderson@example.org Delivered-To: mailing list sandrahenderson@example.org Received: (qmail 28642 invoked by uid 99); 6 Nov 2008 23:37:44 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 06 Nov 2008 15:37:44 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 06 Nov 2008 23:36:35 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 300E32388879; Thu, 6 Nov 2008 15:36:47 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r712012 - /velocity/tools/trunk/src/test/java/org/apache/velocity/tools/ClassToolTests.java Date: Thu, 06 Nov 2008 23:36:45 -0000 To: sandrahenderson@example.org From: sandrahenderson@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <sandrahenderson@example.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: nbubna Date: Thu Nov 6 15:36:41 2008 New Revision: 712012 URL: http://svn.apache.org/viewvc?rev=712012&view=rev Log: check for both annotations on ValueParser and don't be picky about the order Modified: velocity/tools/trunk/src/test/java/org/apache/velocity/tools/ClassToolTests.java Modified: velocity/tools/trunk/src/test/java/org/apache/velocity/tools/ClassToolTests.java URL: http://svn.apache.org/viewvc/velocity/tools/trunk/src/test/java/org/apache/velocity/tools/ClassToolTests.java?rev=712012&r1=712011&r2=712012&view=diff ============================================================================== --- velocity/tools/trunk/src/test/java/org/apache/velocity/tools/ClassToolTests.java (original) +++ velocity/tools/trunk/src/test/java/org/apache/velocity/tools/ClassToolTests.java Thu Nov 6 15:36:41 2008 @@ -28,6 +28,7 @@ import java.util.Set; import org.apache.velocity.runtime.log.Log; import org.apache.velocity.tools.config.DefaultKey; +import org.apache.velocity.tools.config.SkipSetters; import org.apache.velocity.tools.generic.ValueParser; import org.apache.velocity.tools.view.AbstractSearchTool; @@ -108,8 +109,11 @@ assertEquals(1, classTool.getAnnotations().size()); classTool.setType(ValueParser.class); assertEquals(2, classTool.getAnnotations().size()); - Annotation defaultKey = classTool.getAnnotations().get(1); - assertEquals(defaultKey.annotationType(), DefaultKey.class); + Class type0 = classTool.getAnnotations().get(0).annotationType(); + Class type1 = classTool.getAnnotations().get(1).annotationType(); + assertTrue(type0 != type1); + assertTrue(type0 == DefaultKey.class || type1 == DefaultKey.class); + assertTrue(type0 == SkipSetters.class || type1 == SkipSetters.class); } public @Test void methodGetConstructors() throws Exception From commitssandrahenderson@example.org Thu Nov 06 23:41:16 2008 Return-Path: <commitssandrahenderson@example.org> Delivered-To: sandrahenderson@example.org Received: (qmail 90570 invoked from network); 6 Nov 2008 23:41:16 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 6 Nov 2008 23:41:16 -0000 Received: (qmail 32784 invoked by uid 500); 6 Nov 2008 23:41:22 -0000 Delivered-To: sandrahenderson@example.org Received: (qmail 32748 invoked by uid 500); 6 Nov 2008 23:41:22 -0000 Mailing-List: contact sandrahenderson@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:sandrahenderson@example.org> List-Unsubscribe: <mailto:sandrahenderson@example.org> List-Post: <mailto:sandrahenderson@example.org> List-Id: <commits.velocity.apache.org> Reply-To: sandrahenderson@example.org Delivered-To: mailing list sandrahenderson@example.org Received: (qmail 32739 invoked by uid 99); 6 Nov 2008 23:41:22 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 06 Nov 2008 15:41:22 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 06 Nov 2008 23:40:13 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id B8FD02388879; Thu, 6 Nov 2008 15:40:24 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r712013 - in /velocity/tools/trunk/src/main/java/org/apache/velocity/tools: config/SkipSetters.java generic/LinkTool.java view/tools/LinkTool.java Date: Thu, 06 Nov 2008 23:40:18 -0000 To: sandrahenderson@example.org From: sandrahenderson@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <sandrahenderson@example.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: nbubna Date: Thu Nov 6 15:40:10 2008 New Revision: 712013 URL: http://svn.apache.org/viewvc?rev=712013&view=rev Log: fix javadoc warnings Modified: velocity/tools/trunk/src/main/java/org/apache/velocity/tools/config/SkipSetters.java velocity/tools/trunk/src/main/java/org/apache/velocity/tools/generic/LinkTool.java velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view/tools/LinkTool.java Modified: velocity/tools/trunk/src/main/java/org/apache/velocity/tools/config/SkipSetters.java URL: http://svn.apache.org/viewvc/velocity/tools/trunk/src/main/java/org/apache/velocity/tools/config/SkipSetters.java?rev=712013&r1=712012&r2=712013&view=diff ============================================================================== --- velocity/tools/trunk/src/main/java/org/apache/velocity/tools/config/SkipSetters.java (original) +++ velocity/tools/trunk/src/main/java/org/apache/velocity/tools/config/SkipSetters.java Thu Nov 6 15:40:10 2008 @@ -27,8 +27,8 @@ import java.lang.annotation.Target; /** - * Annotation specifying that {@link ToolInfo} should only - * use the public void configure(Map) method for configuration of + * Annotation specifying that {@link org.apache.velocity.tools.ToolInfo} + * should only use the public void configure(Map) method for configuration of * a tool, and skip over the step of trying to find individual * property setters. * Modified: velocity/tools/trunk/src/main/java/org/apache/velocity/tools/generic/LinkTool.java URL: http://svn.apache.org/viewvc/velocity/tools/trunk/src/main/java/org/apache/velocity/tools/generic/LinkTool.java?rev=712013&r1=712012&r2=712013&view=diff ============================================================================== --- velocity/tools/trunk/src/main/java/org/apache/velocity/tools/generic/LinkTool.java (original) +++ velocity/tools/trunk/src/main/java/org/apache/velocity/tools/generic/LinkTool.java Thu Nov 6 15:40:10 2008 @@ -286,7 +286,7 @@ } /** - * Sets whether or not the {@link #setParam(Object,Object)} method + * Sets whether or not the {@link #setParam} method * will override existing query values for the same key or simply append * the new value to a list of existing values. */ @@ -1469,7 +1469,7 @@ * <p>Adds a key=value pair to the query data. Whether * this new query pair is appended to the current query * or overwrites any previous pair(s) with the same key - * is controlled by the {@link #getAppendsParam} value. + * is controlled by the {@link #getAppendParams} value. * The default behavior is to append.</p> * * @param key key of new query parameter Modified: velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view/tools/LinkTool.java URL: http://svn.apache.org/viewvc/velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view/tools/LinkTool.java?rev=712013&r1=712012&r2=712013&view=diff ============================================================================== --- velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view/tools/LinkTool.java (original) +++ velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view/tools/LinkTool.java Thu Nov 6 15:40:10 2008 @@ -141,7 +141,7 @@ // --------------------------------------------- Template Methods ----------- /** - * @deprecated use {@link #anchor(String)} instead + * @deprecated use {@link #anchor(Object)} instead */ @Deprecated public LinkTool setAnchor(String anchor) From commitssandrahenderson@example.org Tue Nov 11 00:28:13 2008 Return-Path: <commitssandrahenderson@example.org> Delivered-To: sandrahenderson@example.org Received: (qmail 36557 invoked from network); 11 Nov 2008 00:28:12 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 11 Nov 2008 00:28:12 -0000 Received: (qmail 26393 invoked by uid 500); 11 Nov 2008 00:28:19 -0000 Delivered-To: sandrahenderson@example.org Received: (qmail 26360 invoked by uid 500); 11 Nov 2008 00:28:19 -0000 Mailing-List: contact sandrahenderson@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:sandrahenderson@example.org> List-Unsubscribe: <mailto:sandrahenderson@example.org> List-Post: <mailto:sandrahenderson@example.org> List-Id: <commits.velocity.apache.org> Reply-To: sandrahenderson@example.org Delivered-To: mailing list sandrahenderson@example.org Received: (qmail 26351 invoked by uid 99); 11 Nov 2008 00:28:19 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 10 Nov 2008 16:28:19 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 11 Nov 2008 00:27:08 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 5541B238898F; Mon, 10 Nov 2008 16:27:51 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r712887 - in /velocity/engine/trunk/src: java/org/apache/velocity/runtime/parser/node/ASTAddNode.java test/org/apache/velocity/test/StringConcatenationTestCase.java Date: Tue, 11 Nov 2008 00:27:51 -0000 To: sandrahenderson@example.org From: sandrahenderson@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <sandrahenderson@example.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: nbubna Date: Mon Nov 10 16:27:50 2008 New Revision: 712887 URL: http://svn.apache.org/viewvc?rev=712887&view=rev Log: add string concatenation tests and fix NPE when concatenating string with null reference Added: velocity/engine/trunk/src/test/org/apache/velocity/test/StringConcatenationTestCase.java (with props) Modified: velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTAddNode.java Modified: velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTAddNode.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTAddNode.java?rev=712887&r1=712886&r2=712887&view=diff ============================================================================== --- velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTAddNode.java (original) +++ velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTAddNode.java Mon Nov 10 16:27:50 2008 @@ -61,6 +61,14 @@ */ if (left instanceof String || right instanceof String) { + if (left == null) + { + left = jjtGetChild(0).literal(); + } + else if (right == null) + { + right = jjtGetChild(1).literal(); + } return left.toString().concat(right.toString()); } return null; Added: velocity/engine/trunk/src/test/org/apache/velocity/test/StringConcatenationTestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/test/org/apache/velocity/test/StringConcatenationTestCase.java?rev=712887&view=auto ============================================================================== --- velocity/engine/trunk/src/test/org/apache/velocity/test/StringConcatenationTestCase.java (added) +++ velocity/engine/trunk/src/test/org/apache/velocity/test/StringConcatenationTestCase.java Mon Nov 10 16:27:50 2008 @@ -0,0 +1,69 @@ +package org.apache.velocity.test; + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import org.apache.velocity.VelocityContext; +import org.apache.velocity.exception.MathException; +import org.apache.velocity.runtime.RuntimeConstants; + +/** + * This class tests support for string concatenation. + */ +public class StringConcatenationTestCase extends BaseEvalTestCase +{ + public StringConcatenationTestCase(String name) + { + super(name); + } + + public void setUp() throws Exception + { + super.setUp(); + DEBUG = true; + context.put("foo", "foo"); + context.put("baz", "baz"); + } + + public void testStringRefLeft() + { + assertEvalEquals("foobar", "#set( $o = $foo + 'bar' )$o"); + assertEvalEquals("foo$bar", "#set( $o = $foo + $bar )$o"); + assertEvalEquals("foo1", "#set( $o = $foo + 1 )$o"); + assertEvalEquals("foobaz", "#set( $o = $foo + $baz )$o"); + } + + public void testStringRefRight() + { + assertEvalEquals("barfoo", "#set( $o = 'bar' + $foo )$o"); + assertEvalEquals("$barfoo", "#set( $o = $bar + $foo )$o"); + assertEvalEquals("1foo", "#set( $o = 1 + $foo )$o"); + } + + public void testNoRef() + { + assertEvalEquals("bar1", "#set( $o = 'bar' + 1 )$o"); + } + + public void testAll() + { + assertEvalEquals("foobar$bar1baz", "#set( $o = $foo + 'bar' + $bar + 1 + $baz )$o"); + } + +} Propchange: velocity/engine/trunk/src/test/org/apache/velocity/test/StringConcatenationTestCase.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: velocity/engine/trunk/src/test/org/apache/velocity/test/StringConcatenationTestCase.java ------------------------------------------------------------------------------ svn:executable = * Propchange: velocity/engine/trunk/src/test/org/apache/velocity/test/StringConcatenationTestCase.java ------------------------------------------------------------------------------ svn:keywords = Revision Propchange: velocity/engine/trunk/src/test/org/apache/velocity/test/StringConcatenationTestCase.java ------------------------------------------------------------------------------ svn:mime-type = text/plain From commitssandrahenderson@example.org Wed Nov 12 13:04:39 2008 Return-Path: <commitssandrahenderson@example.org> Delivered-To: sandrahenderson@example.org Received: (qmail 11132 invoked from network); 12 Nov 2008 13:04:39 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 12 Nov 2008 13:04:39 -0000 Received: (qmail 2191 invoked by uid 500); 12 Nov 2008 13:04:47 -0000 Delivered-To: sandrahenderson@example.org Received: (qmail 2169 invoked by uid 500); 12 Nov 2008 13:04:47 -0000 Mailing-List: contact sandrahenderson@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:sandrahenderson@example.org> List-Unsubscribe: <mailto:sandrahenderson@example.org> List-Post: <mailto:sandrahenderson@example.org> List-Id: <commits.velocity.apache.org> Reply-To: sandrahenderson@example.org Delivered-To: mailing list sandrahenderson@example.org Received: (qmail 2160 invoked by uid 99); 12 Nov 2008 13:04:46 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 12 Nov 2008 05:04:46 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 12 Nov 2008 13:03:35 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id ED6E1238893B; Wed, 12 Nov 2008 05:03:48 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r713359 - /velocity/engine/trunk/src/java/org/apache/velocity/runtime/defaults/velocity.properties Date: Wed, 12 Nov 2008 13:03:48 -0000 To: sandrahenderson@example.org From: sandrahenderson@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <sandrahenderson@example.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: cbrisson Date: Wed Nov 12 05:03:48 2008 New Revision: 713359 URL: http://svn.apache.org/viewvc?rev=713359&view=rev Log: add an entry for runtime.references.strict in the default velocity.properties Modified: velocity/engine/trunk/src/java/org/apache/velocity/runtime/defaults/velocity.properties Modified: velocity/engine/trunk/src/java/org/apache/velocity/runtime/defaults/velocity.properties URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/java/org/apache/velocity/runtime/defaults/velocity.properties?rev=713359&r1=713358&r2=713359&view=diff ============================================================================== --- velocity/engine/trunk/src/java/org/apache/velocity/runtime/defaults/velocity.properties (original) +++ velocity/engine/trunk/src/java/org/apache/velocity/runtime/defaults/velocity.properties Wed Nov 12 05:03:48 2008 @@ -126,6 +126,17 @@ # ---------------------------------------------------------------------------- velocimacro.arguments.strict = false +# ---------------------------------------------------------------------------- +# STRICT REFERENCE MODE +# ---------------------------------------------------------------------------- +# if true, will throw a MethodInvocationException for references +# that are not defined in the context, or have not been defined +# with a #set directive. This setting will also throw an exception +# if an attempt is made to call a non-existing property on an object +# or if the object is null. When this property is true then property +# 'directive.set.null.allowed' is also set to true. +# ---------------------------------------------------------------------------- +runtime.references.strict = false # ---------------------------------------------------------------------------- # INTERPOLATION From commitssandrahenderson@example.org Mon Nov 17 17:57:34 2008 Return-Path: <commitssandrahenderson@example.org> Delivered-To: sandrahenderson@example.org Received: (qmail 76433 invoked from network); 17 Nov 2008 17:57:34 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 17 Nov 2008 17:57:34 -0000 Received: (qmail 2632 invoked by uid 500); 17 Nov 2008 17:57:42 -0000 Delivered-To: sandrahenderson@example.org Received: (qmail 2607 invoked by uid 500); 17 Nov 2008 17:57:42 -0000 Mailing-List: contact sandrahenderson@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:sandrahenderson@example.org> List-Unsubscribe: <mailto:sandrahenderson@example.org> List-Post: <mailto:sandrahenderson@example.org> List-Id: <commits.velocity.apache.org> Reply-To: sandrahenderson@example.org Delivered-To: mailing list sandrahenderson@example.org Received: (qmail 2597 invoked by uid 99); 17 Nov 2008 17:57:42 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 17 Nov 2008 09:57:42 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 17 Nov 2008 17:56:28 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 79ACA2388886; Mon, 17 Nov 2008 09:56:43 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r718298 - /velocity/engine/trunk/src/test/org/apache/velocity/test/BaseEvalTestCase.java Date: Mon, 17 Nov 2008 17:56:43 -0000 To: sandrahenderson@example.org From: sandrahenderson@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <sandrahenderson@example.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: nbubna Date: Mon Nov 17 09:56:43 2008 New Revision: 718298 URL: http://svn.apache.org/viewvc?rev=718298&view=rev Log: add another assertion method Modified: velocity/engine/trunk/src/test/org/apache/velocity/test/BaseEvalTestCase.java Modified: velocity/engine/trunk/src/test/org/apache/velocity/test/BaseEvalTestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/test/org/apache/velocity/test/BaseEvalTestCase.java?rev=718298&r1=718297&r2=718298&view=diff ============================================================================== --- velocity/engine/trunk/src/test/org/apache/velocity/test/BaseEvalTestCase.java (original) +++ velocity/engine/trunk/src/test/org/apache/velocity/test/BaseEvalTestCase.java Mon Nov 17 09:56:43 2008 @@ -81,6 +81,20 @@ // extension hook } + protected void assertContextValue(String key, Object expected) + { + if (DEBUG) + { + engine.getLog().info("Expected value of '"+key+"': "+expected); + } + Object value = context.get(key); + if (DEBUG) + { + engine.getLog().info("Result: "+value); + } + assertEquals(expected, value); + } + protected void assertEvalEquals(String expected, String template) { if (DEBUG) From commitssandrahenderson@example.org Mon Nov 17 18:00:04 2008 Return-Path: <commitssandrahenderson@example.org> Delivered-To: sandrahenderson@example.org Received: (qmail 78031 invoked from network); 17 Nov 2008 18:00:04 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 17 Nov 2008 18:00:04 -0000 Received: (qmail 3719 invoked by uid 500); 17 Nov 2008 18:00:12 -0000 Delivered-To: sandrahenderson@example.org Received: (qmail 3691 invoked by uid 500); 17 Nov 2008 18:00:12 -0000 Mailing-List: contact sandrahenderson@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:sandrahenderson@example.org> List-Unsubscribe: <mailto:sandrahenderson@example.org> List-Post: <mailto:sandrahenderson@example.org> List-Id: <commits.velocity.apache.org> Reply-To: sandrahenderson@example.org Delivered-To: mailing list sandrahenderson@example.org Received: (qmail 3682 invoked by uid 99); 17 Nov 2008 18:00:12 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 17 Nov 2008 10:00:12 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 17 Nov 2008 17:58:59 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 2E3892388886; Mon, 17 Nov 2008 09:59:44 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r718302 - in /velocity/engine/trunk: examples/anakia/ xdocs/docs/anakia.xml xdocs/docs/texen.xml xdocs/stylesheets/project.xml Date: Mon, 17 Nov 2008 17:59:43 -0000 To: sandrahenderson@example.org From: sandrahenderson@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <sandrahenderson@example.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: nbubna Date: Mon Nov 17 09:59:43 2008 New Revision: 718302 URL: http://svn.apache.org/viewvc?rev=718302&view=rev Log: VELOCITY-640 remove some outdated anakia and texen stuff Removed: velocity/engine/trunk/examples/anakia/ velocity/engine/trunk/xdocs/docs/anakia.xml velocity/engine/trunk/xdocs/docs/texen.xml Modified: velocity/engine/trunk/xdocs/stylesheets/project.xml Modified: velocity/engine/trunk/xdocs/stylesheets/project.xml URL: http://svn.apache.org/viewvc/velocity/engine/trunk/xdocs/stylesheets/project.xml?rev=718302&r1=718301&r2=718302&view=diff ============================================================================== --- velocity/engine/trunk/xdocs/stylesheets/project.xml (original) +++ velocity/engine/trunk/xdocs/stylesheets/project.xml Mon Nov 17 09:59:43 2008 @@ -39,8 +39,6 @@ <item name="Developer Guide" href="/developer-guide.html"/> <item name="VTL Reference" href="/vtl-reference-guide.html"/> <item name="Glossary" href="/glossary.html"/> - <item name="Anakia: XML->doc tool" href="/anakia.html"/> - <item name="Texen: text generation" href="/texen.html"/> </menu> <menu name="Developers"> From commitssandrahenderson@example.org Mon Nov 17 18:08:47 2008 Return-Path: <commitssandrahenderson@example.org> Delivered-To: sandrahenderson@example.org Received: (qmail 84137 invoked from network); 17 Nov 2008 18:08:46 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 17 Nov 2008 18:08:46 -0000 Received: (qmail 17685 invoked by uid 500); 17 Nov 2008 18:08:54 -0000 Delivered-To: sandrahenderson@example.org Received: (qmail 17649 invoked by uid 500); 17 Nov 2008 18:08:54 -0000 Mailing-List: contact sandrahenderson@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:sandrahenderson@example.org> List-Unsubscribe: <mailto:sandrahenderson@example.org> List-Post: <mailto:sandrahenderson@example.org> List-Id: <commits.velocity.apache.org> Reply-To: sandrahenderson@example.org Delivered-To: mailing list sandrahenderson@example.org Received: (qmail 17639 invoked by uid 99); 17 Nov 2008 18:08:54 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 17 Nov 2008 10:08:54 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 17 Nov 2008 18:07:41 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 3936C2388842; Mon, 17 Nov 2008 10:07:56 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r718308 - /velocity/engine/trunk/src/site/site.xml Date: Mon, 17 Nov 2008 18:07:55 -0000 To: sandrahenderson@example.org From: sandrahenderson@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <sandrahenderson@example.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: nbubna Date: Mon Nov 17 10:07:54 2008 New Revision: 718308 URL: http://svn.apache.org/viewvc?rev=718308&view=rev Log: VELOCITY-640 another texen & anakia ref Modified: velocity/engine/trunk/src/site/site.xml Modified: velocity/engine/trunk/src/site/site.xml URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/site/site.xml?rev=718308&r1=718307&r2=718308&view=diff ============================================================================== --- velocity/engine/trunk/src/site/site.xml (original) +++ velocity/engine/trunk/src/site/site.xml Mon Nov 17 10:07:54 2008 @@ -75,8 +75,7 @@ <item name="User Guide" href="user-guide.html"/> <item name="Developer Guide" href="developer-guide.html"/> <item name="VTL Reference" href="vtl-reference-guide.html"/> - <item name="Anakia: XML->doc tool" href="anakia.html"/> - <item name="Texen: text generation" href="texen.html"/> + <item name="Glossary" href="glossary.html"/> </menu> <menu name="Developers"> From commitssandrahenderson@example.org Mon Nov 17 19:01:21 2008 Return-Path: <commitssandrahenderson@example.org> Delivered-To: sandrahenderson@example.org Received: (qmail 11991 invoked from network); 17 Nov 2008 19:01:21 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 17 Nov 2008 19:01:21 -0000 Received: (qmail 89778 invoked by uid 500); 17 Nov 2008 19:01:29 -0000 Delivered-To: sandrahenderson@example.org Received: (qmail 89744 invoked by uid 500); 17 Nov 2008 19:01:29 -0000 Mailing-List: contact sandrahenderson@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:sandrahenderson@example.org> List-Unsubscribe: <mailto:sandrahenderson@example.org> List-Post: <mailto:sandrahenderson@example.org> List-Id: <commits.velocity.apache.org> Reply-To: sandrahenderson@example.org Delivered-To: mailing list sandrahenderson@example.org Received: (qmail 89735 invoked by uid 99); 17 Nov 2008 19:01:29 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 17 Nov 2008 11:01:29 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 17 Nov 2008 19:00:16 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 0514E2388975; Mon, 17 Nov 2008 11:01:01 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r718324 - /velocity/engine/trunk/xdocs/docs/jar-dependencies.xml Date: Mon, 17 Nov 2008 19:01:00 -0000 To: sandrahenderson@example.org From: sandrahenderson@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <sandrahenderson@example.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: nbubna Date: Mon Nov 17 11:01:00 2008 New Revision: 718324 URL: http://svn.apache.org/viewvc?rev=718324&view=rev Log: VELOCITY-617 oro is not a required dep unless escaping refs Modified: velocity/engine/trunk/xdocs/docs/jar-dependencies.xml Modified: velocity/engine/trunk/xdocs/docs/jar-dependencies.xml URL: http://svn.apache.org/viewvc/velocity/engine/trunk/xdocs/docs/jar-dependencies.xml?rev=718324&r1=718323&r2=718324&view=diff ============================================================================== --- velocity/engine/trunk/xdocs/docs/jar-dependencies.xml (original) +++ velocity/engine/trunk/xdocs/docs/jar-dependencies.xml Mon Nov 17 11:01:00 2008 @@ -28,7 +28,7 @@ <section name="Velocity dependencies" href="dependencies"> <p> Velocity has a number of external jar dependencies. However, not all of these - are needed every time.This document should help you do decide which jars must + are needed every time. This document should help you do decide which jars must also be present if you want to integrate Velocity into your application. </p> @@ -58,7 +58,10 @@ </tr> <tr> <td>oro</td><td>Yes</td> - <td>Needed for all parts of Velocity</td> + <td>Must be present if you have Velocity configured to + <a href="developer-guide.html#Configuring_Event_Handlers">automatically escape references</a>. + Otherwise, it is not needed. + </td> </tr> <tr> <td>log4j</td><td>No</td> @@ -82,15 +85,15 @@ </tr> <tr> <td>jdom</td><td>No</td> - <td>Only required for the Anakia tool / ant task</td> + <td>Only required for the deprecated Anakia tool / ant task</td> </tr> <tr> <td>werken-xpath</td><td>No</td> - <td>Only required for the Anakia tool / ant task</td> + <td>Only required for the deprecated Anakia tool / ant task</td> </tr> <tr> <td>antlr</td><td>No</td> - <td>Only required for the Anakia tool / ant task</td> + <td>Only required for the deprecated Anakia tool / ant task</td> </tr> <tr> <td>ant</td><td>No</td> @@ -108,14 +111,15 @@ <p> The most common case is the integration of the Velocity runtime into your - application. In this case, you must add commons-collections, commons-lang - and oro to your application (and optional logging if + application. In this case, you must add commons-collections and commons-lang + to your application (and optional Oro or commons-logging if required). If you already have one or more of these libraries in your application, you should check if you need to update their versions. </p> <p>The <a href="dependencies.html">auto-generated dependency report</a> lists all mandatory - dependencies as <b>compile</b> and all optional dependencies as <b>provided</b>. + dependencies as <b>compile</b> and all optional dependencies as <b>provided</b>, though + it fails to properly reflect the optional nature of the Oro and Commons-Logging dependencies. </p> </section> </body> From commitssandrahenderson@example.org Mon Nov 17 19:40:40 2008 Return-Path: <commitssandrahenderson@example.org> Delivered-To: sandrahenderson@example.org Received: (qmail 25965 invoked from network); 17 Nov 2008 19:40:40 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 17 Nov 2008 19:40:40 -0000 Received: (qmail 47256 invoked by uid 500); 17 Nov 2008 19:40:48 -0000 Delivered-To: sandrahenderson@example.org Received: (qmail 47225 invoked by uid 500); 17 Nov 2008 19:40:48 -0000 Mailing-List: contact sandrahenderson@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:sandrahenderson@example.org> List-Unsubscribe: <mailto:sandrahenderson@example.org> List-Post: <mailto:sandrahenderson@example.org> List-Id: <commits.velocity.apache.org> Reply-To: sandrahenderson@example.org Delivered-To: mailing list sandrahenderson@example.org Received: (qmail 47216 invoked by uid 99); 17 Nov 2008 19:40:48 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 17 Nov 2008 11:40:48 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 17 Nov 2008 19:39:35 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id EF30B238898F; Mon, 17 Nov 2008 11:39:49 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r718342 - /velocity/engine/trunk/README.txt Date: Mon, 17 Nov 2008 19:39:49 -0000 To: sandrahenderson@example.org From: sandrahenderson@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <sandrahenderson@example.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: nbubna Date: Mon Nov 17 11:39:49 2008 New Revision: 718342 URL: http://svn.apache.org/viewvc?rev=718342&view=rev Log: VELOCITY-639 update 'Upgrading...' section of README for 1.6 Modified: velocity/engine/trunk/README.txt Modified: velocity/engine/trunk/README.txt URL: http://svn.apache.org/viewvc/velocity/engine/trunk/README.txt?rev=718342&r1=718341&r2=718342&view=diff ============================================================================== --- velocity/engine/trunk/README.txt (original) +++ velocity/engine/trunk/README.txt Mon Nov 17 11:39:49 2008 @@ -83,6 +83,17 @@ * Java CC 3.2 is recommended to compile the parser files. * HSQLDB 1.7.1 is required for running unit tests. +Upgrading from Velocity 1.5 + + * Commons Collections has been upgraded to version 3.2.1. + * Commons Lang has been upgraded to version 2.4. + * Commons Logging 1.1 has been added. + + Optional: + + * Maven Ant 2.0.9 is required for the Maven Ant tasks. + * Java CC 4.1 is recommended to compile the parser files. + BUILDING APACHE VELOCITY ------------------------ From commitssandrahenderson@example.org Mon Nov 17 20:19:01 2008 Return-Path: <commitssandrahenderson@example.org> Delivered-To: sandrahenderson@example.org Received: (qmail 40304 invoked from network); 17 Nov 2008 20:19:01 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 17 Nov 2008 20:19:01 -0000 Received: (qmail 1538 invoked by uid 500); 17 Nov 2008 20:19:09 -0000 Delivered-To: sandrahenderson@example.org Received: (qmail 1524 invoked by uid 500); 17 Nov 2008 20:19:08 -0000 Mailing-List: contact sandrahenderson@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:sandrahenderson@example.org> List-Unsubscribe: <mailto:sandrahenderson@example.org> List-Post: <mailto:sandrahenderson@example.org> List-Id: <commits.velocity.apache.org> Reply-To: sandrahenderson@example.org Delivered-To: mailing list sandrahenderson@example.org Received: (qmail 1515 invoked by uid 99); 17 Nov 2008 20:19:08 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 17 Nov 2008 12:19:08 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 17 Nov 2008 20:17:55 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 3104C2388999; Mon, 17 Nov 2008 12:18:10 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r718358 - in /velocity/engine/trunk/examples/xmlapp_example: XMLTest.java test.xml Date: Mon, 17 Nov 2008 20:18:09 -0000 To: sandrahenderson@example.org From: sandrahenderson@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <sandrahenderson@example.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: nbubna Date: Mon Nov 17 12:18:09 2008 New Revision: 718358 URL: http://svn.apache.org/viewvc?rev=718358&view=rev Log: VELOCITY-641 update XMLApp example, letting JDom pick the parser Modified: velocity/engine/trunk/examples/xmlapp_example/XMLTest.java velocity/engine/trunk/examples/xmlapp_example/test.xml Modified: velocity/engine/trunk/examples/xmlapp_example/XMLTest.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/examples/xmlapp_example/XMLTest.java?rev=718358&r1=718357&r2=718358&view=diff ============================================================================== --- velocity/engine/trunk/examples/xmlapp_example/XMLTest.java (original) +++ velocity/engine/trunk/examples/xmlapp_example/XMLTest.java Mon Nov 17 12:18:09 2008 @@ -59,7 +59,7 @@ try { - builder = new SAXBuilder( "org.apache.xerces.parsers.SAXParser" ); + builder = new SAXBuilder(); root = builder.build("test.xml"); } catch( Exception ee) Modified: velocity/engine/trunk/examples/xmlapp_example/test.xml URL: http://svn.apache.org/viewvc/velocity/engine/trunk/examples/xmlapp_example/test.xml?rev=718358&r1=718357&r2=718358&view=diff ============================================================================== --- velocity/engine/trunk/examples/xmlapp_example/test.xml (original) +++ velocity/engine/trunk/examples/xmlapp_example/test.xml Mon Nov 17 12:18:09 2008 @@ -20,7 +20,7 @@ <document> <properties> <author> - <email>sandrahenderson@example.org</email> + <email>sandrahenderson@example.org</email> <name> <last> <full>Team</full> @@ -32,7 +32,7 @@ </name> </author> <title> - The Jakarta Project + The Velocity Project </title> </properties> From commitssandrahenderson@example.org Mon Nov 17 21:09:41 2008 Return-Path: <commitssandrahenderson@example.org> Delivered-To: sandrahenderson@example.org Received: (qmail 64761 invoked from network); 17 Nov 2008 21:09:40 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 17 Nov 2008 21:09:40 -0000 Received: (qmail 68326 invoked by uid 500); 17 Nov 2008 21:09:49 -0000 Delivered-To: sandrahenderson@example.org Received: (qmail 68308 invoked by uid 500); 17 Nov 2008 21:09:48 -0000 Mailing-List: contact sandrahenderson@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:sandrahenderson@example.org> List-Unsubscribe: <mailto:sandrahenderson@example.org> List-Post: <mailto:sandrahenderson@example.org> List-Id: <commits.velocity.apache.org> Reply-To: sandrahenderson@example.org Delivered-To: mailing list sandrahenderson@example.org Received: (qmail 68299 invoked by uid 99); 17 Nov 2008 21:09:48 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 17 Nov 2008 13:09:48 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 17 Nov 2008 21:08:35 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 486072388995; Mon, 17 Nov 2008 13:08:50 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: svn commit: r718383 - in /velocity/engine/trunk/xdocs/docs/translations: user-guide_es.xml user-guide_fi.xml Date: Mon, 17 Nov 2008 21:08:50 -0000 To: sandrahenderson@example.org From: sandrahenderson@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <sandrahenderson@example.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: nbubna Date: Mon Nov 17 13:08:49 2008 New Revision: 718383 URL: http://svn.apache.org/viewvc?rev=718383&view=rev Log: VELOCITY-352 change spanish and finnish user guide translations (thx to Gonzalo Diethelm and Joni Salonen) Modified: velocity/engine/trunk/xdocs/docs/translations/user-guide_es.xml velocity/engine/trunk/xdocs/docs/translations/user-guide_fi.xml Modified: velocity/engine/trunk/xdocs/docs/translations/user-guide_es.xml URL: http://svn.apache.org/viewvc/velocity/engine/trunk/xdocs/docs/translations/user-guide_es.xml?rev=718383&r1=718382&r2=718383&view=diff ============================================================================== --- velocity/engine/trunk/xdocs/docs/translations/user-guide_es.xml (original) +++ velocity/engine/trunk/xdocs/docs/translations/user-guide_es.xml Mon Nov 17 13:08:49 2008 @@ -1903,9 +1903,12 @@ ]]></source> <p> -Cuando se realiza una división el resultado es un entero. El residuo se -puede obtener utilizando el operador módulo (<em>%</em>). - </p> + Cuando una operaci&#243;n de divisi&#243;n se realiza + entre dos operandos enteros, el resultado ser&#225; un + valor entero, correspondiente al valor truncado de la + divisi&#243;n. El valor del resto puede obtenerse + utilizando el operador m&#243;dulo (<em>%</em>). +</p> <source><![CDATA[ #set( $foo = $bar % 5 ) Modified: velocity/engine/trunk/xdocs/docs/translations/user-guide_fi.xml URL: http://svn.apache.org/viewvc/velocity/engine/trunk/xdocs/docs/translations/user-guide_fi.xml?rev=718383&r1=718382&r2=718383&view=diff ============================================================================== --- velocity/engine/trunk/xdocs/docs/translations/user-guide_fi.xml (original) +++ velocity/engine/trunk/xdocs/docs/translations/user-guide_fi.xml Mon Nov 17 13:08:49 2008 @@ -1909,8 +1909,10 @@ ]]></source> <p> - Jako-operaation tapauksessa tulos on kokonaisluku. Jakojäännös - saadaan käyttöön jäännösoperandilla (<em>%</em>). + Kun kaksi kokonaislukua jaetaan kesken&#228;&#228;n, tuloksena on + kokonaisluku, jonka arvo on jakolaskun kokonaisosa. + Jakoj&#228;&#228;nn&#246;s voidaan laskea modulo-operaattorilla + (<em>%</em>). </p> <source><![CDATA[ From commitssandrahenderson@example.org Mon Nov 17 21:09:58 2008 Return-Path: <commitssandrahenderson@example.org> Delivered-To: sandrahenderson@example.org Received: (qmail 64967 invoked from network); 17 Nov 2008 21:09:57 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 17 Nov 2008 21:09:57 -0000 Received: (qmail 69566 invoked by uid 500); 17 Nov 2008 21:10:05 -0000 Delivered-To: sandrahenderson@example.org Received: (qmail 69546 invoked by uid 500); 17 Nov 2008 21:10:05 -0000 Mailing-List: contact sandrahenderson@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:sandrahenderson@example.org> List-Unsubscribe: <mailto:sandrahenderson@example.org> List-Post: <mailto:sandrahenderson@example.org> List-Id: <commits.velocity.apache.org> Reply-To: sandrahenderson@example.org Delivered-To: mailing list sandrahenderson@example.org Received: (qmail 69537 invoked by uid 99); 17 Nov 2008 21:10:05 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 17 Nov 2008 13:10:05 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 17 Nov 2008 21:08:52 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 4EB5723889A0; Mon, 17 Nov 2008 13:09:37 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r718385 - /velocity/engine/trunk/pom.xml Date: Mon, 17 Nov 2008 21:09:37 -0000 To: sandrahenderson@example.org From: sandrahenderson@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <sandrahenderson@example.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: nbubna Date: Mon Nov 17 13:09:36 2008 New Revision: 718385 URL: http://svn.apache.org/viewvc?rev=718385&view=rev Log: exclude commons-logging's transitive deps Modified: velocity/engine/trunk/pom.xml Modified: velocity/engine/trunk/pom.xml URL: http://svn.apache.org/viewvc/velocity/engine/trunk/pom.xml?rev=718385&r1=718384&r2=718385&view=diff ============================================================================== --- velocity/engine/trunk/pom.xml (original) +++ velocity/engine/trunk/pom.xml Mon Nov 17 13:09:36 2008 @@ -174,6 +174,20 @@ <artifactId>commons-logging</artifactId> <version>1.1</version> <scope>provided</scope> + <exclusions> + <exclusion> + <groupId>avalon-framework</groupId> + <artifactId>avalon-framework</artifactId> + </exclusion> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + <exclusion> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>log4j</groupId> From commitssandrahenderson@example.org Mon Nov 17 21:11:56 2008 Return-Path: <commitssandrahenderson@example.org> Delivered-To: sandrahenderson@example.org Received: (qmail 67453 invoked from network); 17 Nov 2008 21:11:56 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 17 Nov 2008 21:11:56 -0000 Received: (qmail 73072 invoked by uid 500); 17 Nov 2008 21:12:04 -0000 Delivered-To: sandrahenderson@example.org Received: (qmail 73042 invoked by uid 500); 17 Nov 2008 21:12:04 -0000 Mailing-List: contact sandrahenderson@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:sandrahenderson@example.org> List-Unsubscribe: <mailto:sandrahenderson@example.org> List-Post: <mailto:sandrahenderson@example.org> List-Id: <commits.velocity.apache.org> Reply-To: sandrahenderson@example.org Delivered-To: mailing list sandrahenderson@example.org Received: (qmail 73033 invoked by uid 99); 17 Nov 2008 21:12:04 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 17 Nov 2008 13:12:04 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 17 Nov 2008 21:10:51 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id F0B54238898F; Mon, 17 Nov 2008 13:11:05 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r718386 - /velocity/engine/trunk/WHY_TWO_JARS.txt Date: Mon, 17 Nov 2008 21:11:05 -0000 To: sandrahenderson@example.org From: sandrahenderson@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <sandrahenderson@example.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: nbubna Date: Mon Nov 17 13:11:05 2008 New Revision: 718386 URL: http://svn.apache.org/viewvc?rev=718386&view=rev Log: grammar nitpicking Modified: velocity/engine/trunk/WHY_TWO_JARS.txt Modified: velocity/engine/trunk/WHY_TWO_JARS.txt URL: http://svn.apache.org/viewvc/velocity/engine/trunk/WHY_TWO_JARS.txt?rev=718386&r1=718385&r2=718386&view=diff ============================================================================== --- velocity/engine/trunk/WHY_TWO_JARS.txt (original) +++ velocity/engine/trunk/WHY_TWO_JARS.txt Mon Nov 17 13:11:05 2008 @@ -12,8 +12,8 @@ runtime or the tools. This lead to some confusion about the naming and the purpose of the various jars. -Starting with the 1.5 release of Velocity, there is now only one jar, -velocity-<version>.jar which contains all Velocity code and a second +Starting with the 1.5 release of Velocity, there is now one jar, +velocity-<version>.jar, which contains all Velocity code and a second jar, velocity-dep-<version>.jar, which contains all Velocity code and its external dependencies. From commitssandrahenderson@example.org Mon Nov 17 21:23:41 2008 Return-Path: <commitssandrahenderson@example.org> Delivered-To: sandrahenderson@example.org Received: (qmail 73779 invoked from network); 17 Nov 2008 21:23:41 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 17 Nov 2008 21:23:41 -0000 Received: (qmail 89304 invoked by uid 500); 17 Nov 2008 21:23:49 -0000 Delivered-To: sandrahenderson@example.org Received: (qmail 89271 invoked by uid 500); 17 Nov 2008 21:23:49 -0000 Mailing-List: contact sandrahenderson@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:sandrahenderson@example.org> List-Unsubscribe: <mailto:sandrahenderson@example.org> List-Post: <mailto:sandrahenderson@example.org> List-Id: <commits.velocity.apache.org> Reply-To: sandrahenderson@example.org Delivered-To: mailing list sandrahenderson@example.org Received: (qmail 89261 invoked by uid 99); 17 Nov 2008 21:23:49 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 17 Nov 2008 13:23:49 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 17 Nov 2008 21:22:35 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 819822388975; Mon, 17 Nov 2008 13:22:50 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r718388 - /velocity/engine/trunk/src/changes/changes.xml Date: Mon, 17 Nov 2008 21:22:50 -0000 To: sandrahenderson@example.org From: sandrahenderson@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <sandrahenderson@example.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: nbubna Date: Mon Nov 17 13:22:50 2008 New Revision: 718388 URL: http://svn.apache.org/viewvc?rev=718388&view=rev Log: add recent changes Modified: velocity/engine/trunk/src/changes/changes.xml Modified: velocity/engine/trunk/src/changes/changes.xml URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/changes/changes.xml?rev=718388&r1=718387&r2=718388&view=diff ============================================================================== --- velocity/engine/trunk/src/changes/changes.xml (original) +++ velocity/engine/trunk/src/changes/changes.xml Mon Nov 17 13:22:50 2008 @@ -27,6 +27,23 @@ <body> <release version="1.6" date="In Subversion"> + <action type="fix" dev="nbubna" issue="VELOCITY-352" due-to="Gonzalo Diethelm, Joni Salonen"> + Update Finnish and Spanish User Guide sections on division operation. + </action> + + <action type="fix" dev="nbubna" issue="VELOCITY-641" due-to="Will Glass-Husain"> + Fix classpath for XMLApp example. + </action> + + <action type="fix" dev="nbubna" issue="VELOCITY-617" due-to="Adrian Tarau"> + Fix references to Oro dependency to make it clear that it is + only necessary for certain reference event handlers. + </action> + + <action type="fix" dev="nbubna" issue="VELOCITY-640" due-to="Will Glass-Husain"> + Remove old Anakia/Texen docs and examples. + </action> + <action type="fix" dev="nbubna" issue="VELOCITY-642" due-to="Ilkka Priha"> Fix bug in vararg support where an array passed to a vararg method was being wrapped in another array. From commitssandrahenderson@example.org Mon Nov 17 22:28:47 2008 Return-Path: <commitssandrahenderson@example.org> Delivered-To: sandrahenderson@example.org Received: (qmail 17804 invoked from network); 17 Nov 2008 22:28:45 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 17 Nov 2008 22:28:45 -0000 Received: (qmail 64211 invoked by uid 500); 17 Nov 2008 22:28:53 -0000 Delivered-To: sandrahenderson@example.org Received: (qmail 64175 invoked by uid 500); 17 Nov 2008 22:28:53 -0000 Mailing-List: contact sandrahenderson@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:sandrahenderson@example.org> List-Unsubscribe: <mailto:sandrahenderson@example.org> List-Post: <mailto:sandrahenderson@example.org> List-Id: <commits.velocity.apache.org> Reply-To: sandrahenderson@example.org Delivered-To: mailing list sandrahenderson@example.org Received: (qmail 64166 invoked by uid 99); 17 Nov 2008 22:28:53 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 17 Nov 2008 14:28:53 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 17 Nov 2008 22:27:39 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 3D2EC238889C; Mon, 17 Nov 2008 14:27:54 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r718417 - /velocity/engine/trunk/pom.xml Date: Mon, 17 Nov 2008 22:27:54 -0000 To: sandrahenderson@example.org From: sandrahenderson@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <sandrahenderson@example.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: nbubna Date: Mon Nov 17 14:27:53 2008 New Revision: 718417 URL: http://svn.apache.org/viewvc?rev=718417&view=rev Log: VELOCITY-636 antlr isn't necessary for FindBugs (thx to Benjamin Bentmann) Modified: velocity/engine/trunk/pom.xml Modified: velocity/engine/trunk/pom.xml URL: http://svn.apache.org/viewvc/velocity/engine/trunk/pom.xml?rev=718417&r1=718416&r2=718417&view=diff ============================================================================== --- velocity/engine/trunk/pom.xml (original) +++ velocity/engine/trunk/pom.xml Mon Nov 17 14:27:53 2008 @@ -157,12 +157,6 @@ <artifactId>oro</artifactId> <version>2.0.8</version> </dependency> - <!-- antlr allows us to use Findbugs --> - <dependency> - <groupId>antlr</groupId> - <artifactId>antlr</artifactId> - <version>2.7.7</version> - </dependency> <dependency> <groupId>jdom</groupId> <artifactId>jdom</artifactId> From commitssandrahenderson@example.org Mon Nov 17 22:51:04 2008 Return-Path: <commitssandrahenderson@example.org> Delivered-To: sandrahenderson@example.org Received: (qmail 23378 invoked from network); 17 Nov 2008 22:51:04 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 17 Nov 2008 22:51:04 -0000 Received: (qmail 82589 invoked by uid 500); 17 Nov 2008 22:51:12 -0000 Delivered-To: sandrahenderson@example.org Received: (qmail 82567 invoked by uid 500); 17 Nov 2008 22:51:12 -0000 Mailing-List: contact sandrahenderson@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:sandrahenderson@example.org> List-Unsubscribe: <mailto:sandrahenderson@example.org> List-Post: <mailto:sandrahenderson@example.org> List-Id: <commits.velocity.apache.org> Reply-To: sandrahenderson@example.org Delivered-To: mailing list sandrahenderson@example.org Received: (qmail 82558 invoked by uid 99); 17 Nov 2008 22:51:12 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 17 Nov 2008 14:51:12 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 17 Nov 2008 22:49:59 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id C44A52388995; Mon, 17 Nov 2008 14:50:43 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r718424 - in /velocity/engine/trunk/src/java/org/apache/velocity/runtime: ./ directive/ log/ parser/ Date: Mon, 17 Nov 2008 22:50:43 -0000 To: sandrahenderson@example.org From: sandrahenderson@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <sandrahenderson@example.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: nbubna Date: Mon Nov 17 14:50:43 2008 New Revision: 718424 URL: http://svn.apache.org/viewvc?rev=718424&view=rev Log: a few quick 'n easy findbugs fixes Modified: velocity/engine/trunk/src/java/org/apache/velocity/runtime/VelocimacroFactory.java velocity/engine/trunk/src/java/org/apache/velocity/runtime/directive/VelocimacroProxy.java velocity/engine/trunk/src/java/org/apache/velocity/runtime/log/CommonsLogLogChute.java velocity/engine/trunk/src/java/org/apache/velocity/runtime/log/Log4JLogChute.java velocity/engine/trunk/src/java/org/apache/velocity/runtime/log/SimpleLog4JLogSystem.java velocity/engine/trunk/src/java/org/apache/velocity/runtime/log/SystemLogChute.java velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/ParseException.java Modified: velocity/engine/trunk/src/java/org/apache/velocity/runtime/VelocimacroFactory.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/java/org/apache/velocity/runtime/VelocimacroFactory.java?rev=718424&r1=718423&r2=718424&view=diff ============================================================================== --- velocity/engine/trunk/src/java/org/apache/velocity/runtime/VelocimacroFactory.java (original) +++ velocity/engine/trunk/src/java/org/apache/velocity/runtime/VelocimacroFactory.java Mon Nov 17 14:50:43 2008 @@ -697,7 +697,7 @@ * set the switch for automatic reloading of * global library-based VMs */ - private void setAutoload(boolean b) + private synchronized void setAutoload(boolean b) { autoReloadLibrary = b; } @@ -706,7 +706,7 @@ * get the switch for automatic reloading of * global library-based VMs */ - private boolean getAutoload() + private synchronized boolean getAutoload() { return autoReloadLibrary; } Modified: velocity/engine/trunk/src/java/org/apache/velocity/runtime/directive/VelocimacroProxy.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/java/org/apache/velocity/runtime/directive/VelocimacroProxy.java?rev=718424&r1=718423&r2=718424&view=diff ============================================================================== --- velocity/engine/trunk/src/java/org/apache/velocity/runtime/directive/VelocimacroProxy.java (original) +++ velocity/engine/trunk/src/java/org/apache/velocity/runtime/directive/VelocimacroProxy.java Mon Nov 17 14:50:43 2008 @@ -176,21 +176,24 @@ String templateName = vmc.getCurrentTemplateName(); Object[] stack = vmc.getMacroNameStack(); - String message = "Max calling depth of " + maxCallDepth + " was exceeded in Template:" - + templateName + " and Macro:" + macroName + " with Call Stack:"; + StringBuffer out = new StringBuffer(100) + .append("Max calling depth of ").append(maxCallDepth) + .append(" was exceeded in Template:").append(templateName) + .append(" and Macro:").append(macroName) + .append(" with Call Stack:"); for (int i = 0; i < stack.length; i++) { if (i != 0) { - message += "->"; + out.append("->"); } - message += stack[i]; + out.append(stack[i]); } - rsvc.getLog().error(message); + rsvc.getLog().error(out.toString()); try { - throw new MacroOverflowException(message); + throw new MacroOverflowException(out.toString()); } finally { Modified: velocity/engine/trunk/src/java/org/apache/velocity/runtime/log/CommonsLogLogChute.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/java/org/apache/velocity/runtime/log/CommonsLogLogChute.java?rev=718424&r1=718423&r2=718424&view=diff ============================================================================== --- velocity/engine/trunk/src/java/org/apache/velocity/runtime/log/CommonsLogLogChute.java (original)
{'source': 'Apache Software Foundation Public Mail Archives'}