Return-Path: Delivered-To: apmail-velocity-commits-archive@locus.apache.org Received: (qmail 22385 invoked from network); 30 Mar 2007 23:35:32 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 30 Mar 2007 23:35:32 -0000 Received: (qmail 26849 invoked by uid 500); 30 Mar 2007 23:35:40 -0000 Delivered-To: apmail-velocity-commits-archive@velocity.apache.org Received: (qmail 26817 invoked by uid 500); 30 Mar 2007 23:35:40 -0000 Mailing-List: contact commits-help@velocity.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@velocity.apache.org Delivered-To: mailing list commits@velocity.apache.org Received: (qmail 26808 invoked by uid 99); 30 Mar 2007 23:35:40 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 30 Mar 2007 16:35:40 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 30 Mar 2007 16:35:32 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 076841A9838; Fri, 30 Mar 2007 16:35:12 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r524326 - /velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/config/ToolboxConfiguration.java Date: Fri, 30 Mar 2007 23:35:11 -0000 To: commits@velocity.apache.org From: nbubna@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070330233512.076841A9838@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: nbubna Date: Fri Mar 30 16:35:11 2007 New Revision: 524326 URL: http://svn.apache.org/viewvc?view=rev&rev=524326 Log: have toolbox configurations default to the default scope :) Modified: velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/config/ToolboxConfiguration.java Modified: velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/config/ToolboxConfiguration.java URL: http://svn.apache.org/viewvc/velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/config/ToolboxConfiguration.java?view=diff&rev=524326&r1=524325&r2=524326 ============================================================================== --- velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/config/ToolboxConfiguration.java (original) +++ velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/config/ToolboxConfiguration.java Fri Mar 30 16:35:11 2007 @@ -20,6 +20,7 @@ */ import java.util.List; +import org.apache.velocity.tools.ToolboxFactory; /** * @@ -30,7 +31,7 @@ public class ToolboxConfiguration extends CompoundConfiguration { - private String scope; + private String scope = ToolboxFactory.DEFAULT_SCOPE; protected ToolConfiguration findMatchingChild(ToolConfiguration newTool)