You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rp...@apache.org on 2016/08/23 13:40:58 UTC
[01/22] logging-log4j2 git commit: Comment.
Repository: logging-log4j2
Updated Branches:
refs/heads/LOG4J2-1010&LOG4J2-1447-injectable-contextdata&better-datastructure 88d2066d9 -> e5a3b9e1c
Comment.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/0b1c77d3
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/0b1c77d3
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/0b1c77d3
Branch: refs/heads/LOG4J2-1010&LOG4J2-1447-injectable-contextdata&better-datastructure
Commit: 0b1c77d355a9dc4a687cffae3901881eb3d9cfef
Parents: c67ed22
Author: ggregory <gg...@US-L-GG02.rocketsoftware.com>
Authored: Mon Aug 22 10:20:36 2016 -0700
Committer: ggregory <gg...@US-L-GG02.rocketsoftware.com>
Committed: Mon Aug 22 10:20:36 2016 -0700
----------------------------------------------------------------------
.../core/selector/BasicContextSelector.java | 131 ++++++++++---------
1 file changed, 66 insertions(+), 65 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/0b1c77d3/log4j-core/src/main/java/org/apache/logging/log4j/core/selector/BasicContextSelector.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/selector/BasicContextSelector.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/selector/BasicContextSelector.java
index 4b2c74a..502084d 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/selector/BasicContextSelector.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/selector/BasicContextSelector.java
@@ -1,65 +1,66 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache license, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the license for the specific language governing permissions and
- * limitations under the license.
- */
-package org.apache.logging.log4j.core.selector;
-
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.apache.logging.log4j.core.LoggerContext;
-import org.apache.logging.log4j.core.impl.ContextAnchor;
-
-/**
- * Returns either this Thread's context or the default LoggerContext.
- */
-public class BasicContextSelector implements ContextSelector {
-
- private static final LoggerContext CONTEXT = new LoggerContext("Default");
-
- @Override
- public LoggerContext getContext(final String fqcn, final ClassLoader loader, final boolean currentContext) {
-
- final LoggerContext ctx = ContextAnchor.THREAD_CONTEXT.get();
- return ctx != null ? ctx : CONTEXT;
- }
-
-
- @Override
- public LoggerContext getContext(final String fqcn, final ClassLoader loader, final boolean currentContext,
- final URI configLocation) {
-
- final LoggerContext ctx = ContextAnchor.THREAD_CONTEXT.get();
- return ctx != null ? ctx : CONTEXT;
- }
-
- public LoggerContext locateContext(final String name, final String configLocation) {
- return CONTEXT;
- }
-
- @Override
- public void removeContext(final LoggerContext context) {
- }
-
- @Override
- public List<LoggerContext> getLoggerContexts() {
- final List<LoggerContext> list = new ArrayList<>();
- list.add(CONTEXT);
- return Collections.unmodifiableList(list);
- }
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache license, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the license for the specific language governing permissions and
+ * limitations under the license.
+ */
+package org.apache.logging.log4j.core.selector;
+
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import org.apache.logging.log4j.core.LoggerContext;
+import org.apache.logging.log4j.core.impl.ContextAnchor;
+
+/**
+ * Returns either this Thread's context or the default LoggerContext.
+ */
+public class BasicContextSelector implements ContextSelector {
+
+ private static final LoggerContext CONTEXT = new LoggerContext("Default");
+
+ @Override
+ public LoggerContext getContext(final String fqcn, final ClassLoader loader, final boolean currentContext) {
+
+ final LoggerContext ctx = ContextAnchor.THREAD_CONTEXT.get();
+ return ctx != null ? ctx : CONTEXT;
+ }
+
+
+ @Override
+ public LoggerContext getContext(final String fqcn, final ClassLoader loader, final boolean currentContext,
+ final URI configLocation) {
+
+ final LoggerContext ctx = ContextAnchor.THREAD_CONTEXT.get();
+ return ctx != null ? ctx : CONTEXT;
+ }
+
+ public LoggerContext locateContext(final String name, final String configLocation) {
+ return CONTEXT;
+ }
+
+ @Override
+ public void removeContext(final LoggerContext context) {
+ // does not remove anything
+ }
+
+ @Override
+ public List<LoggerContext> getLoggerContexts() {
+ final List<LoggerContext> list = new ArrayList<>();
+ list.add(CONTEXT);
+ return Collections.unmodifiableList(list);
+ }
+
+}
[19/22] logging-log4j2 git commit: Document empty blocks.
Posted by rp...@apache.org.
Document empty blocks.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/d4e96049
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/d4e96049
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/d4e96049
Branch: refs/heads/LOG4J2-1010&LOG4J2-1447-injectable-contextdata&better-datastructure
Commit: d4e9604940bb80f2c17c506045f880a3139d2fb8
Parents: c990920
Author: Gary Gregory <gg...@apache.org>
Authored: Mon Aug 22 23:08:20 2016 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Mon Aug 22 23:08:20 2016 -0700
----------------------------------------------------------------------
.../logging/log4j/core/config/plugins/PluginBuilderFactory.java | 1 +
.../logging/log4j/core/config/plugins/PluginConfiguration.java | 1 +
.../org/apache/logging/log4j/core/config/plugins/PluginNode.java | 1 +
3 files changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/d4e96049/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginBuilderFactory.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginBuilderFactory.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginBuilderFactory.java
index 3effa6f..4e69262 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginBuilderFactory.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginBuilderFactory.java
@@ -30,4 +30,5 @@ import java.lang.annotation.Target;
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.METHOD)
public @interface PluginBuilderFactory {
+ // empty
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/d4e96049/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginConfiguration.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginConfiguration.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginConfiguration.java
index e67c42e..ac7eb74 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginConfiguration.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginConfiguration.java
@@ -33,4 +33,5 @@ import org.apache.logging.log4j.core.config.plugins.visitors.PluginConfiguration
@Target({ElementType.PARAMETER, ElementType.FIELD})
@PluginVisitorStrategy(PluginConfigurationVisitor.class)
public @interface PluginConfiguration {
+ // empty
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/d4e96049/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginNode.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginNode.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginNode.java
index 093214e..d60f1b5 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginNode.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginNode.java
@@ -32,4 +32,5 @@ import org.apache.logging.log4j.core.config.plugins.visitors.PluginNodeVisitor;
@Target({ElementType.PARAMETER, ElementType.FIELD})
@PluginVisitorStrategy(PluginNodeVisitor.class)
public @interface PluginNode {
+ // empty
}
[20/22] logging-log4j2 git commit: Document empty blocks.
Posted by rp...@apache.org.
Document empty blocks.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/0b28bc26
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/0b28bc26
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/0b28bc26
Branch: refs/heads/LOG4J2-1010&LOG4J2-1447-injectable-contextdata&better-datastructure
Commit: 0b28bc2693ebc1956aa1afab38cd2dec0eba19cf
Parents: d4e9604
Author: Gary Gregory <gg...@apache.org>
Authored: Mon Aug 22 23:08:37 2016 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Mon Aug 22 23:08:37 2016 -0700
----------------------------------------------------------------------
.../apache/logging/log4j/core/config/plugins/PluginFactory.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/0b28bc26/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginFactory.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginFactory.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginFactory.java
index ac7db29..1c04106 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginFactory.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginFactory.java
@@ -33,5 +33,5 @@ import java.lang.annotation.Target;
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.METHOD)
public @interface PluginFactory {
-
+ // empty
}
[05/22] logging-log4j2 git commit: [LOG4J2-1532] Attributes are not
merged properly in composite configurations.
Posted by rp...@apache.org.
[LOG4J2-1532] Attributes are not merged properly in composite
configurations.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/3a4d9a65
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/3a4d9a65
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/3a4d9a65
Branch: refs/heads/LOG4J2-1010&LOG4J2-1447-injectable-contextdata&better-datastructure
Commit: 3a4d9a65f3ab3dc74e7db063b4cea3b14c1f8abd
Parents: 7eba2e9
Author: Gary Gregory <gg...@apache.org>
Authored: Mon Aug 22 17:16:32 2016 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Mon Aug 22 17:16:32 2016 -0700
----------------------------------------------------------------------
.../logging/log4j/core/LoggerContext.java | 26 +++++++++++++-------
src/changes/changes.xml | 3 +++
2 files changed, 20 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/3a4d9a65/log4j-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java
index cfb4945..ce78615 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java
@@ -485,7 +485,11 @@ public class LoggerContext extends AbstractLifeCycle
* @return The previous Configuration.
*/
private Configuration setConfiguration(final Configuration config) {
- Objects.requireNonNull(config, "No Configuration was provided");
+ if (config == null) {
+ LOGGER.error("No configuration found for context '%s'.", contextName);
+ // No change, return the current configuration.
+ return this.configuration;
+ }
configLock.lock();
try {
final Configuration prev = this.configuration;
@@ -569,14 +573,18 @@ public class LoggerContext extends AbstractLifeCycle
LOGGER.debug("Reconfiguration started for context[name={}] at URI {} ({}) with optional ClassLoader: {}",
contextName, configURI, this, cl);
final Configuration instance = ConfigurationFactory.getInstance().getConfiguration(contextName, configURI, cl);
- setConfiguration(instance);
- /*
- * instance.start(); Configuration old = setConfiguration(instance); updateLoggers(); if (old != null) {
- * old.stop(); }
- */
- final String location = configuration == null ? "?" : String.valueOf(configuration.getConfigurationSource());
- LOGGER.debug("Reconfiguration complete for context[name={}] at URI {} ({}) with optional ClassLoader: {}",
- contextName, location, this, cl);
+ if (instance == null) {
+ LOGGER.error("Reconfiguration failed: No configuration found for '%s' at '%s' in '%s'", contextName, configURI, cl);
+ } else {
+ setConfiguration(instance);
+ /*
+ * instance.start(); Configuration old = setConfiguration(instance); updateLoggers(); if (old != null) {
+ * old.stop(); }
+ */
+ final String location = configuration == null ? "?" : String.valueOf(configuration.getConfigurationSource());
+ LOGGER.debug("Reconfiguration complete for context[name={}] at URI {} ({}) with optional ClassLoader: {}",
+ contextName, location, this, cl);
+ }
}
/**
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/3a4d9a65/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 767e097..98c0aee 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -24,6 +24,9 @@
</properties>
<body>
<release version="2.7" date="2016-MM-DD" description="GA Release 2.7">
+ <action issue="LOG4J2-1532" dev="ggregory" type="fix" due-to="Gary Gregory">
+ Attributes are not merged properly in composite configurations.
+ </action>
<action issue="LOG4J2-1529" dev="mattsicker" type="fix" due-to="Sridevi Narra">
Attributes are not merged properly in composite configurations.
</action>
[02/22] logging-log4j2 git commit: ThreadContextMap2 extends
ThreadContextMap.
Posted by rp...@apache.org.
ThreadContextMap2 extends ThreadContextMap.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/d145cdbb
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/d145cdbb
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/d145cdbb
Branch: refs/heads/LOG4J2-1010&LOG4J2-1447-injectable-contextdata&better-datastructure
Commit: d145cdbb3a125894e13f33ee92ed19332a6c3beb
Parents: 0b1c77d
Author: Gary Gregory <gg...@apache.org>
Authored: Mon Aug 22 15:58:13 2016 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Mon Aug 22 15:58:13 2016 -0700
----------------------------------------------------------------------
.../java/org/apache/logging/log4j/spi/DefaultThreadContextMap.java | 2 +-
.../main/java/org/apache/logging/log4j/spi/ThreadContextMap2.java | 2 +-
.../src/main/java/org/apache/logging/slf4j/MDCContextMap.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/d145cdbb/log4j-api/src/main/java/org/apache/logging/log4j/spi/DefaultThreadContextMap.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/spi/DefaultThreadContextMap.java b/log4j-api/src/main/java/org/apache/logging/log4j/spi/DefaultThreadContextMap.java
index a45ece5..92822b9 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/spi/DefaultThreadContextMap.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/spi/DefaultThreadContextMap.java
@@ -28,7 +28,7 @@ import org.apache.logging.log4j.util.PropertiesUtil;
* expected that the Map will be passed to many more log events than the number of keys it contains the performance
* should be much better than if the Map was copied for each event.
*/
-public class DefaultThreadContextMap implements ThreadContextMap, ThreadContextMap2 {
+public class DefaultThreadContextMap implements ThreadContextMap2 {
/**
* Property name ({@value} ) for selecting {@code InheritableThreadLocal} (value "true") or plain
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/d145cdbb/log4j-api/src/main/java/org/apache/logging/log4j/spi/ThreadContextMap2.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/spi/ThreadContextMap2.java b/log4j-api/src/main/java/org/apache/logging/log4j/spi/ThreadContextMap2.java
index 7eba48d..4def1b3 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/spi/ThreadContextMap2.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/spi/ThreadContextMap2.java
@@ -25,7 +25,7 @@ import java.util.Map;
* @see ThreadContextMap
* @since 2.7
*/
-public interface ThreadContextMap2 {
+public interface ThreadContextMap2 extends ThreadContextMap {
/**
* Puts all given context map entries into the current thread's
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/d145cdbb/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/MDCContextMap.java
----------------------------------------------------------------------
diff --git a/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/MDCContextMap.java b/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/MDCContextMap.java
index 9b0251a..4ec6896 100644
--- a/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/MDCContextMap.java
+++ b/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/MDCContextMap.java
@@ -26,7 +26,7 @@ import org.slf4j.MDC;
/**
* Bind the ThreadContextMap to the SLF4J MDC.
*/
-public class MDCContextMap implements ThreadContextMap, ThreadContextMap2 {
+public class MDCContextMap implements ThreadContextMap2 {
@Override
public void put(final String key, final String value) {
[17/22] logging-log4j2 git commit: Remove unused imports.
Posted by rp...@apache.org.
Remove unused imports.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/b6bd15a5
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/b6bd15a5
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/b6bd15a5
Branch: refs/heads/LOG4J2-1010&LOG4J2-1447-injectable-contextdata&better-datastructure
Commit: b6bd15a5ee4be4b12628d93cefc0459c40bae628
Parents: a039b4b
Author: Gary Gregory <gg...@apache.org>
Authored: Mon Aug 22 23:07:29 2016 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Mon Aug 22 23:07:29 2016 -0700
----------------------------------------------------------------------
.../logging/log4j/core/config/plugins/util/PluginBuilder.java | 2 --
1 file changed, 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/b6bd15a5/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginBuilder.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginBuilder.java
index 8da7356..3805dea 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginBuilder.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginBuilder.java
@@ -23,8 +23,6 @@ import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
-import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Collection;
import java.util.List;
import java.util.Map;
[16/22] logging-log4j2 git commit: @deprecated Use {@link
StandardCharsets#UTF_8}. Will be removed in 2.5.
Posted by rp...@apache.org.
@deprecated Use {@link StandardCharsets#UTF_8}. Will be removed in 2.5.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/a039b4b0
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/a039b4b0
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/a039b4b0
Branch: refs/heads/LOG4J2-1010&LOG4J2-1447-injectable-contextdata&better-datastructure
Commit: a039b4b0dffd291d036c6daa4fc9cb5a28b8ce86
Parents: ad673e4
Author: Gary Gregory <gg...@apache.org>
Authored: Mon Aug 22 22:58:26 2016 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Mon Aug 22 22:58:26 2016 -0700
----------------------------------------------------------------------
.../main/java/org/apache/logging/log4j/core/util/Constants.java | 3 ---
1 file changed, 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a039b4b0/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Constants.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Constants.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Constants.java
index a5eee73..0b841eb 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Constants.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Constants.java
@@ -16,9 +16,6 @@
*/
package org.apache.logging.log4j.core.util;
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
-
import org.apache.logging.log4j.util.PropertiesUtil;
/**
[13/22] logging-log4j2 git commit: Javadoc nit.
Posted by rp...@apache.org.
Javadoc nit.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/99c96e70
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/99c96e70
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/99c96e70
Branch: refs/heads/LOG4J2-1010&LOG4J2-1447-injectable-contextdata&better-datastructure
Commit: 99c96e70571854d7377fcdd9a4a498c2cf310cec
Parents: aeea0bc
Author: Gary Gregory <gg...@apache.org>
Authored: Mon Aug 22 22:48:44 2016 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Mon Aug 22 22:48:44 2016 -0700
----------------------------------------------------------------------
.../java/org/apache/logging/log4j/core/config/LoggerConfig.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/99c96e70/log4j-core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java
index 97db13f..02fe245 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java
@@ -433,7 +433,7 @@ public class LoggerConfig extends AbstractFilterable {
/**
* Factory method to create a LoggerConfig.
*
- * @param additivity True if additive, false otherwise.
+ * @param additivity true if additive, false otherwise.
* @param level The Level to be associated with the Logger.
* @param loggerName The name of the Logger.
* @param includeLocation whether location should be passed downstream
[10/22] logging-log4j2 git commit: Javadoc says: "@deprecated Will be
removed in 2.5." and 2.6.2 is the current release.
Posted by rp...@apache.org.
Javadoc says: "@deprecated Will be removed in 2.5." and 2.6.2 is the
current release.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/cee9414b
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/cee9414b
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/cee9414b
Branch: refs/heads/LOG4J2-1010&LOG4J2-1447-injectable-contextdata&better-datastructure
Commit: cee9414b1a639e384df5f3dacb33b2e8e6e1737b
Parents: b7da5e7
Author: Gary Gregory <gg...@apache.org>
Authored: Mon Aug 22 22:35:50 2016 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Mon Aug 22 22:35:50 2016 -0700
----------------------------------------------------------------------
.../apache/logging/log4j/core/util/Assert.java | 36 --------------------
1 file changed, 36 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/cee9414b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Assert.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Assert.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Assert.java
index ff5b1e3..d2ddf81 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Assert.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Assert.java
@@ -31,40 +31,4 @@ public final class Assert {
}
return value;
}
-
- /**
- * Throws a {@code NullPointerException} if the specified parameter is
- * {@code null}, otherwise returns the specified parameter.
- * <p>
- * On Java 7, just use {@code Objects.requireNonNull(T, String)}
- * </p>
- * <p>
- * Usage:
- * </p>
- * <pre>
- * // earlier you would write this:
- * public SomeConstructor(Object param) {
- * if (param == null) {
- * throw new NullPointerException("param");
- * }
- * this.field = param;
- * }
- *
- * // now you can do the same in one line:
- * public SomeConstructor(Object param) {
- * this.field = Assert.requireNonNull("param");
- * }
- * </pre>
- *
- * @param <T> the type of the parameter to check and return
- * @param object the parameter to check
- * @param message message to populate the NPE with if necessary
- * @return the specified parameter
- * @throws NullPointerException if {@code object} is {@code null}
- * @deprecated Will be removed in 2.5.
- */
- @Deprecated
- public static <T> T requireNonNull(final T object, final String message) {
- return Objects.requireNonNull(object, message);
- }
}
[15/22] logging-log4j2 git commit: @deprecated Use {@link
StandardCharsets#UTF_8}. Will be removed in 2.5.
Posted by rp...@apache.org.
@deprecated Use {@link StandardCharsets#UTF_8}. Will be removed in 2.5.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/ad673e4c
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/ad673e4c
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/ad673e4c
Branch: refs/heads/LOG4J2-1010&LOG4J2-1447-injectable-contextdata&better-datastructure
Commit: ad673e4c1ebf8ec559c9b142c33a51fba73ef727
Parents: facb281
Author: Gary Gregory <gg...@apache.org>
Authored: Mon Aug 22 22:57:47 2016 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Mon Aug 22 22:57:47 2016 -0700
----------------------------------------------------------------------
.../java/org/apache/logging/log4j/core/util/Constants.java | 8 --------
1 file changed, 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ad673e4c/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Constants.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Constants.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Constants.java
index 09ec0bb..a5eee73 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Constants.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Constants.java
@@ -58,14 +58,6 @@ public final class Constants {
public static final int MILLIS_IN_SECONDS = 1000;
/**
- * Equivalent to StandardCharsets.UTF_8.
- *
- * @deprecated Use {@link StandardCharsets#UTF_8}. Will be removed in 2.5.
- */
- @Deprecated
- public static final Charset UTF_8 = StandardCharsets.UTF_8;
-
- /**
* Supports user request LOG4J2-898 to have the option to format a message in the background thread.
*/
public static final boolean FORMAT_MESSAGES_IN_BACKGROUND = PropertiesUtil.getProperties().getBooleanProperty(
[09/22] logging-log4j2 git commit: [LOG4J2-1541] Fix file handle
resource leak in XmlConfiguration.XmlConfiguration(ConfigurationSource).
Posted by rp...@apache.org.
[LOG4J2-1541] Fix file handle resource leak in
XmlConfiguration.XmlConfiguration(ConfigurationSource).
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/b7da5e73
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/b7da5e73
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/b7da5e73
Branch: refs/heads/LOG4J2-1010&LOG4J2-1447-injectable-contextdata&better-datastructure
Commit: b7da5e73cf30afd1ab130c5157fbb2bc59bbb90d
Parents: de319af
Author: Gary Gregory <gg...@apache.org>
Authored: Mon Aug 22 19:18:14 2016 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Mon Aug 22 19:18:14 2016 -0700
----------------------------------------------------------------------
.../log4j/core/config/xml/XmlConfiguration.java | 40 ++++++++++----------
src/changes/changes.xml | 3 ++
2 files changed, 22 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/b7da5e73/log4j-core/src/main/java/org/apache/logging/log4j/core/config/xml/XmlConfiguration.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/xml/XmlConfiguration.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/xml/XmlConfiguration.java
index ea3f753..799a49e 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/xml/XmlConfiguration.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/xml/XmlConfiguration.java
@@ -147,31 +147,29 @@ public class XmlConfiguration extends AbstractConfiguration implements Reconfigu
LOGGER.error("Error parsing " + configSource.getLocation(), e);
}
if (strict && schemaResource != null && buffer != null) {
- InputStream is = null;
- try {
- is = Loader.getResourceAsStream(schemaResource, XmlConfiguration.class.getClassLoader());
- } catch (final Exception ex) {
- LOGGER.error("Unable to access schema {}", this.schemaResource, ex);
- }
- if (is != null) {
- final Source src = new StreamSource(is, LOG4J_XSD);
- final SchemaFactory factory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
- Schema schema = null;
- try {
- schema = factory.newSchema(src);
- } catch (final SAXException ex) {
- LOGGER.error("Error parsing Log4j schema", ex);
- }
- if (schema != null) {
- final Validator validator = schema.newValidator();
+ try (InputStream is = Loader.getResourceAsStream(schemaResource, XmlConfiguration.class.getClassLoader())) {
+ if (is != null) {
+ final Source src = new StreamSource(is, LOG4J_XSD);
+ final SchemaFactory factory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
+ Schema schema = null;
try {
- validator.validate(new StreamSource(new ByteArrayInputStream(buffer)));
- } catch (final IOException ioe) {
- LOGGER.error("Error reading configuration for validation", ioe);
+ schema = factory.newSchema(src);
} catch (final SAXException ex) {
- LOGGER.error("Error validating configuration", ex);
+ LOGGER.error("Error parsing Log4j schema", ex);
+ }
+ if (schema != null) {
+ final Validator validator = schema.newValidator();
+ try {
+ validator.validate(new StreamSource(new ByteArrayInputStream(buffer)));
+ } catch (final IOException ioe) {
+ LOGGER.error("Error reading configuration for validation", ioe);
+ } catch (final SAXException ex) {
+ LOGGER.error("Error validating configuration", ex);
+ }
}
}
+ } catch (final Exception ex) {
+ LOGGER.error("Unable to access schema {}", this.schemaResource, ex);
}
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/b7da5e73/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 93eeef0..f44d7ac 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -24,6 +24,9 @@
</properties>
<body>
<release version="2.7" date="2016-MM-DD" description="GA Release 2.7">
+ <action issue="LOG4J2-1541" dev="ggregory" type="fix" due-to="Gary Gregory">
+ Fix file handle resource leak in XmlConfiguration.XmlConfiguration(ConfigurationSource).
+ </action>
<action issue="LOG4J2-1538" dev="ggregory" type="fix" due-to="Igor Karpov">
Dynamic removal of filter may cause NPE.
</action>
[04/22] logging-log4j2 git commit: Javadoc: Hopefully oh so slightly
nicer comment.
Posted by rp...@apache.org.
Javadoc: Hopefully oh so slightly nicer comment.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/7eba2e96
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/7eba2e96
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/7eba2e96
Branch: refs/heads/LOG4J2-1010&LOG4J2-1447-injectable-contextdata&better-datastructure
Commit: 7eba2e962fd8f4a89ee25be66ddbf34115f85ace
Parents: b6ec601
Author: Gary Gregory <gg...@apache.org>
Authored: Mon Aug 22 16:35:34 2016 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Mon Aug 22 16:35:34 2016 -0700
----------------------------------------------------------------------
.../logging/log4j/core/appender/rolling/TriggeringPolicy.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7eba2e96/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/TriggeringPolicy.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/TriggeringPolicy.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/TriggeringPolicy.java
index 21181e5..412099b 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/TriggeringPolicy.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/TriggeringPolicy.java
@@ -26,7 +26,7 @@ import org.apache.logging.log4j.core.LogEvent;
public interface TriggeringPolicy {
/**
- * Initializes the Policy.
+ * Initializes this triggering policy.
* @param manager The RollingFileManager.
*/
[03/22] logging-log4j2 git commit: Javadoc: Use the active voice.
Posted by rp...@apache.org.
Javadoc: Use the active voice.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/b6ec6015
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/b6ec6015
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/b6ec6015
Branch: refs/heads/LOG4J2-1010&LOG4J2-1447-injectable-contextdata&better-datastructure
Commit: b6ec60158b32d76cdd427615718866340f806f12
Parents: d145cdb
Author: Gary Gregory <gg...@apache.org>
Authored: Mon Aug 22 16:34:36 2016 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Mon Aug 22 16:34:36 2016 -0700
----------------------------------------------------------------------
.../logging/log4j/core/appender/rolling/TriggeringPolicy.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/b6ec6015/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/TriggeringPolicy.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/TriggeringPolicy.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/TriggeringPolicy.java
index 9f3001c..21181e5 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/TriggeringPolicy.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/TriggeringPolicy.java
@@ -26,7 +26,7 @@ import org.apache.logging.log4j.core.LogEvent;
public interface TriggeringPolicy {
/**
- * Initialize the Policy.
+ * Initializes the Policy.
* @param manager The RollingFileManager.
*/
[06/22] logging-log4j2 git commit: [LOG4J2-1538] Dynamic removal of
filter may cause NPE.
Posted by rp...@apache.org.
[LOG4J2-1538] Dynamic removal of filter may cause NPE.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/9bea362a
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/9bea362a
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/9bea362a
Branch: refs/heads/LOG4J2-1010&LOG4J2-1447-injectable-contextdata&better-datastructure
Commit: 9bea362a0440cfed0e12eb503e95e1c8eadbe827
Parents: 3a4d9a6
Author: Gary Gregory <gg...@apache.org>
Authored: Mon Aug 22 17:24:36 2016 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Mon Aug 22 17:24:36 2016 -0700
----------------------------------------------------------------------
.../org/apache/logging/log4j/core/config/AppenderControl.java | 3 ++-
src/changes/changes.xml | 3 +++
2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/9bea362a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AppenderControl.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AppenderControl.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AppenderControl.java
index 68d4db1..de0a777 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AppenderControl.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AppenderControl.java
@@ -90,7 +90,8 @@ public class AppenderControl extends AbstractFilterable {
@PerformanceSensitive
private boolean isFilteredByAppenderControl(final LogEvent event) {
- return getFilter() != null && Filter.Result.DENY == getFilter().filter(event);
+ final Filter filter = getFilter();
+ return filter != null && Filter.Result.DENY == filter.filter(event);
}
@PerformanceSensitive
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/9bea362a/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 98c0aee..93eeef0 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -24,6 +24,9 @@
</properties>
<body>
<release version="2.7" date="2016-MM-DD" description="GA Release 2.7">
+ <action issue="LOG4J2-1538" dev="ggregory" type="fix" due-to="Igor Karpov">
+ Dynamic removal of filter may cause NPE.
+ </action>
<action issue="LOG4J2-1532" dev="ggregory" type="fix" due-to="Gary Gregory">
Attributes are not merged properly in composite configurations.
</action>
[07/22] logging-log4j2 git commit: Remove unused static var.
Posted by rp...@apache.org.
Remove unused static var.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/2383cb8c
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/2383cb8c
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/2383cb8c
Branch: refs/heads/LOG4J2-1010&LOG4J2-1447-injectable-contextdata&better-datastructure
Commit: 2383cb8cec91509f1a81943c248a00cba558d90a
Parents: 9bea362
Author: Gary Gregory <gg...@apache.org>
Authored: Mon Aug 22 18:34:41 2016 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Mon Aug 22 18:34:41 2016 -0700
----------------------------------------------------------------------
.../java/org/apache/logging/log4j/core/script/ScriptManager.java | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/2383cb8c/log4j-core/src/main/java/org/apache/logging/log4j/core/script/ScriptManager.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/script/ScriptManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/script/ScriptManager.java
index 62b82c2..298c307 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/script/ScriptManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/script/ScriptManager.java
@@ -50,7 +50,6 @@ public class ScriptManager implements FileWatcher, Serializable {
private final ConcurrentMap<String, ScriptRunner> scripts = new ConcurrentHashMap<>();
private final String languages;
private final WatchManager watchManager;
- private static final SecurityManager SECURITY_MANAGER = System.getSecurityManager();
public ScriptManager(final WatchManager watchManager) {
this.watchManager = watchManager;
[18/22] logging-log4j2 git commit: Remove unused imports.
Posted by rp...@apache.org.
Remove unused imports.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/c990920f
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/c990920f
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/c990920f
Branch: refs/heads/LOG4J2-1010&LOG4J2-1447-injectable-contextdata&better-datastructure
Commit: c990920f55daed9b985e4529cef83646b78c62ad
Parents: b6bd15a
Author: Gary Gregory <gg...@apache.org>
Authored: Mon Aug 22 23:07:42 2016 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Mon Aug 22 23:07:42 2016 -0700
----------------------------------------------------------------------
.../src/main/java/org/apache/logging/log4j/core/util/Assert.java | 2 --
1 file changed, 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/c990920f/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Assert.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Assert.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Assert.java
index d2ddf81..e37090f 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Assert.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Assert.java
@@ -16,8 +16,6 @@
*/
package org.apache.logging.log4j.core.util;
-import java.util.Objects;
-
/**
* Utility class providing common validation logic.
*/
[22/22] logging-log4j2 git commit: Merge remote-tracking branch
'remotes/origin/master' into
LOG4J2-1010&LOG4J2-1447-injectable-contextdata&better-datastructure
Posted by rp...@apache.org.
Merge remote-tracking branch 'remotes/origin/master' into LOG4J2-1010&LOG4J2-1447-injectable-contextdata&better-datastructure
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/e5a3b9e1
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/e5a3b9e1
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/e5a3b9e1
Branch: refs/heads/LOG4J2-1010&LOG4J2-1447-injectable-contextdata&better-datastructure
Commit: e5a3b9e1ce8c660631c85ad4e501ad2bf9f7fbe8
Parents: 88d2066 6ad8fca
Author: rpopma <rp...@apache.org>
Authored: Tue Aug 23 22:40:26 2016 +0900
Committer: rpopma <rp...@apache.org>
Committed: Tue Aug 23 22:40:26 2016 +0900
----------------------------------------------------------------------
.../log4j/spi/DefaultThreadContextMap.java | 2 +-
.../logging/log4j/spi/ThreadContextMap2.java | 2 +-
.../logging/log4j/core/LoggerContext.java | 26 ++--
.../core/appender/rolling/TriggeringPolicy.java | 2 +-
.../core/config/AbstractConfiguration.java | 1 +
.../log4j/core/config/AppenderControl.java | 3 +-
.../logging/log4j/core/config/LoggerConfig.java | 36 +----
.../config/plugins/PluginBuilderFactory.java | 1 +
.../config/plugins/PluginConfiguration.java | 1 +
.../core/config/plugins/PluginFactory.java | 2 +-
.../log4j/core/config/plugins/PluginNode.java | 1 +
.../core/config/plugins/util/PluginBuilder.java | 2 -
.../config/plugins/util/PluginRegistry.java | 1 -
.../log4j/core/config/xml/XmlConfiguration.java | 40 +++---
.../log4j/core/script/ScriptManager.java | 1 -
.../core/selector/BasicContextSelector.java | 131 ++++++++++---------
.../apache/logging/log4j/core/util/Assert.java | 38 ------
.../logging/log4j/core/util/Constants.java | 11 --
.../org/apache/logging/slf4j/MDCContextMap.java | 2 +-
.../org/apache/logging/log4j/web/WebLookup.java | 8 --
src/changes/changes.xml | 9 ++
21 files changed, 123 insertions(+), 197 deletions(-)
----------------------------------------------------------------------
[21/22] logging-log4j2 git commit: Don't need
@SuppressWarnings({"unchecked", "rawtypes"}) anymore.
Posted by rp...@apache.org.
Don't need @SuppressWarnings({"unchecked","rawtypes"}) anymore.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/6ad8fca9
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/6ad8fca9
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/6ad8fca9
Branch: refs/heads/LOG4J2-1010&LOG4J2-1447-injectable-contextdata&better-datastructure
Commit: 6ad8fca98a16b0c8f5bed392901e86c9d5a26b92
Parents: 0b28bc2
Author: Gary Gregory <gg...@apache.org>
Authored: Mon Aug 22 23:09:51 2016 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Mon Aug 22 23:09:51 2016 -0700
----------------------------------------------------------------------
.../logging/log4j/core/config/plugins/util/PluginRegistry.java | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/6ad8fca9/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginRegistry.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginRegistry.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginRegistry.java
index 7e3e106..a657f1a 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginRegistry.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginRegistry.java
@@ -179,7 +179,6 @@ public class PluginRegistry {
final String className = entry.getClassName();
try {
final Class<?> clazz = loader.loadClass(className);
- @SuppressWarnings({"unchecked","rawtypes"})
final PluginType<?> type = new PluginType<>(entry, clazz, entry.getName());
types.add(type);
++pluginCount;
[14/22] logging-log4j2 git commit: Remove internal method that is
@deprecated Use {@link #createLogger(boolean, Level, String, String,
AppenderRef[], Property[], Configuration, Filter)}
Posted by rp...@apache.org.
Remove internal method that is @deprecated Use {@link
#createLogger(boolean, Level, String, String, AppenderRef[], Property[],
Configuration, Filter)}
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/facb281b
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/facb281b
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/facb281b
Branch: refs/heads/LOG4J2-1010&LOG4J2-1447-injectable-contextdata&better-datastructure
Commit: facb281ba2f5f83903a7aedf385f83d7f9520561
Parents: 99c96e7
Author: Gary Gregory <gg...@apache.org>
Authored: Mon Aug 22 22:54:57 2016 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Mon Aug 22 22:54:57 2016 -0700
----------------------------------------------------------------------
.../logging/log4j/core/config/LoggerConfig.java | 34 --------------------
1 file changed, 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/facb281b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java
index 02fe245..d5a03bc 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java
@@ -399,40 +399,6 @@ public class LoggerConfig extends AbstractFilterable {
/**
* Factory method to create a LoggerConfig.
*
- * @param additivity True if additive, false otherwise.
- * @param level The Level to be associated with the Logger.
- * @param loggerName The name of the Logger.
- * @param includeLocation whether location should be passed downstream
- * @param refs An array of Appender names.
- * @param properties Properties to pass to the Logger.
- * @param config The Configuration.
- * @param filter A Filter.
- * @return A new LoggerConfig.
- * @deprecated Use {@link #createLogger(boolean, Level, String, String, AppenderRef[], Property[], Configuration, Filter)}
- */
- @Deprecated
- public static LoggerConfig createLogger(final String additivity,
- final Level level, @PluginAttribute("name") final String loggerName,
- final String includeLocation,
- final AppenderRef[] refs,
- final Property[] properties, @PluginConfiguration final Configuration config,
- final Filter filter) {
- if (loggerName == null) {
- LOGGER.error("Loggers cannot be configured without a name");
- return null;
- }
-
- final List<AppenderRef> appenderRefs = Arrays.asList(refs);
- final String name = loggerName.equals(ROOT) ? Strings.EMPTY : loggerName;
- final boolean additive = Booleans.parseBoolean(additivity, true);
-
- return new LoggerConfig(name, appenderRefs, filter, level, additive, properties, config,
- includeLocation(includeLocation));
- }
-
- /**
- * Factory method to create a LoggerConfig.
- *
* @param additivity true if additive, false otherwise.
* @param level The Level to be associated with the Logger.
* @param loggerName The name of the Logger.
[08/22] logging-log4j2 git commit: Comment.
Posted by rp...@apache.org.
Comment.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/de319aff
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/de319aff
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/de319aff
Branch: refs/heads/LOG4J2-1010&LOG4J2-1447-injectable-contextdata&better-datastructure
Commit: de319aff7357db591c3f54b2235ea8691af72166
Parents: 2383cb8
Author: Gary Gregory <gg...@apache.org>
Authored: Mon Aug 22 19:00:12 2016 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Mon Aug 22 19:00:12 2016 -0700
----------------------------------------------------------------------
.../org/apache/logging/log4j/core/config/AbstractConfiguration.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de319aff/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AbstractConfiguration.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AbstractConfiguration.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AbstractConfiguration.java
index a152ea7..bc42d1f 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AbstractConfiguration.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AbstractConfiguration.java
@@ -378,6 +378,7 @@ public abstract class AbstractConfiguration extends AbstractFilterable implement
}
public void setup() {
+ // default does nothing, subclasses do work.
}
protected Level getDefaultStatus() {
[11/22] logging-log4j2 git commit: @deprecated Use {@link
WebLoggerContextUtils#getServletContext()}.
Posted by rp...@apache.org.
@deprecated Use {@link WebLoggerContextUtils#getServletContext()}.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/98972e5d
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/98972e5d
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/98972e5d
Branch: refs/heads/LOG4J2-1010&LOG4J2-1447-injectable-contextdata&better-datastructure
Commit: 98972e5d1a5f8a18b02c5aa3bcc474dfe4629b16
Parents: cee9414
Author: Gary Gregory <gg...@apache.org>
Authored: Mon Aug 22 22:37:41 2016 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Mon Aug 22 22:37:41 2016 -0700
----------------------------------------------------------------------
.../main/java/org/apache/logging/log4j/web/WebLookup.java | 8 --------
1 file changed, 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/98972e5d/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 072f6c9..aa6d141 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
@@ -30,14 +30,6 @@ public class WebLookup extends AbstractLookup {
private static final String ATTR_PREFIX = "attr.";
private static final String INIT_PARAM_PREFIX = "initParam.";
- /**
- * @deprecated Use {@link WebLoggerContextUtils#getServletContext()}.
- */
- @Deprecated
- protected ServletContext getServletContext() {
- return WebLoggerContextUtils.getServletContext();
- }
-
@Override
public String lookup(final LogEvent event, final String key) {
final ServletContext ctx = WebLoggerContextUtils.getServletContext();
[12/22] logging-log4j2 git commit: Remove unneeded annotations in
deprecated method.
Posted by rp...@apache.org.
Remove unneeded annotations in deprecated 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/aeea0bce
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/aeea0bce
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/aeea0bce
Branch: refs/heads/LOG4J2-1010&LOG4J2-1447-injectable-contextdata&better-datastructure
Commit: aeea0bcee736022520b62ef5491458aae8ce3f46
Parents: 98972e5
Author: Gary Gregory <gg...@apache.org>
Authored: Mon Aug 22 22:47:01 2016 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Mon Aug 22 22:47:01 2016 -0700
----------------------------------------------------------------------
.../apache/logging/log4j/core/config/LoggerConfig.java | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/aeea0bce/log4j-core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java
index 3a3e04c..97db13f 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java
@@ -411,12 +411,12 @@ public class LoggerConfig extends AbstractFilterable {
* @deprecated Use {@link #createLogger(boolean, Level, String, String, AppenderRef[], Property[], Configuration, Filter)}
*/
@Deprecated
- public static LoggerConfig createLogger(@PluginAttribute("additivity") final String additivity,
- @PluginAttribute("level") final Level level, @PluginAttribute("name") final String loggerName,
- @PluginAttribute("includeLocation") final String includeLocation,
- @PluginElement("AppenderRef") final AppenderRef[] refs,
- @PluginElement("Properties") final Property[] properties, @PluginConfiguration final Configuration config,
- @PluginElement("Filter") final Filter filter) {
+ public static LoggerConfig createLogger(final String additivity,
+ final Level level, @PluginAttribute("name") final String loggerName,
+ final String includeLocation,
+ final AppenderRef[] refs,
+ final Property[] properties, @PluginConfiguration final Configuration config,
+ final Filter filter) {
if (loggerName == null) {
LOGGER.error("Loggers cannot be configured without a name");
return null;