From commits-return-3794-archive-asf-public=cust-asf.ponee.io@velocity.apache.org Fri Apr 26 14:05:00 2019 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [207.244.88.153]) by mx-eu-01.ponee.io (Postfix) with SMTP id 306F018064C for ; Fri, 26 Apr 2019 16:05:00 +0200 (CEST) Received: (qmail 42178 invoked by uid 500); 26 Apr 2019 14:04:59 -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 42169 invoked by uid 99); 26 Apr 2019 14:04:59 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 26 Apr 2019 14:04:59 +0000 Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 81AED3A0168 for ; Fri, 26 Apr 2019 14:04:58 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1858207 - /velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/VelocityView.java Date: Fri, 26 Apr 2019 14:04:57 -0000 To: commits@velocity.apache.org From: cbrisson@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20190426140458.81AED3A0168@svn01-us-west.apache.org> Author: cbrisson Date: Fri Apr 26 14:04:57 2019 New Revision: 1858207 URL: http://svn.apache.org/viewvc?rev=1858207&view=rev Log: [tools/view] Let VelocityTools subclasses define their own set of default tools Modified: velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/VelocityView.java Modified: velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/VelocityView.java URL: http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/VelocityView.java?rev=1858207&r1=1858206&r2=1858207&view=diff ============================================================================== --- velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/VelocityView.java (original) +++ velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/VelocityView.java Fri Apr 26 14:04:57 2019 @@ -404,7 +404,8 @@ public class VelocityView extends ViewTo { // add all available default tools getLog().trace("Loading default tools configuration..."); - factoryConfig.addConfiguration(ConfigurationUtils.getDefaultTools()); + // give a chance for subclasses to define their own default tools + addDefaultToolsConfiguration(factoryConfig); } // check for application-wide user config in the context init params @@ -460,6 +461,11 @@ public class VelocityView extends ViewTo configure(factoryConfig); } + protected void addDefaultToolsConfiguration(FactoryConfiguration factoryConfig) + { + factoryConfig.addConfiguration(ConfigurationUtils.getDefaultTools()); + } + private boolean setConfig(FactoryConfiguration factory, String path, boolean require) { if (path == null)