Author: oheger
Date: Thu Oct 22 19:46:46 2015
New Revision: 1710084
URL: http://svn.apache.org/viewvc?rev=1710084&view=rev
Log:
Changed log property in builder parameters.
The property is now of type ConfigurationLogger.
Modified:
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/BasicBuilderParameters.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/BasicBuilderProperties.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/combined/CombinedConfigurationBuilderProvider.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/TestBasicBuilderParameters.java
Modified:
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/BasicBuilderParameters.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/BasicBuilderParameters.java?rev=1710084&r1=1710083&r2=1710084&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/BasicBuilderParameters.java
(original)
+++
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/BasicBuilderParameters.java
Thu Oct 22 19:46:46 2015
@@ -22,6 +22,7 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.commons.configuration2.ConfigurationDecoder;
+import org.apache.commons.configuration2.ConfigurationLogger;
import org.apache.commons.configuration2.beanutils.BeanHelper;
import org.apache.commons.configuration2.convert.ConversionHandler;
import org.apache.commons.configuration2.convert.ListDelimiterHandler;
@@ -29,7 +30,6 @@ import org.apache.commons.configuration2
import org.apache.commons.configuration2.interpol.InterpolatorSpecification;
import org.apache.commons.configuration2.interpol.Lookup;
import org.apache.commons.configuration2.sync.Synchronizer;
-import org.apache.commons.logging.Log;
/**
* <p>
@@ -132,7 +132,7 @@ public class BasicBuilderParameters impl
* @return a reference to this object for method chaining
*/
@Override
- public BasicBuilderParameters setLogger(Log log)
+ public BasicBuilderParameters setLogger(ConfigurationLogger log)
{
return setProperty(PROP_LOGGER, log);
}
Modified:
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/BasicBuilderProperties.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/BasicBuilderProperties.java?rev=1710084&r1=1710083&r2=1710084&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/BasicBuilderProperties.java
(original)
+++
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/BasicBuilderProperties.java
Thu Oct 22 19:46:46 2015
@@ -20,13 +20,13 @@ import java.util.Collection;
import java.util.Map;
import org.apache.commons.configuration2.ConfigurationDecoder;
+import org.apache.commons.configuration2.ConfigurationLogger;
import org.apache.commons.configuration2.beanutils.BeanHelper;
import org.apache.commons.configuration2.convert.ConversionHandler;
import org.apache.commons.configuration2.convert.ListDelimiterHandler;
import org.apache.commons.configuration2.interpol.ConfigurationInterpolator;
import org.apache.commons.configuration2.interpol.Lookup;
import org.apache.commons.configuration2.sync.Synchronizer;
-import org.apache.commons.logging.Log;
/**
* <p>
@@ -53,13 +53,13 @@ public interface BasicBuilderProperties<
{
/**
* Sets the <em>logger</em> property. With this property a concrete
- * {@code Log} object can be set for the configuration. Thus logging
- * behavior can be controlled.
+ * {@code ConfigurationLogger} object can be set for the configuration.
Thus
+ * logging behavior can be controlled.
*
* @param log the {@code Log} for the configuration produced by this
builder
* @return a reference to this object for method chaining
*/
- T setLogger(Log log);
+ T setLogger(ConfigurationLogger log);
/**
* Sets the value of the <em>throwExceptionOnMissing</em> property. This
Modified:
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/combined/CombinedConfigurationBuilderProvider.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/combined/CombinedConfigurationBuilderProvider.java?rev=1710084&r1=1710083&r2=1710084&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/combined/CombinedConfigurationBuilderProvider.java
(original)
+++
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/combined/CombinedConfigurationBuilderProvider.java
Thu Oct 22 19:46:46 2015
@@ -127,7 +127,7 @@ public class CombinedConfigurationBuilde
BasicBuilderParameters params)
{
params.setListDelimiterHandler(config.getListDelimiterHandler())
- //TODO handle logger.setLogger(config.getLogger())
+ .setLogger(config.getLogger())
.setThrowExceptionOnMissing(config.isThrowExceptionOnMissing())
.setConfigurationDecoder(config.getConfigurationDecoder());
}
Modified:
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/TestBasicBuilderParameters.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/TestBasicBuilderParameters.java?rev=1710084&r1=1710083&r2=1710084&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/TestBasicBuilderParameters.java
(original)
+++
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/TestBasicBuilderParameters.java
Thu Oct 22 19:46:46 2015
@@ -30,6 +30,7 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.commons.configuration2.ConfigurationDecoder;
+import org.apache.commons.configuration2.ConfigurationLogger;
import org.apache.commons.configuration2.beanutils.BeanHelper;
import org.apache.commons.configuration2.convert.ConversionHandler;
import org.apache.commons.configuration2.convert.ListDelimiterHandler;
@@ -37,7 +38,6 @@ import org.apache.commons.configuration2
import org.apache.commons.configuration2.interpol.InterpolatorSpecification;
import org.apache.commons.configuration2.interpol.Lookup;
import org.apache.commons.configuration2.sync.Synchronizer;
-import org.apache.commons.logging.Log;
import org.easymock.EasyMock;
import org.junit.Before;
import org.junit.Test;
@@ -89,7 +89,7 @@ public class TestBasicBuilderParameters
@Test
public void testSetLogger()
{
- Log log = EasyMock.createMock(Log.class);
+ ConfigurationLogger log =
EasyMock.createMock(ConfigurationLogger.class);
EasyMock.replay(log);
assertSame("Wrong result", params, params.setLogger(log));
assertSame("Wrong logger parameter", log,
@@ -403,7 +403,7 @@ public class TestBasicBuilderParameters
@Test
public void testCloneValues()
{
- Log log = EasyMock.createMock(Log.class);
+ ConfigurationLogger log =
EasyMock.createMock(ConfigurationLogger.class);
ConfigurationInterpolator ci =
EasyMock.createMock(ConfigurationInterpolator.class);
ListDelimiterHandler handler1 =
EasyMock.createMock(ListDelimiterHandler.class);
