Return-Path: X-Original-To: apmail-commons-commits-archive@minotaur.apache.org Delivered-To: apmail-commons-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 7CBAC1837A for ; Thu, 22 Oct 2015 19:47:56 +0000 (UTC) Received: (qmail 44407 invoked by uid 500); 22 Oct 2015 19:47:56 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 44336 invoked by uid 500); 22 Oct 2015 19:47:56 -0000 Mailing-List: contact commits-help@commons.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@commons.apache.org Delivered-To: mailing list commits@commons.apache.org Received: (qmail 44327 invoked by uid 99); 22 Oct 2015 19:47:56 -0000 Received: from Unknown (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 22 Oct 2015 19:47:56 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id D8B591A2271 for ; Thu, 22 Oct 2015 19:47:55 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.79 X-Spam-Level: * X-Spam-Status: No, score=1.79 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, T_RP_MATCHES_RCVD=-0.01] autolearn=disabled Received: from mx1-us-east.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id pb_K07u5MUeJ for ; Thu, 22 Oct 2015 19:47:54 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx1-us-east.apache.org (ASF Mail Server at mx1-us-east.apache.org) with ESMTP id 8A578439B6 for ; Thu, 22 Oct 2015 19:47:54 +0000 (UTC) Received: from svn01-us-west.apache.org (svn.apache.org [10.41.0.6]) by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id 19D9EE0718 for ; Thu, 22 Oct 2015 19:47:54 +0000 (UTC) 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 179153A024F for ; Thu, 22 Oct 2015 19:47:54 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1710087 - in /commons/proper/configuration/trunk/src: main/java/org/apache/commons/configuration2/interpol/ExprLookup.java test/java/org/apache/commons/configuration2/interpol/TestExprLookup.java Date: Thu, 22 Oct 2015 19:47:54 -0000 To: commits@commons.apache.org From: oheger@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20151022194754.179153A024F@svn01-us-west.apache.org> Author: oheger Date: Thu Oct 22 19:47:53 2015 New Revision: 1710087 URL: http://svn.apache.org/viewvc?rev=1710087&view=rev Log: ExprLookup now uses a ConfigurationLogger. Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/interpol/ExprLookup.java commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/interpol/TestExprLookup.java Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/interpol/ExprLookup.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/interpol/ExprLookup.java?rev=1710087&r1=1710086&r2=1710087&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/interpol/ExprLookup.java (original) +++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/interpol/ExprLookup.java Thu Oct 22 19:47:53 2015 @@ -18,6 +18,7 @@ package org.apache.commons.configuration import java.util.ArrayList; +import org.apache.commons.configuration2.ConfigurationLogger; import org.apache.commons.configuration2.ex.ConfigurationRuntimeException; import org.apache.commons.jexl2.Expression; import org.apache.commons.jexl2.JexlContext; @@ -27,7 +28,6 @@ import org.apache.commons.lang3.ClassUti import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.text.StrLookup; import org.apache.commons.lang3.text.StrSubstitutor; -import org.apache.commons.logging.Log; /** * Lookup that allows expressions to be evaluated. @@ -82,7 +82,7 @@ public class ExprLookup implements Looku private StrSubstitutor substitutor; /** The logger used by this instance. */ - private Log logger; + private ConfigurationLogger logger; /** The engine. */ private final JexlEngine engine = new JexlEngine(); @@ -170,7 +170,7 @@ public class ExprLookup implements Looku * @return the {@code Log} * @since 2.0 */ - public Log getLogger() + public ConfigurationLogger getLogger() { return logger; } @@ -182,7 +182,7 @@ public class ExprLookup implements Looku * @param logger the {@code Log} * @since 2.0 */ - public void setLogger(Log logger) + public void setLogger(ConfigurationLogger logger) { this.logger = logger; } @@ -232,10 +232,10 @@ public class ExprLookup implements Looku } catch (Exception e) { - Log l = getLogger(); + ConfigurationLogger l = getLogger(); if (l != null) { - l.debug("Error encountered evaluating " + result, e); + l.debug("Error encountered evaluating " + result + ": " + e); } } Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/interpol/TestExprLookup.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/interpol/TestExprLookup.java?rev=1710087&r1=1710086&r2=1710087&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/interpol/TestExprLookup.java (original) +++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/interpol/TestExprLookup.java Thu Oct 22 19:47:53 2015 @@ -64,10 +64,11 @@ public class TestExprLookup XMLConfiguration config = new XMLConfiguration(); FileHandler handler = new FileHandler(config); handler.load(TEST_FILE); - config.setLogger(new ConfigurationLogger("TestLogger")); + ConfigurationLogger testLogger = new ConfigurationLogger("TestLogger"); + config.setLogger(testLogger); ExprLookup lookup = new ExprLookup(vars); lookup.setInterpolator(config.getInterpolator()); - lookup.setLogger(log); + lookup.setLogger(testLogger); String str = lookup.lookup(PATTERN1); assertTrue(str.startsWith("Goodbye")); str = lookup.lookup(PATTERN2);