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/10/08 04:02:44 UTC
[1/3] git commit: Use spi.LoggerContext instead of core.LoggerContext.
Repository: logging-log4j2
Updated Branches:
refs/heads/master 2a409753c -> 4af3ef8a4
Use spi.LoggerContext instead of core.LoggerContext.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/3df43dd2
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/3df43dd2
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/3df43dd2
Branch: refs/heads/master
Commit: 3df43dd2e813da3e92750e79f3c51e6d38cbd82c
Parents: 2a40975
Author: Matt Sicker <ma...@apache.org>
Authored: Tue Oct 7 21:00:39 2014 -0500
Committer: Matt Sicker <ma...@apache.org>
Committed: Tue Oct 7 21:00:39 2014 -0500
----------------------------------------------------------------------
.../src/main/java/org/apache/logging/log4j/web/WebLookup.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/3df43dd2/log4j-web/src/main/java/org/apache/logging/log4j/web/WebLookup.java
----------------------------------------------------------------------
diff --git a/log4j-web/src/main/java/org/apache/logging/log4j/web/WebLookup.java b/log4j-web/src/main/java/org/apache/logging/log4j/web/WebLookup.java
index eb0a26a..935fa1c 100644
--- a/log4j-web/src/main/java/org/apache/logging/log4j/web/WebLookup.java
+++ b/log4j-web/src/main/java/org/apache/logging/log4j/web/WebLookup.java
@@ -22,10 +22,10 @@ import javax.servlet.ServletContext;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.core.LogEvent;
-import org.apache.logging.log4j.core.LoggerContext;
import org.apache.logging.log4j.core.config.plugins.Plugin;
import org.apache.logging.log4j.core.impl.ContextAnchor;
import org.apache.logging.log4j.core.lookup.AbstractLookup;
+import org.apache.logging.log4j.spi.LoggerContext;
@Plugin(name = "web", category = "Lookup")
public class WebLookup extends AbstractLookup {
@@ -35,7 +35,7 @@ public class WebLookup extends AbstractLookup {
protected ServletContext getServletContext() {
LoggerContext lc = ContextAnchor.THREAD_CONTEXT.get();
if (lc == null) {
- lc = (LoggerContext) LogManager.getContext(false);
+ lc = LogManager.getContext(false);
}
if (lc != null) {
final Object obj = lc.getExternalContext();
[3/3] git commit: Use PropertiesUtil instead of System.getProperty().
Posted by ma...@apache.org.
Use PropertiesUtil instead of System.getProperty().
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/4af3ef8a
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/4af3ef8a
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/4af3ef8a
Branch: refs/heads/master
Commit: 4af3ef8a4e7fee2408e1607835c45115b8d8cf5c
Parents: c17edce
Author: Matt Sicker <ma...@apache.org>
Authored: Tue Oct 7 21:02:28 2014 -0500
Committer: Matt Sicker <ma...@apache.org>
Committed: Tue Oct 7 21:02:28 2014 -0500
----------------------------------------------------------------------
.../java/org/apache/logging/log4j/core/util/ClockFactory.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4af3ef8a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/ClockFactory.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/ClockFactory.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/ClockFactory.java
index d45086a..098eeb7 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/ClockFactory.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/ClockFactory.java
@@ -17,6 +17,7 @@
package org.apache.logging.log4j.core.util;
import org.apache.logging.log4j.status.StatusLogger;
+import org.apache.logging.log4j.util.PropertiesUtil;
/**
* Factory for {@code Clock} objects.
@@ -62,7 +63,7 @@ public final class ClockFactory {
}
private static Clock createClock() {
- final String userRequest = System.getProperty(PROPERTY_NAME);
+ final String userRequest = PropertiesUtil.getProperties().getStringProperty(PROPERTY_NAME);
if (userRequest == null || "SystemClock".equals(userRequest)) {
LOGGER.debug("Using default SystemClock for timestamps");
return new SystemClock();
[2/3] git commit: Use LoaderUtil.loadClass instead of getTCCL
Posted by ma...@apache.org.
Use LoaderUtil.loadClass instead of getTCCL
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/c17edce9
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/c17edce9
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/c17edce9
Branch: refs/heads/master
Commit: c17edce96f6cc5585d86b9a5f2a5e619aa55f2b0
Parents: 3df43dd
Author: Matt Sicker <ma...@apache.org>
Authored: Tue Oct 7 21:01:12 2014 -0500
Committer: Matt Sicker <ma...@apache.org>
Committed: Tue Oct 7 21:01:12 2014 -0500
----------------------------------------------------------------------
.../src/main/java/org/apache/logging/log4j/LogManager.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/c17edce9/log4j-api/src/main/java/org/apache/logging/log4j/LogManager.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/LogManager.java b/log4j-api/src/main/java/org/apache/logging/log4j/LogManager.java
index 0f866b8..5eb03a5 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/LogManager.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/LogManager.java
@@ -71,12 +71,11 @@ public class LogManager {
// Shortcut binding to force a specific logging implementation.
final PropertiesUtil managerProps = PropertiesUtil.getProperties();
final String factoryClassName = managerProps.getStringProperty(FACTORY_PROPERTY_NAME);
- final ClassLoader cl = LoaderUtil.getThreadContextClassLoader();
if (factoryClassName != null) {
try {
- final Class<?> clazz = cl.loadClass(factoryClassName);
+ final Class<?> clazz = LoaderUtil.loadClass(factoryClassName);
if (LoggerContextFactory.class.isAssignableFrom(clazz)) {
- factory = (LoggerContextFactory) clazz.newInstance();
+ factory = clazz.asSubclass(LoggerContextFactory.class).newInstance();
}
} catch (final ClassNotFoundException cnfe) {
LOGGER.error("Unable to locate configured LoggerContextFactory {}", factoryClassName);