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/21 20:28:54 UTC
[1/4] git commit: Fix typo.
Repository: logging-log4j2
Updated Branches:
refs/heads/master a1fb000e8 -> cc30d6dd6
Fix typo.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/c8b45ced
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/c8b45ced
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/c8b45ced
Branch: refs/heads/master
Commit: c8b45ced246efe2d57b3060747bc0540d5a3e287
Parents: a1fb000
Author: Matt Sicker <ma...@apache.org>
Authored: Sun Sep 21 13:17:12 2014 -0500
Committer: Matt Sicker <ma...@apache.org>
Committed: Sun Sep 21 13:17:12 2014 -0500
----------------------------------------------------------------------
.../apache/logging/log4j/core/selector/JndiContextSelector.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/c8b45ced/log4j-core/src/main/java/org/apache/logging/log4j/core/selector/JndiContextSelector.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/selector/JndiContextSelector.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/selector/JndiContextSelector.java
index 3f398a4..5f391e5 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/selector/JndiContextSelector.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/selector/JndiContextSelector.java
@@ -75,7 +75,7 @@ import org.apache.logging.log4j.status.StatusLogger;
* <env-entry>
* <description>URL for configuring log4j context</description>
* <env-entry-name>log4j/configuration-resource</env-entry-name>
- * <env-entry-value>urlOfConfigrationResource</env-entry-value>
+ * <env-entry-value>urlOfConfigurationResource</env-entry-value>
* <env-entry-type>java.lang.String</env-entry-type>
* </env-entry>
* </pre>
[3/4] git commit: Add getDefaultManager() method.
Posted by ma...@apache.org.
Add getDefaultManager() method.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/a1c6c16c
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/a1c6c16c
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/a1c6c16c
Branch: refs/heads/master
Commit: a1c6c16c31cc8d2536220d61e4e97ac3f4b12be9
Parents: f4a51e7
Author: Matt Sicker <ma...@apache.org>
Authored: Sun Sep 21 13:24:57 2014 -0500
Committer: Matt Sicker <ma...@apache.org>
Committed: Sun Sep 21 13:24:57 2014 -0500
----------------------------------------------------------------------
.../java/org/apache/logging/log4j/core/net/JndiManager.java | 9 +++++++++
1 file changed, 9 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a1c6c16c/log4j-core/src/main/java/org/apache/logging/log4j/core/net/JndiManager.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/JndiManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/JndiManager.java
index 8238547..14a9fe6 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/JndiManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/JndiManager.java
@@ -47,6 +47,15 @@ public class JndiManager extends AbstractManager {
}
/**
+ * Gets the default JndiManager using the default {@link javax.naming.InitialContext}.
+ *
+ * @return the default JndiManager
+ */
+ public static JndiManager getDefaultManager() {
+ return getManager(JndiManager.class.getName(), FACTORY, null);
+ }
+
+ /**
* Gets a named JndiManager using the default {@link javax.naming.InitialContext}.
* @param name the name of the JndiManager instance to create or use if available
* @return a default JndiManager
[2/4] git commit: Use JndiManager in JndiContextSelector.
Posted by ma...@apache.org.
Use JndiManager in JndiContextSelector.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/f4a51e71
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/f4a51e71
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/f4a51e71
Branch: refs/heads/master
Commit: f4a51e718410958d76fe0a4c387c00996a7b31e3
Parents: c8b45ce
Author: Matt Sicker <ma...@apache.org>
Authored: Sun Sep 21 13:22:31 2014 -0500
Committer: Matt Sicker <ma...@apache.org>
Committed: Sun Sep 21 13:22:31 2014 -0500
----------------------------------------------------------------------
.../core/selector/JndiContextSelector.java | 27 ++++----------------
1 file changed, 5 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f4a51e71/log4j-core/src/main/java/org/apache/logging/log4j/core/selector/JndiContextSelector.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/selector/JndiContextSelector.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/selector/JndiContextSelector.java
index 5f391e5..c6f4f05 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/selector/JndiContextSelector.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/selector/JndiContextSelector.java
@@ -23,16 +23,12 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
-
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NameNotFoundException;
import javax.naming.NamingException;
import org.apache.logging.log4j.core.LoggerContext;
import org.apache.logging.log4j.core.impl.ContextAnchor;
+import org.apache.logging.log4j.core.net.JndiManager;
import org.apache.logging.log4j.core.util.Constants;
-import org.apache.logging.log4j.core.util.JndiCloser;
import org.apache.logging.log4j.status.StatusLogger;
/**
@@ -112,14 +108,13 @@ public class JndiContextSelector implements NamedContextSelector {
String loggingContextName = null;
- Context ctx = null;
+ final JndiManager jndiManager = JndiManager.getDefaultManager(getClass().getName());
try {
- ctx = new InitialContext();
- loggingContextName = (String) lookup(ctx, Constants.JNDI_CONTEXT_NAME);
+ loggingContextName = jndiManager.lookup(Constants.JNDI_CONTEXT_NAME);
} catch (final NamingException ne) {
- LOGGER.error("Unable to lookup " + Constants.JNDI_CONTEXT_NAME, ne);
+ LOGGER.error("Unable to lookup {}", Constants.JNDI_CONTEXT_NAME, ne);
} finally {
- JndiCloser.closeSilently(ctx);
+ jndiManager.release();
}
return loggingContextName == null ? CONTEXT : locateContext(loggingContextName, null, configLocation);
@@ -159,16 +154,4 @@ public class JndiContextSelector implements NamedContextSelector {
return Collections.unmodifiableList(list);
}
-
- protected static Object lookup(final Context ctx, final String name) throws NamingException {
- if (ctx == null) {
- return null;
- }
- try {
- return ctx.lookup(name);
- } catch (final NameNotFoundException e) {
- LOGGER.error("Could not find name [" + name + "].");
- throw e;
- }
- }
}
[4/4] git commit: Use default JndiManager.
Posted by ma...@apache.org.
Use default JndiManager.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/cc30d6dd
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/cc30d6dd
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/cc30d6dd
Branch: refs/heads/master
Commit: cc30d6dd629cbf0529ce898d6c25305b2cff9f0e
Parents: a1c6c16
Author: Matt Sicker <ma...@apache.org>
Authored: Sun Sep 21 13:28:49 2014 -0500
Committer: Matt Sicker <ma...@apache.org>
Committed: Sun Sep 21 13:28:49 2014 -0500
----------------------------------------------------------------------
.../org/apache/logging/log4j/core/lookup/JndiLookup.java | 11 ++++-------
.../logging/log4j/core/selector/JndiContextSelector.java | 2 +-
2 files changed, 5 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/cc30d6dd/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/JndiLookup.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/JndiLookup.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/JndiLookup.java
index be97f1f..065c3b7 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/JndiLookup.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/JndiLookup.java
@@ -16,8 +16,6 @@
*/
package org.apache.logging.log4j.core.lookup;
-import javax.naming.Context;
-import javax.naming.InitialContext;
import javax.naming.NamingException;
import org.apache.logging.log4j.Logger;
@@ -25,7 +23,7 @@ import org.apache.logging.log4j.Marker;
import org.apache.logging.log4j.MarkerManager;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.config.plugins.Plugin;
-import org.apache.logging.log4j.core.util.JndiCloser;
+import org.apache.logging.log4j.core.net.JndiManager;
import org.apache.logging.log4j.status.StatusLogger;
/**
@@ -52,15 +50,14 @@ public class JndiLookup extends AbstractLookup {
return null;
}
final String jndiName = convertJndiName(key);
- Context ctx = null;
+ final JndiManager jndiManager = JndiManager.getDefaultManager();
try {
- ctx = new InitialContext();
- return (String) ctx.lookup(jndiName);
+ return jndiManager.lookup(jndiName);
} catch (final NamingException e) {
LOGGER.warn(LOOKUP, "Error looking up JNDI resource [{}].", jndiName, e);
return null;
} finally {
- JndiCloser.closeSilently(ctx);
+ jndiManager.release();
}
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/cc30d6dd/log4j-core/src/main/java/org/apache/logging/log4j/core/selector/JndiContextSelector.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/selector/JndiContextSelector.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/selector/JndiContextSelector.java
index c6f4f05..236d0f5 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/selector/JndiContextSelector.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/selector/JndiContextSelector.java
@@ -108,7 +108,7 @@ public class JndiContextSelector implements NamedContextSelector {
String loggingContextName = null;
- final JndiManager jndiManager = JndiManager.getDefaultManager(getClass().getName());
+ final JndiManager jndiManager = JndiManager.getDefaultManager();
try {
loggingContextName = jndiManager.lookup(Constants.JNDI_CONTEXT_NAME);
} catch (final NamingException ne) {