You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by oh...@apache.org on 2015/10/22 21:48:29 UTC
svn commit: r1710088 - in /commons/proper/configuration/trunk/src:
main/java/org/apache/commons/configuration2/io/
test/java/org/apache/commons/configuration2/io/
Author: oheger
Date: Thu Oct 22 19:48:29 2015
New Revision: 1710088
URL: http://svn.apache.org/viewvc?rev=1710088&view=rev
Log:
FileSystems now use a ConfigurationLogger.
Modified:
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/io/DefaultFileSystem.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/io/FileSystem.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/io/TestDefaultFileSystem.java
Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/io/DefaultFileSystem.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/io/DefaultFileSystem.java?rev=1710088&r1=1710087&r2=1710088&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/io/DefaultFileSystem.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/io/DefaultFileSystem.java Thu Oct 22 19:48:29 2015
@@ -143,8 +143,8 @@ public class DefaultFileSystem extends F
if (getLogger().isDebugEnabled())
{
getLogger().debug(String.format("Could not determine URL for "
- + "basePath = %s, fileName = %s.", basePath,
- fileName), e);
+ + "basePath = %s, fileName = %s: %s", basePath,
+ fileName, e));
}
}
}
Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/io/FileSystem.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/io/FileSystem.java?rev=1710088&r1=1710087&r2=1710088&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/io/FileSystem.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/io/FileSystem.java Thu Oct 22 19:48:29 2015
@@ -22,9 +22,8 @@ import java.io.OutputStream;
import java.net.MalformedURLException;
import java.net.URL;
+import org.apache.commons.configuration2.ConfigurationLogger;
import org.apache.commons.configuration2.ex.ConfigurationException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.impl.NoOpLog;
/**
* Abstract layer to allow various types of file systems.
@@ -36,10 +35,10 @@ import org.apache.commons.logging.impl.N
public abstract class FileSystem
{
/** Constant for the default logger. */
- private static final Log DEFAULT_LOG = new NoOpLog();
+ private static final ConfigurationLogger DEFAULT_LOG = ConfigurationLogger.newDummyLogger();
/** The Logger */
- private volatile Log log;
+ private volatile ConfigurationLogger log;
/** FileSystem options provider */
private volatile FileOptionsProvider optionsProvider;
@@ -49,22 +48,23 @@ public abstract class FileSystem
*
* @return the logger
*/
- public Log getLogger()
+ public ConfigurationLogger getLogger()
{
- Log result = log;
+ ConfigurationLogger result = log;
return (result != null) ? result : DEFAULT_LOG;
}
/**
- * Allows to set the logger to be used by this FileSystem. This
+ * Allows setting the logger to be used by this FileSystem. This
* method makes it possible for clients to exactly control logging behavior.
* Per default a logger is set that will ignore all log messages. Derived
* classes that want to enable logging should call this method during their
- * initialization with the logger to be used.
+ * initialization with the logger to be used. Passing in a <b>null</b> argument
+ * disables logging.
*
* @param log the new logger
*/
- public void setLogger(Log log)
+ public void setLogger(ConfigurationLogger log)
{
this.log = log;
}
Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/io/TestDefaultFileSystem.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/io/TestDefaultFileSystem.java?rev=1710088&r1=1710087&r2=1710088&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/io/TestDefaultFileSystem.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/io/TestDefaultFileSystem.java Thu Oct 22 19:48:29 2015
@@ -16,15 +16,13 @@
*/
package org.apache.commons.configuration2.io;
+import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
import java.io.File;
+import org.apache.commons.configuration2.ConfigurationLogger;
import org.apache.commons.configuration2.ex.ConfigurationException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.commons.logging.impl.NoOpLog;
import org.junit.Before;
import org.junit.Test;
@@ -52,8 +50,7 @@ public class TestDefaultFileSystem
@Test
public void testDefaultLogger()
{
- assertTrue("Wrong default logger",
- fileSystem.getLogger() instanceof NoOpLog);
+ assertNotNull("No default logger", fileSystem.getLogger());
}
/**
@@ -62,7 +59,7 @@ public class TestDefaultFileSystem
@Test
public void testSetLogger()
{
- Log log = LogFactory.getLog(getClass());
+ ConfigurationLogger log = new ConfigurationLogger(getClass());
fileSystem.setLogger(log);
assertSame("Logger not set", log, fileSystem.getLogger());
}