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/24 13:44:56 UTC
[01/10] logging-log4j2 git commit: [LOG4J2-1320] Custom plugins are
not loaded,
URL protocol vfs is not supported. Added unit tests but they are @Ignore'd
like the other tests of this type.
Repository: logging-log4j2
Updated Branches:
refs/heads/LOG4J2-1349-gcfree-threadcontext 4d656debd -> 37d47a62a
[LOG4J2-1320] Custom plugins are not loaded, URL protocol vfs is not
supported. Added unit tests but they are @Ignore'd like the other tests
of this type.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/2f091988
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/2f091988
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/2f091988
Branch: refs/heads/LOG4J2-1349-gcfree-threadcontext
Commit: 2f0919887a5211b8c3121a656e497ca0b44000a9
Parents: e9a1bbe
Author: Gary Gregory <gg...@apache.org>
Authored: Tue Aug 23 14:22:18 2016 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Tue Aug 23 14:22:18 2016 -0700
----------------------------------------------------------------------
.../core/config/plugins/util/ResolverUtil.java | 8 +++++++-
.../config/plugins/util/ResolverUtilTest.java | 20 ++++++++++++++++++++
src/changes/changes.xml | 3 +++
3 files changed, 30 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/2f091988/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/ResolverUtil.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/ResolverUtil.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/ResolverUtil.java
index b198490..14bf1e8 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/ResolverUtil.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/ResolverUtil.java
@@ -84,6 +84,8 @@ public class ResolverUtil {
private static final String VFSZIP = "vfszip";
+ private static final String VFS = "vfs";
+
private static final String BUNDLE_RESOURCE = "bundleresource";
/** The set of matches being accumulated. */
@@ -196,6 +198,10 @@ public class ResolverUtil {
} finally {
close(stream, newURL);
}
+ } else if (VFS.equals(url.getProtocol())) {
+ final String path = urlPath.substring(1, urlPath.length() - packageName.length() - 2);
+ final File file = new File(path);
+ loadImplementationsInJar(test, packageName, file);
} else if (BUNDLE_RESOURCE.equals(url.getProtocol())) {
loadImplementationsInBundle(test, packageName);
} else {
@@ -232,7 +238,7 @@ public class ResolverUtil {
// LOG4J2-445
// Finally, decide whether to URL-decode the file name or not...
final String protocol = url.getProtocol();
- final List<String> neverDecode = Arrays.asList(VFSZIP, BUNDLE_RESOURCE);
+ final List<String> neverDecode = Arrays.asList(VFS, VFSZIP, BUNDLE_RESOURCE);
if (neverDecode.contains(protocol)) {
return urlPath;
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/2f091988/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/util/ResolverUtilTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/util/ResolverUtilTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/util/ResolverUtilTest.java
index f7e7dac..cbcd23c 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/util/ResolverUtilTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/util/ResolverUtilTest.java
@@ -105,6 +105,16 @@ public class ResolverUtilTest {
@Ignore
@Test
+ public void testExtractPathFromVfsUrl() throws Exception {
+ // need to install URLStreamHandlerFactory to prevent "unknown protocol" MalformedURLException
+ final URL url = new URL(
+ "vfs:/C:/jboss/jboss-eap-6.4/standalone/deployments/com.xxx.yyy.application-ear.ear/lib/com.xxx.yyy.logging.jar/com/xxx/yyy/logging/config/");
+ final String expected = "/jboss/jboss-eap-6.4/standalone/deployments/com.xxx.yyy.application-ear.ear/lib/com.xxx.yyy.logging.jar/com/xxx/yyy/logging/config/";
+ assertEquals(expected, new ResolverUtil().extractPath(url));
+ }
+
+ @Ignore
+ @Test
public void testExtractPathFromVfszipUrlWithPlusCharacters()
throws Exception {
// need to install URLStreamHandlerFactory to prevent "unknown protocol" MalformedURLException
@@ -115,6 +125,16 @@ public class ResolverUtilTest {
@Ignore
@Test
+ public void testExtractPathFromVfsUrlWithPlusCharacters()
+ throws Exception {
+ // need to install URLStreamHandlerFactory to prevent "unknown protocol" MalformedURLException
+ final URL url = new URL("vfs:/path+with+plus/file+name+with+plus.xml");
+ final String expected = "/path+with+plus/file+name+with+plus.xml";
+ assertEquals(expected, new ResolverUtil().extractPath(url));
+ }
+
+ @Ignore
+ @Test
public void testExtractPathFromResourceBundleUrl() throws Exception {
// need to install URLStreamHandlerFactory to prevent "unknown protocol" MalformedURLException
final URL url = new URL("resourcebundle:/some/path/some/file.properties");
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/2f091988/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 42d61d0..d59c941 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-1320" dev="ggregory" type="fix" due-to="Paresh Varke, Pierrick Hymbert">
+ Custom plugins are not loaded, URL protocol vfs is not supported.
+ </action>
<action issue="LOG4J2-1541" dev="ggregory" type="fix" due-to="Gary Gregory">
Fix file handle resource leak in XmlConfiguration.XmlConfiguration(ConfigurationSource).
</action>
[02/10] logging-log4j2 git commit: [LOG4J2-1490] Log4j2 is creating
empty log files. Update changes.xml.
Posted by rp...@apache.org.
[LOG4J2-1490] Log4j2 is creating empty log files. Update changes.xml.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/b48cc0af
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/b48cc0af
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/b48cc0af
Branch: refs/heads/LOG4J2-1349-gcfree-threadcontext
Commit: b48cc0af0e153bcc0f3c7c99b7f288ab2b64f264
Parents: 2f09198
Author: Gary Gregory <gg...@apache.org>
Authored: Tue Aug 23 15:41:59 2016 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Tue Aug 23 15:41:59 2016 -0700
----------------------------------------------------------------------
src/changes/changes.xml | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/b48cc0af/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index d59c941..4b23eae 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-1490" dev="ggregory" type="fix" due-to="Krzysztof Taborski, Gary Gregory">
+ Log4j2 is creating empty log files.
+ </action>
<action issue="LOG4J2-1320" dev="ggregory" type="fix" due-to="Paresh Varke, Pierrick Hymbert">
Custom plugins are not loaded, URL protocol vfs is not supported.
</action>
[03/10] logging-log4j2 git commit: [LOG4J2-1506] Unregister JMX
ignores log4j2.disable.jmx property.
Posted by rp...@apache.org.
[LOG4J2-1506] Unregister JMX ignores log4j2.disable.jmx property.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/53934c6d
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/53934c6d
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/53934c6d
Branch: refs/heads/LOG4J2-1349-gcfree-threadcontext
Commit: 53934c6d02586a576a0a8caa601e172e4d6fde60
Parents: b48cc0a
Author: Gary Gregory <gg...@apache.org>
Authored: Tue Aug 23 15:49:03 2016 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Tue Aug 23 15:49:03 2016 -0700
----------------------------------------------------------------------
.../src/main/java/org/apache/logging/log4j/core/jmx/Server.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/53934c6d/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/Server.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/Server.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/Server.java
index 10f343a..034ce11 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/Server.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/Server.java
@@ -193,6 +193,10 @@ public final class Server {
* Unregister all log4j MBeans from the platform MBean server.
*/
public static void unregisterMBeans() {
+ if (isJmxDisabled()) {
+ LOGGER.debug("JMX disabled for log4j2. Not unregistering MBeans.");
+ return;
+ }
final MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();
unregisterMBeans(mbs);
}
[04/10] logging-log4j2 git commit: Use "Log4j2" in error messages
instead of "log4j2".
Posted by rp...@apache.org.
Use "Log4j2" in error messages instead of "log4j2".
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/19ed7063
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/19ed7063
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/19ed7063
Branch: refs/heads/LOG4J2-1349-gcfree-threadcontext
Commit: 19ed70638f75289f3524503a760c6adc74c016ff
Parents: 53934c6
Author: Gary Gregory <gg...@apache.org>
Authored: Tue Aug 23 15:49:51 2016 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Tue Aug 23 15:49:51 2016 -0700
----------------------------------------------------------------------
.../main/java/org/apache/logging/log4j/core/jmx/Server.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/19ed7063/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/Server.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/Server.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/Server.java
index 034ce11..39cafeb 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/Server.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/Server.java
@@ -132,7 +132,7 @@ public final class Server {
public static void reregisterMBeansAfterReconfigure() {
// avoid creating Platform MBean Server if JMX disabled
if (isJmxDisabled()) {
- LOGGER.debug("JMX disabled for log4j2. Not registering MBeans.");
+ LOGGER.debug("JMX disabled for Log4j2. Not registering MBeans.");
return;
}
final MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();
@@ -141,7 +141,7 @@ public final class Server {
public static void reregisterMBeansAfterReconfigure(final MBeanServer mbs) {
if (isJmxDisabled()) {
- LOGGER.debug("JMX disabled for log4j2. Not registering MBeans.");
+ LOGGER.debug("JMX disabled for Log4j2. Not registering MBeans.");
return;
}
@@ -194,7 +194,7 @@ public final class Server {
*/
public static void unregisterMBeans() {
if (isJmxDisabled()) {
- LOGGER.debug("JMX disabled for log4j2. Not unregistering MBeans.");
+ LOGGER.debug("JMX disabled for Log4j2. Not unregistering MBeans.");
return;
}
final MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();
[05/10] logging-log4j2 git commit: [LOG4J2-1506] Unregister JMX
ignores log4j2.disable.jmx property.
Posted by rp...@apache.org.
[LOG4J2-1506] Unregister JMX ignores log4j2.disable.jmx property.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/0c8bd651
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/0c8bd651
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/0c8bd651
Branch: refs/heads/LOG4J2-1349-gcfree-threadcontext
Commit: 0c8bd6514adf4a1ece83121aa156071267a5c28b
Parents: 19ed706
Author: Gary Gregory <gg...@apache.org>
Authored: Tue Aug 23 15:50:32 2016 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Tue Aug 23 15:50:32 2016 -0700
----------------------------------------------------------------------
src/changes/changes.xml | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/0c8bd651/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 4b23eae..776da03 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-1506" dev="ggregory" type="fix" due-to="Johannes Schleger">
+ Unregister JMX ignores log4j2.disable.jmx property.
+ </action>
<action issue="LOG4J2-1490" dev="ggregory" type="fix" due-to="Krzysztof Taborski, Gary Gregory">
Log4j2 is creating empty log files.
</action>
[08/10] logging-log4j2 git commit: Replace random tabs with spaces
Posted by rp...@apache.org.
Replace random tabs with spaces
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/30ea2833
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/30ea2833
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/30ea2833
Branch: refs/heads/LOG4J2-1349-gcfree-threadcontext
Commit: 30ea28336e3ff7173db7f68ee69d3876767e3136
Parents: 24ebb9f
Author: Matt Sicker <bo...@gmail.com>
Authored: Tue Aug 23 20:13:07 2016 -0500
Committer: Matt Sicker <bo...@gmail.com>
Committed: Tue Aug 23 20:13:07 2016 -0500
----------------------------------------------------------------------
.../core/config/AbstractConfiguration.java | 26 ++++++++++----------
1 file changed, 13 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30ea2833/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 bc42d1f..9d80cb3 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
@@ -182,14 +182,14 @@ public abstract class AbstractConfiguration extends AbstractFilterable implement
}
@Override
- public AsyncLoggerConfigDelegate getAsyncLoggerConfigDelegate() {
- // lazily instantiate only when requested by AsyncLoggers:
- // loading AsyncLoggerConfigDisruptor requires LMAX Disruptor jar on classpath
- if (asyncLoggerConfigDisruptor == null) {
- asyncLoggerConfigDisruptor = new AsyncLoggerConfigDisruptor();
- }
- return asyncLoggerConfigDisruptor;
- }
+ public AsyncLoggerConfigDelegate getAsyncLoggerConfigDelegate() {
+ // lazily instantiate only when requested by AsyncLoggers:
+ // loading AsyncLoggerConfigDisruptor requires LMAX Disruptor jar on classpath
+ if (asyncLoggerConfigDisruptor == null) {
+ asyncLoggerConfigDisruptor = new AsyncLoggerConfigDisruptor();
+ }
+ return asyncLoggerConfigDisruptor;
+ }
/**
* Initialize the configuration.
@@ -236,7 +236,7 @@ public abstract class AbstractConfiguration extends AbstractFilterable implement
watchManager.start();
}
if (hasAsyncLoggers()) {
- asyncLoggerConfigDisruptor.start();
+ asyncLoggerConfigDisruptor.start();
}
final Set<LoggerConfig> alreadyStarted = new HashSet<>();
for (final LoggerConfig logger : loggerConfigs.values()) {
@@ -259,13 +259,13 @@ public abstract class AbstractConfiguration extends AbstractFilterable implement
}
for (final LoggerConfig logger : loggerConfigs.values()) {
if (logger instanceof AsyncLoggerConfig) {
- return true;
+ return true;
}
}
- return false;
- }
+ return false;
+ }
- /**
+ /**
* Tear down the configuration.
*/
@Override
[06/10] logging-log4j2 git commit: No need to abbrieviate the API
name.
Posted by rp...@apache.org.
No need to abbrieviate the API 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/eeb2c23c
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/eeb2c23c
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/eeb2c23c
Branch: refs/heads/LOG4J2-1349-gcfree-threadcontext
Commit: eeb2c23c776134b6fb35ea0c00dd78de602ca4bd
Parents: 0c8bd65
Author: Gary Gregory <gg...@apache.org>
Authored: Tue Aug 23 16:01:24 2016 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Tue Aug 23 16:01:24 2016 -0700
----------------------------------------------------------------------
.../org/apache/logging/log4j/core/appender/FileAppender.java | 4 ++--
.../logging/log4j/core/appender/OutputStreamAppenderTest.java | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/eeb2c23c/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileAppender.java
index 5c8eff4..736714d 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileAppender.java
@@ -157,7 +157,7 @@ public final class FileAppender extends AbstractOutputStreamAppender<FileManager
return asBuilder();
}
- public B withConfig(final Configuration config) {
+ public B withConfiguration(final Configuration config) {
this.config = config;
return asBuilder();
}
@@ -225,7 +225,7 @@ public final class FileAppender extends AbstractOutputStreamAppender<FileManager
.withAppend(Booleans.parseBoolean(append, true))
.withBufferedIo(Booleans.parseBoolean(bufferedIo, true))
.withBufferSize(Integers.parseInt(bufferSizeStr, DEFAULT_BUFFER_SIZE))
- .withConfig(config)
+ .withConfiguration(config)
.withFileName(fileName)
.withFilter(filter)
.withIgnoreExceptions(Booleans.parseBoolean(ignoreExceptions, true))
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/eeb2c23c/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/OutputStreamAppenderTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/OutputStreamAppenderTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/OutputStreamAppenderTest.java
index 845f88f..8ad8fbb 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/OutputStreamAppenderTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/OutputStreamAppenderTest.java
@@ -100,7 +100,7 @@ public class OutputStreamAppenderTest {
.withIgnoreExceptions(false)
.withBufferedIo(false)
.withBufferSize(4000)
- .withConfig(config)
+ .withConfiguration(config)
.build();
// @formatter:on
appender.start();
[09/10] 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/3ebff538
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/3ebff538
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/3ebff538
Branch: refs/heads/LOG4J2-1349-gcfree-threadcontext
Commit: 3ebff538cf2c1cb6f4fef2855c7fa57386d4e80e
Parents: 8b9e0e3 30ea283
Author: rpopma <rp...@apache.org>
Authored: Wed Aug 24 22:43:59 2016 +0900
Committer: rpopma <rp...@apache.org>
Committed: Wed Aug 24 22:43:59 2016 +0900
----------------------------------------------------------------------
.../log4j/core/appender/FileAppender.java | 4 +--
.../core/appender/RollingFileAppender.java | 4 +--
.../core/config/AbstractConfiguration.java | 26 ++++++++++----------
.../core/config/plugins/util/ResolverUtil.java | 8 +++++-
.../apache/logging/log4j/core/jmx/Server.java | 8 ++++--
.../core/appender/OutputStreamAppenderTest.java | 2 +-
.../rolling/RollingFileAppenderAccessTest.java | 2 +-
.../config/plugins/util/ResolverUtilTest.java | 20 +++++++++++++++
src/changes/changes.xml | 9 +++++++
9 files changed, 61 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
[10/10] logging-log4j2 git commit: Merge branch
'LOG4J2-1010&LOG4J2-1447-injectable-contextdata&better-datastructure' into
LOG4J2-1349-gcfree-threadcontext
Posted by rp...@apache.org.
Merge branch 'LOG4J2-1010&LOG4J2-1447-injectable-contextdata&better-datastructure' into LOG4J2-1349-gcfree-threadcontext
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/37d47a62
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/37d47a62
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/37d47a62
Branch: refs/heads/LOG4J2-1349-gcfree-threadcontext
Commit: 37d47a62a779d2d1a6f30a943ba7d95f876aead0
Parents: 4d656de 3ebff53
Author: rpopma <rp...@apache.org>
Authored: Wed Aug 24 22:44:45 2016 +0900
Committer: rpopma <rp...@apache.org>
Committed: Wed Aug 24 22:44:45 2016 +0900
----------------------------------------------------------------------
.../log4j/core/appender/FileAppender.java | 4 +--
.../core/appender/RollingFileAppender.java | 4 +--
.../core/config/AbstractConfiguration.java | 26 ++++++++++----------
.../core/config/plugins/util/ResolverUtil.java | 8 +++++-
.../apache/logging/log4j/core/jmx/Server.java | 8 ++++--
.../core/appender/OutputStreamAppenderTest.java | 2 +-
.../rolling/RollingFileAppenderAccessTest.java | 2 +-
.../config/plugins/util/ResolverUtilTest.java | 20 +++++++++++++++
src/changes/changes.xml | 9 +++++++
9 files changed, 61 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
[07/10] logging-log4j2 git commit: No need to abbrieviate the API
name.
Posted by rp...@apache.org.
No need to abbrieviate the API 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/24ebb9f5
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/24ebb9f5
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/24ebb9f5
Branch: refs/heads/LOG4J2-1349-gcfree-threadcontext
Commit: 24ebb9f52fac67866632752e35ff1909e6c4668a
Parents: eeb2c23
Author: Gary Gregory <gg...@apache.org>
Authored: Tue Aug 23 16:02:42 2016 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Tue Aug 23 16:02:42 2016 -0700
----------------------------------------------------------------------
.../apache/logging/log4j/core/appender/RollingFileAppender.java | 4 ++--
.../core/appender/rolling/RollingFileAppenderAccessTest.java | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/24ebb9f5/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RollingFileAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RollingFileAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RollingFileAppender.java
index fcef0d6..899ddca 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RollingFileAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RollingFileAppender.java
@@ -208,7 +208,7 @@ public final class RollingFileAppender extends AbstractOutputStreamAppender<Roll
return asBuilder();
}
- public B withConfig(final Configuration config) {
+ public B withConfiguration(final Configuration config) {
this.config = config;
return asBuilder();
}
@@ -372,7 +372,7 @@ public final class RollingFileAppender extends AbstractOutputStreamAppender<Roll
.withAppend(Booleans.parseBoolean(append, true))
.withBufferedIo(Booleans.parseBoolean(bufferedIO, true))
.withBufferSize(bufferSize)
- .withConfig(config)
+ .withConfiguration(config)
.withFileName(fileName)
.withFilePattern(filePattern)
.withFilter(filter)
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/24ebb9f5/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingFileAppenderAccessTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingFileAppenderAccessTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingFileAppenderAccessTest.java
index b484567..02fa6c5 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingFileAppenderAccessTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingFileAppenderAccessTest.java
@@ -44,7 +44,7 @@ public class RollingFileAppenderAccessTest {
.withFilePattern("FilePattern")
.withName("Name")
.withPolicy(OnStartupTriggeringPolicy.createPolicy(1))
- .withConfig(config)
+ .withConfiguration(config)
.build();
// @formatter:on
final RollingFileManager manager = appender.getManager();