You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by ma...@apache.org on 2014/09/14 08:56:50 UTC
[1/3] git commit: Better ivar name.
Repository: logging-log4j2
Updated Branches:
refs/heads/master 237ec9929 -> b257c78af
Better ivar name.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/42ae19fa
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/42ae19fa
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/42ae19fa
Branch: refs/heads/master
Commit: 42ae19fa1739c6658e8e865cee94fc0db9735e11
Parents: 237ec99
Author: Matt Sicker <ma...@apache.org>
Authored: Sun Sep 14 01:51:06 2014 -0500
Committer: Matt Sicker <ma...@apache.org>
Committed: Sun Sep 14 01:51:06 2014 -0500
----------------------------------------------------------------------
.../java/org/apache/logging/log4j/util/PropertiesUtil.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/42ae19fa/log4j-api/src/main/java/org/apache/logging/log4j/util/PropertiesUtil.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/util/PropertiesUtil.java b/log4j-api/src/main/java/org/apache/logging/log4j/util/PropertiesUtil.java
index e3b8d70..0683766 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/util/PropertiesUtil.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/util/PropertiesUtil.java
@@ -83,15 +83,15 @@ public final class PropertiesUtil {
* file are used by default. If a property is not defined in this file, then the equivalent system property is
* used.
*
- * @param propsLocn the location of properties file to load
+ * @param propertiesFileName the location of properties file to load
*/
- public PropertiesUtil(final String propsLocn) {
+ public PropertiesUtil(final String propertiesFileName) {
final ClassLoader loader = LoaderUtil.getThreadContextClassLoader();
@SuppressWarnings("IOResourceOpenedButNotSafelyClosed")
final
Properties properties = new Properties();
try {
- final Enumeration<URL> enumeration = loader.getResources(propsLocn);
+ final Enumeration<URL> enumeration = loader.getResources(propertiesFileName);
while (enumeration.hasMoreElements()) {
final URL url = enumeration.nextElement();
final InputStream in = url.openStream();
@@ -110,7 +110,7 @@ public final class PropertiesUtil {
}
} catch (final IOException ioe) {
- LOGGER.error("Unable to access {}", propsLocn, ioe);
+ LOGGER.error("Unable to access {}", propertiesFileName, ioe);
}
this.props = properties;
}
[3/3] git commit: Remove unused field.
Posted by ma...@apache.org.
Remove unused field.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/b257c78a
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/b257c78a
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/b257c78a
Branch: refs/heads/master
Commit: b257c78af571a05d77143d537068ae3c45f0a959
Parents: 0a68b8c
Author: Matt Sicker <ma...@apache.org>
Authored: Sun Sep 14 01:52:29 2014 -0500
Committer: Matt Sicker <ma...@apache.org>
Committed: Sun Sep 14 01:52:29 2014 -0500
----------------------------------------------------------------------
.../org/apache/logging/log4j/simple/SimpleLoggerContext.java | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/b257c78a/log4j-api/src/main/java/org/apache/logging/log4j/simple/SimpleLoggerContext.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/simple/SimpleLoggerContext.java b/log4j-api/src/main/java/org/apache/logging/log4j/simple/SimpleLoggerContext.java
index d001ea2..e8a4cc6 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/simple/SimpleLoggerContext.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/simple/SimpleLoggerContext.java
@@ -19,15 +19,14 @@ package org.apache.logging.log4j.simple;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.PrintStream;
-import java.util.Properties;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.message.MessageFactory;
import org.apache.logging.log4j.spi.AbstractLogger;
-import org.apache.logging.log4j.spi.LoggerContext;
import org.apache.logging.log4j.spi.ExtendedLogger;
+import org.apache.logging.log4j.spi.LoggerContext;
import org.apache.logging.log4j.util.PropertiesUtil;
/**
@@ -41,9 +40,6 @@ public class SimpleLoggerContext implements LoggerContext {
/** All system properties used by <code>SimpleLog</code> start with this */
protected static final String SYSTEM_PREFIX = "org.apache.logging.log4j.simplelog.";
- /** Properties loaded from simplelog.properties */
- private final Properties simpleLogProps = new Properties();
-
private final PropertiesUtil props;
/** Include the instance name in the log message? */
[2/3] git commit: More javadoc.
Posted by ma...@apache.org.
More javadoc.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/0a68b8c4
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/0a68b8c4
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/0a68b8c4
Branch: refs/heads/master
Commit: 0a68b8c4f348c7c7416042b65fa65da0e7fe7aa7
Parents: 42ae19f
Author: Matt Sicker <ma...@apache.org>
Authored: Sun Sep 14 01:51:21 2014 -0500
Committer: Matt Sicker <ma...@apache.org>
Committed: Sun Sep 14 01:51:21 2014 -0500
----------------------------------------------------------------------
.../main/java/org/apache/logging/log4j/simple/package-info.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/0a68b8c4/log4j-api/src/main/java/org/apache/logging/log4j/simple/package-info.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/simple/package-info.java b/log4j-api/src/main/java/org/apache/logging/log4j/simple/package-info.java
index cd04a6f..4f8658d 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/simple/package-info.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/simple/package-info.java
@@ -16,6 +16,7 @@
*/
/**
- * Simple logging implementation.
+ * Simple logging implementation. This is a rather minimal Log4j Provider that is used by default if no other Log4j
+ * Providers are able to be loaded at runtime.
*/
package org.apache.logging.log4j.simple;