[2/2] logging-log4j2 git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-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/99c40d3e Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/99c40d3e Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/99c40d3e Branch: refs/heads/master Commit: 99c40d3edfd8643cc542c25df59d11a212581076 Parents: a79da65 69f996a Author: Gary Gregory Authored: Tue Aug 14 11:30:41 2018 -0600 Committer: Gary Gregory Committed: Tue Aug 14 11:30:41 2018 -0600 -- log4j-api-java9/pom.xml | 2 - log4j-api-java9/src/assembly/java9.xml | 1 + .../PrivateSecurityManagerStackTraceUtil.java | 34 + .../apache/logging/log4j/util/StackLocator.java | 4 + log4j-api/pom.xml | 8 -- .../log4j/message/ReusableObjectMessage.java| 17 ++- .../PrivateSecurityManagerStackTraceUtil.java | 71 ++ .../apache/logging/log4j/util/StackLocator.java | 38 +- .../log4j/ThreadContextInheritanceTest.java | 5 + .../apache/logging/log4j/ThreadContextTest.java | 11 +- log4j-core-java9/pom.xml| 2 - log4j-core/pom.xml | 2 - .../log4j/core/impl/MutableLogEventTest.java| 32 + log4j-osgi/pom.xml | 8 -- .../jmh/FileAppenderThrowableBenchmark.java | 131 ++- .../resources/log4j2-perf-file-throwable.xml| 6 + pom.xml | 4 +- src/changes/changes.xml | 3 + 18 files changed, 306 insertions(+), 73 deletions(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/99c40d3e/pom.xml --
[2/2] logging-log4j2 git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/86e8caa1 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/86e8caa1 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/86e8caa1 Branch: refs/heads/master Commit: 86e8caa1e76be69e6126b77cb9c1137c14278431 Parents: 0578540 db18f5a Author: Gary Gregory Authored: Sun Apr 8 15:11:34 2018 -0600 Committer: Gary Gregory Committed: Sun Apr 8 15:11:34 2018 -0600 -- src/site/asciidoc/faq.adoc | 2 +- src/site/asciidoc/manual/customconfig.adoc | 386 +++ src/site/asciidoc/manual/extending.adoc| 624 src/site/asciidoc/manual/logsep.adoc | 121 + src/site/asciidoc/manual/migration.adoc| 359 ++ src/site/asciidoc/manual/plugins.adoc | 262 ++ src/site/asciidoc/manual/webapp.adoc | 486 ++ src/site/xdoc/manual/customconfig.xml | 375 -- src/site/xdoc/manual/extending.xml | 565 - src/site/xdoc/manual/logsep.xml| 123 - src/site/xdoc/manual/migration.xml | 351 - src/site/xdoc/manual/plugins.xml | 257 -- src/site/xdoc/manual/webapp.xml| 451 - 13 files changed, 2239 insertions(+), 2123 deletions(-) --
[2/2] logging-log4j2 git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/3d7f546a Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/3d7f546a Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/3d7f546a Branch: refs/heads/master Commit: 3d7f546ae96359158abfc6302803915fc2d2c632 Parents: faf996f 04daf2a Author: Gary Gregory Authored: Sun Apr 8 13:31:14 2018 -0600 Committer: Gary Gregory Committed: Sun Apr 8 13:31:14 2018 -0600 -- .travis-toolchains.xml | 11 - .travis.yml | 23 +- Jenkinsfile | 15 +- src/site/asciidoc/manual/async.adoc | 626 src/site/asciidoc/manual/eventlogging.adoc | 142 src/site/asciidoc/manual/flowtracing.adoc| 275 +++ src/site/asciidoc/manual/index.adoc | 138 src/site/asciidoc/manual/markers.adoc| 104 +++ src/site/asciidoc/manual/messages.adoc | 333 + src/site/asciidoc/manual/scala-api.adoc | 80 ++ src/site/asciidoc/manual/thread-context.adoc | 233 ++ src/site/xdoc/manual/async.xml | 848 -- src/site/xdoc/manual/eventlogging.xml| 145 src/site/xdoc/manual/flowtracing.xml | 268 --- src/site/xdoc/manual/index.xml | 150 src/site/xdoc/manual/markers.xml | 110 --- src/site/xdoc/manual/messages.xml| 314 src/site/xdoc/manual/scala-api.xml | 93 --- src/site/xdoc/manual/thread-context.xml | 209 -- toolchains-jenkins-ibm.xml | 63 ++ 20 files changed, 2026 insertions(+), 2154 deletions(-) --
[2/2] logging-log4j2 git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-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/a39a8559 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/a39a8559 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/a39a8559 Branch: refs/heads/master Commit: a39a8559ed2457701e677e684ae9dcd384527f7e Parents: 967ebda 49442e4 Author: Matt Sicker Authored: Sat Apr 7 13:49:51 2018 -0500 Committer: Matt Sicker Committed: Sat Apr 7 13:49:51 2018 -0500 -- src/changes/changes.xml | 3 +++ 1 file changed, 3 insertions(+) --
[2/2] logging-log4j2 git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/cd462bc9 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/cd462bc9 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/cd462bc9 Branch: refs/heads/master Commit: cd462bc94a1fd47e482b73fb22cdf4a47ed62217 Parents: eb76469 445395c Author: Gary Gregory Authored: Fri Mar 30 15:46:46 2018 -0600 Committer: Gary Gregory Committed: Fri Mar 30 15:46:46 2018 -0600 -- .../tools/picocli/CommandLineArityTest.java | 898 - .../core/tools/picocli/CommandLineHelpTest.java | 2536 -- .../core/tools/picocli/CommandLineTest.java | 3188 -- .../core/tools/picocli/CustomLayoutDemo.java| 264 -- .../logging/log4j/core/tools/picocli/Demo.java | 719 5 files changed, 7605 deletions(-) --
[2/2] logging-log4j2 git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/27b06b9b Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/27b06b9b Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/27b06b9b Branch: refs/heads/master Commit: 27b06b9bce8e8825272ef940c677167aeebd2c48 Parents: 532024a e7f3c8c Author: Gary Gregory Authored: Thu Jan 25 15:10:41 2018 -0700 Committer: Gary Gregory Committed: Thu Jan 25 15:10:41 2018 -0700 -- .../kafka/KafkaAppenderCloseTimeoutTest.java| 78 .../appender/mom/kafka/KafkaAppenderTest.java | 10 --- .../resources/KafkaAppenderCloseTimeoutTest.xml | 31 3 files changed, 109 insertions(+), 10 deletions(-) --
[2/2] logging-log4j2 git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/d7d5cfd7 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/d7d5cfd7 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/d7d5cfd7 Branch: refs/heads/master Commit: d7d5cfd796cec47a5b9f4ba669076fd98ad92673 Parents: d7e92c5 46cdb7f Author: Gary Gregory Authored: Thu Jan 18 07:48:31 2018 -0700 Committer: Gary Gregory Committed: Thu Jan 18 07:48:31 2018 -0700 -- log4j-core-java9/pom.xml| 153 +++ log4j-core-java9/src/assembly/java9.xml | 51 +++ .../apache/logging/log4j/core/util/Dummy.java | 24 +++ .../apache/logging/log4j/core/util/Temp.java| 24 +++ .../apache/logging/log4j/core/util/Dummy.java | 24 +++ log4j-core/pom.xml | 56 +++ pom.xml | 7 + src/changes/changes.xml | 3 + 8 files changed, 342 insertions(+) -- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/d7d5cfd7/log4j-core/pom.xml --
[2/2] logging-log4j2 git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/ac82a0d7 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/ac82a0d7 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/ac82a0d7 Branch: refs/heads/master Commit: ac82a0d782a583f059778f0db3c6012180747fb3 Parents: d5d2c47 8b71dbb Author: Gary Gregory Authored: Mon Nov 13 08:54:09 2017 -0700 Committer: Gary Gregory Committed: Mon Nov 13 08:54:09 2017 -0700 -- README.md | 8 1 file changed, 8 insertions(+) --
[2/2] logging-log4j2 git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/d24ebef8 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/d24ebef8 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/d24ebef8 Branch: refs/heads/master Commit: d24ebef87bc9e560580c4439c31fb6fb8fe3c30b Parents: d6af6e7 23bcd25 Author: Gary Gregory Authored: Sat Nov 11 14:05:52 2017 -0700 Committer: Gary Gregory Committed: Sat Nov 11 14:05:52 2017 -0700 -- .../log4j/core/tools/picocli/CommandLine.java | 241 +++-- .../tools/picocli/CommandLineArityTest.java | 934 ++ .../core/tools/picocli/CommandLineHelpTest.java | 93 +- .../core/tools/picocli/CommandLineTest.java | 963 ++- .../logging/log4j/core/tools/picocli/Demo.java | 3 + src/changes/changes.xml | 6 +- 6 files changed, 1281 insertions(+), 959 deletions(-) --
[2/2] logging-log4j2 git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/b8f6a1c5 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/b8f6a1c5 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/b8f6a1c5 Branch: refs/heads/master Commit: b8f6a1c5758f5d634b5d5cf3f4c4ebb571abca23 Parents: 40582be 6f7417c Author: Gary Gregory Authored: Mon Aug 21 23:13:57 2017 -0600 Committer: Gary Gregory Committed: Mon Aug 21 23:13:57 2017 -0600 -- jenkins-toolchains.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --
[2/2] logging-log4j2 git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/65c2b53d Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/65c2b53d Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/65c2b53d Branch: refs/heads/master Commit: 65c2b53d5e20246e03348abc17fce0f9956a67f8 Parents: e731407 8777af5 Author: Gary Gregory Authored: Wed Aug 16 14:34:39 2017 -0600 Committer: Gary Gregory Committed: Wed Aug 16 14:34:39 2017 -0600 -- src/changes/changes.xml| 3 +++ src/site/xdoc/manual/appenders.xml | 12 ++-- 2 files changed, 9 insertions(+), 6 deletions(-) --
[2/2] logging-log4j2 git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/f56b8c1a Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/f56b8c1a Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/f56b8c1a Branch: refs/heads/master Commit: f56b8c1ab6afc8806994eb71846a3dfcc9ac07f1 Parents: a4e217c 2ce1a7f Author: Gary Gregory Authored: Fri Jul 21 14:12:06 2017 -0700 Committer: Gary Gregory Committed: Fri Jul 21 14:12:06 2017 -0700 -- .../logging/log4j/message/StructuredDataId.java | 65 +++-- .../log4j/message/StructuredDataMessage.java| 75 ++-- src/changes/changes.xml | 3 + 3 files changed, 131 insertions(+), 12 deletions(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f56b8c1a/src/changes/changes.xml --
[2/2] logging-log4j2 git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/04acee20 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/04acee20 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/04acee20 Branch: refs/heads/master Commit: 04acee201919ce57d99009b625b5e91a8d9e052c Parents: 5d1b605 594e573 Author: Gary Gregory Authored: Wed Jun 28 19:12:29 2017 -0700 Committer: Gary Gregory Committed: Wed Jun 28 19:12:29 2017 -0700 -- .../log4j/core/config/xml/XmlConfiguration.java | 11 ++ .../config/xml/XmlConigurationSecurity.java | 36 .../test/resources/XmlConfigurationSecurity.xml | 34 ++ src/changes/changes.xml | 3 ++ src/site/xdoc/manual/configuration.xml.vm | 5 +++ 5 files changed, 89 insertions(+) --
[2/2] logging-log4j2 git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/d7d88b13 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/d7d88b13 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/d7d88b13 Branch: refs/heads/master Commit: d7d88b13c5ee60572387e500442f2396fe616718 Parents: 422d090 2633291 Author: Gary Gregory Authored: Sat May 6 12:46:34 2017 -0700 Committer: Gary Gregory Committed: Sat May 6 12:46:34 2017 -0700 -- BUILDING.md | 12 +- .../logging/log4j/core/SimplePerfTest.java | 2 +- .../logging/log4j/core/ThreadedPerfTest.java| 2 +- .../apache/logging/log4j/core/util/Timer.java | 273 --- src/site/markdown/build.md | 3 +- toolchains-sample-linux.xml | 52 6 files changed, 65 insertions(+), 279 deletions(-) --
[2/2] logging-log4j2 git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/6466fa17 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/6466fa17 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/6466fa17 Branch: refs/heads/master Commit: 6466fa17151aac1c9099755e40b6b7b53f852076 Parents: 694f26d 4254e25 Author: Gary Gregory Authored: Fri Dec 30 13:04:12 2016 -0800 Committer: Gary Gregory Committed: Fri Dec 30 13:04:12 2016 -0800 -- .../config/plugins/convert/TypeConverters.java | 13 +++- .../validation/constraints/ValidHost.java | 41 +++ .../validation/constraints/ValidPort.java | 44 .../validators/ValidHostValidator.java | 58 +++ .../validators/ValidPortValidator.java | 53 ++ .../config/plugins/validation/HostAndPort.java | 46 .../validators/ValidHostValidatorTest.java | 74 .../validators/ValidPortValidatorTest.java | 70 ++ src/changes/changes.xml | 3 + 9 files changed, 401 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/6466fa17/src/changes/changes.xml --
[2/2] logging-log4j2 git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/ee6f50d4 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/ee6f50d4 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/ee6f50d4 Branch: refs/heads/master Commit: ee6f50d4c8b809272d496d221a641804f7a71220 Parents: 261aba8 551cf83 Author: Gary Gregory Authored: Fri Nov 18 10:54:03 2016 -0800 Committer: Gary Gregory Committed: Fri Nov 18 10:54:03 2016 -0800 -- .../logging/log4j/core/util/JsonUtilsTest.java | 74 1 file changed, 74 insertions(+) --
[2/2] logging-log4j2 git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/49bd0924 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/49bd0924 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/49bd0924 Branch: refs/heads/master Commit: 49bd0924f802af2d014938f79522c777dc73db33 Parents: 8864df0 a3e0b3f Author: Gary Gregory Authored: Sun Nov 13 16:30:00 2016 -0800 Committer: Gary Gregory Committed: Sun Nov 13 16:30:00 2016 -0800 -- .../logging/log4j/spi/Log4j2Jira1688Test.java | 42 -- .../logging/log4j/core/filter/TimeFilter.java | 144 +-- .../core/async/Log4j2Jira1688AsyncTest.java | 79 ++ .../log4j/core/filter/TimeFilterTest.java | 40 +- .../log4j/test/appender/ListAppender.java | 28 +++- log4j-core/src/test/resources/gcFreeLogging.xml | 4 + .../resources/gcFreeMixedSyncAsyncLogging.xml | 4 + src/changes/changes.xml | 10 +- src/site/xdoc/manual/garbagefree.xml| 77 +++--- 9 files changed, 345 insertions(+), 83 deletions(-) --
[2/2] logging-log4j2 git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git Conflicts: log4j-1.2-api/src/test/java/org/apache/log4j/config/AbstractLog4j1ConfigurationConverterTest.java Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/60833808 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/60833808 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/60833808 Branch: refs/heads/master Commit: 60833808d86f2b2ed1604f37dab124af31ca6736 Parents: 8a78a99 82676b5 Author: Gary Gregory Authored: Fri Sep 23 23:44:13 2016 -0700 Committer: Gary Gregory Committed: Fri Sep 23 23:44:13 2016 -0700 -- .../log4j/config/AbstractLog4j1ConfigurationConverterTest.java | 6 ++ 1 file changed, 6 insertions(+) -- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/60833808/log4j-1.2-api/src/test/java/org/apache/log4j/config/AbstractLog4j1ConfigurationConverterTest.java --
[2/2] logging-log4j2 git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/96cc528d Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/96cc528d Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/96cc528d Branch: refs/heads/master Commit: 96cc528db29bb5ede659c4012f88ba411cc5e857 Parents: e46dec2 99b5bd0 Author: Gary Gregory Authored: Fri Sep 23 15:16:46 2016 -0700 Committer: Gary Gregory Committed: Fri Sep 23 15:16:46 2016 -0700 -- .../org/apache/logging/log4j/core/LogEvent.java | 9 ++ .../log4j/core/impl/ContextDataFactory.java | 54 - .../core/impl/ContextDataInjectorFactory.java | 6 +- .../log4j/core/impl/JdkMapAdapterStringMap.java | 111 +++ .../core/impl/ThreadContextDataInjector.java| 66 +++ ...actoryPropertySetMissingConstructorTest.java | 41 +++ .../impl/ContextDataFactoryPropertySetTest.java | 49 .../log4j/core/impl/ContextDataFactoryTest.java | 47 .../log4j/core/impl/FactoryTestStringMap.java | 104 + ...ctoryTestStringMapWithoutIntConstructor.java | 100 + src/changes/changes.xml | 3 + 11 files changed, 558 insertions(+), 32 deletions(-) --
[2/2] logging-log4j2 git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/817d8983 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/817d8983 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/817d8983 Branch: refs/heads/master Commit: 817d89838afea77e35048cbc8da7a5df38a0076a Parents: ed3c803 800db9c Author: Gary Gregory Authored: Thu Sep 22 10:04:30 2016 -0700 Committer: Gary Gregory Committed: Thu Sep 22 10:04:30 2016 -0700 -- .../CopyOnWriteSortedArrayThreadContextMap.java | 66 +- .../log4j/spi/DefaultThreadContextMap.java | 4 +- .../GarbageFreeSortedArrayThreadContextMap.java | 66 +- .../logging/log4j/spi/ThreadContextMap2.java| 8 +- .../apache/logging/log4j/util/BiConsumer.java | 2 +- .../apache/logging/log4j/util/ContextData.java | 106 --- .../logging/log4j/util/MutableContextData.java | 98 --- .../logging/log4j/util/ReadOnlyStringMap.java | 106 +++ .../log4j/util/SortedArrayStringMap.java| 477 .../log4j/util/SortedStringArrayMap.java| 477 .../apache/logging/log4j/util/StringMap.java| 98 +++ .../apache/logging/log4j/util/TriConsumer.java | 2 +- .../log4j/util/SortedArrayStringMapTest.java| 772 +++ .../log4j/util/SortedStringArrayMapTest.java| 772 --- .../logging/log4j/core/AbstractLogEvent.java| 4 +- .../logging/log4j/core/ContextDataInjector.java | 30 +- .../org/apache/logging/log4j/core/LogEvent.java | 8 +- .../db/jpa/AbstractLogEventWrapperEntity.java | 8 +- .../ContextDataAttributeConverter.java | 10 +- .../ContextDataJsonAttributeConverter.java | 14 +- .../logging/log4j/core/async/AsyncLogger.java | 8 +- .../log4j/core/async/RingBufferLogEvent.java| 12 +- .../async/RingBufferLogEventTranslator.java | 4 +- .../core/filter/DynamicThresholdFilter.java | 6 +- .../logging/log4j/core/filter/MapFilter.java| 4 +- .../core/filter/ThreadContextMapFilter.java | 6 +- .../log4j/core/impl/ContextDataFactory.java | 24 +- .../core/impl/ContextDataInjectorFactory.java | 6 +- .../logging/log4j/core/impl/Log4jLogEvent.java | 38 +- .../log4j/core/impl/MutableLogEvent.java| 12 +- .../core/impl/ReusableLogEventFactory.java | 4 +- .../core/impl/ThreadContextDataInjector.java| 80 +- .../ContextDataAsEntryListDeserializer.java | 8 +- .../ContextDataAsEntryListSerializer.java | 6 +- .../core/jackson/ContextDataDeserializer.java | 8 +- .../core/jackson/ContextDataSerializer.java | 6 +- .../log4j/core/jackson/LogEventJsonMixIn.java | 4 +- .../jackson/LogEventWithContextListMixIn.java | 4 +- .../log4j/core/lookup/ContextMapLookup.java | 4 +- .../log4j/core/pattern/MdcPatternConverter.java | 8 +- .../core/appender/db/jpa/TestBaseEntity.java| 4 +- .../ContextDataAttributeConverterTest.java | 8 +- .../ContextDataJsonAttributeConverterTest.java | 14 +- .../core/async/RingBufferLogEventTest.java | 16 +- .../log4j/core/impl/Log4jLogEventTest.java | 8 +- .../log4j/core/impl/MutableLogEventTest.java| 10 +- .../log4j/flume/appender/FlumeEvent.java| 4 +- .../perf/jmh/SortedArrayVsHashMapBenchmark.java | 18 +- .../log4j/perf/jmh/ThreadContextBenchmark.java | 12 +- .../log4j/perf/nogc/OpenHashMapContextData.java | 24 +- .../CopyOnWriteOpenHashMapThreadContextMap.java | 8 +- .../GarbageFreeOpenHashMapThreadContextMap.java | 8 +- .../org/apache/logging/slf4j/MDCContextMap.java | 10 +- 53 files changed, 1762 insertions(+), 1762 deletions(-) --
[2/2] logging-log4j2 git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/c97864bb Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/c97864bb Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/c97864bb Branch: refs/heads/master Commit: c97864bb2ec22eca13f67081e6c68da3c701fc1a Parents: fb0f3ca 166bc65 Author: Gary Gregory Authored: Mon Sep 19 22:20:14 2016 -0700 Committer: Gary Gregory Committed: Mon Sep 19 22:20:14 2016 -0700 -- RELEASE-NOTES.txt | 146 ++- pom.xml | 3 +- src/changes/announcement.vm | 13 +- src/changes/changes.xml | 2 +- src/site/resources/images/logo.png | Bin 40736 -> 36964 bytes .../resources/logo/logo-pool-bottom-2.7.png | Bin 0 -> 36964 bytes 6 files changed, 116 insertions(+), 48 deletions(-) --
[2/2] logging-log4j2 git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/d40d24c8 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/d40d24c8 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/d40d24c8 Branch: refs/heads/master Commit: d40d24c8419278c2bccd9747f465875f5d998efb Parents: 3348332 a3e1329 Author: Gary Gregory Authored: Mon Sep 19 21:14:34 2016 -0700 Committer: Gary Gregory Committed: Mon Sep 19 21:14:34 2016 -0700 -- .../org/apache/logging/log4j/spi/CopyOnWrite.java | 16 .../log4j/spi/MutableContextDataSupplier.java | 16 .../org/apache/logging/log4j/util/BiConsumer.java | 16 .../apache/logging/log4j/util/TriConsumer.java| 16 .../core/async/ArrayBlockingQueueFactory.java | 16 .../log4j/core/async/BlockingQueueFactory.java| 16 .../core/async/DisruptorBlockingQueueFactory.java | 16 .../core/async/JCToolsBlockingQueueFactory.java | 16 .../PluginWithGenericSubclassFoo1Builder.java | 18 +- .../log4j/core/layout/Log4j2_1482_CoreTest.java | 16 .../core/layout/PatternLayoutLookupDateTest.java | 18 +- .../layout/PatternLayoutNoLookupDateTest.java | 16 .../logging/log4j/scalasample/LoggingApp.scala| 16 13 files changed, 210 insertions(+), 2 deletions(-) --
[2/2] logging-log4j2 git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/5fa1ac1d Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/5fa1ac1d Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/5fa1ac1d Branch: refs/heads/master Commit: 5fa1ac1dde80ca4eb608acb5517ee4d60018fbe5 Parents: 6f98c24 6d90ac7 Author: Gary Gregory Authored: Tue Sep 13 12:03:54 2016 -0700 Committer: Gary Gregory Committed: Tue Sep 13 12:03:54 2016 -0700 -- .../logging/log4j/util/ArrayContextData.java| 7 +++-- .../log4j/util/ArrayContextDataTest.java| 32 2 files changed, 37 insertions(+), 2 deletions(-) --
[2/2] logging-log4j2 git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/4e820ca5 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/4e820ca5 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/4e820ca5 Branch: refs/heads/master Commit: 4e820ca56d35423e993433c55c0d0eaa2c0cbff8 Parents: 615c0f8 e73d9d4 Author: Gary Gregory Authored: Sun Aug 21 11:39:08 2016 -0700 Committer: Gary Gregory Committed: Sun Aug 21 11:39:08 2016 -0700 -- .../config/Log4j1ConfigurationFactory.java | 312 +-- .../log4j/config/Log4j1ConfigurationParser.java | 301 ++ ...g4j-console-EnhancedPatternLayout.properties | 2 +- .../impl/DefaultConfigurationBuilder.java | 16 +- .../DefaultCustomLevelComponentBuilder.java | 2 +- .../PropertiesConfigurationFactory.java | 3 +- .../builder/ConfigurationAssemblerTest.java | 35 ++- .../builder/CustomConfigurationFactory.java | 7 +- 8 files changed, 360 insertions(+), 318 deletions(-) --
[2/2] logging-log4j2 git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/4f793c00 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/4f793c00 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/4f793c00 Branch: refs/heads/master Commit: 4f793c00fbc90390b5fe075d5e8840574b0fd03c Parents: 9afe7ea 5aac1af Author: Gary Gregory Authored: Sat Aug 20 11:47:21 2016 -0700 Committer: Gary Gregory Committed: Sat Aug 20 11:47:21 2016 -0700 -- .../java/org/apache/logging/log4j/core/layout/PatternLayout.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --
[2/2] logging-log4j2 git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/887e028a Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/887e028a Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/887e028a Branch: refs/heads/master Commit: 887e028a1521f6696b399573043b558495191b4e Parents: 0482817 34ee617 Author: Gary Gregory Authored: Mon Aug 8 08:48:46 2016 -0700 Committer: Gary Gregory Committed: Mon Aug 8 08:48:46 2016 -0700 -- src/site/xdoc/manual/appenders.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) --
[2/2] logging-log4j2 git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/5a77ddf8 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/5a77ddf8 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/5a77ddf8 Branch: refs/heads/master Commit: 5a77ddf8ad74575b942dee80132f51388d0ac993 Parents: 6ebe102 33407b2 Author: Gary Gregory Authored: Tue Jun 28 11:40:10 2016 -0700 Committer: Gary Gregory Committed: Tue Jun 28 11:40:10 2016 -0700 -- .../src/main/java/org/apache/logging/log4j/Logger.java | 11 +-- .../log4j/core/filter/DynamicThresholdFilter.java| 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) --
[2/2] logging-log4j2 git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-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/ff9536ce Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/ff9536ce Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/ff9536ce Branch: refs/heads/master Commit: ff9536ce7de443158d3e63390f59f473eb9c9151 Parents: 278f208 71fa26d Author: rgoers Authored: Sun Jun 5 17:09:57 2016 -0700 Committer: rgoers Committed: Sun Jun 5 17:09:57 2016 -0700 -- .../org/apache/logging/log4j/core/layout/CsvLogEventLayout.java | 3 --- 1 file changed, 3 deletions(-) --
[2/2] logging-log4j2 git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/5d0c2728 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/5d0c2728 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/5d0c2728 Branch: refs/heads/master Commit: 5d0c27285d9e5df4ddbe3286c44d3d77e74f00f4 Parents: 7fa2b0a 2bfcf62 Author: ggregory Authored: Mon Apr 4 13:43:30 2016 -0700 Committer: ggregory Committed: Mon Apr 4 13:43:30 2016 -0700 -- .../main/java/org/apache/log4j/Category.java| 26 +++--- .../apache/log4j/spi/LoggerFactoryBridge.java | 36 src/changes/changes.xml | 4 +-- 3 files changed, 16 insertions(+), 50 deletions(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5d0c2728/src/changes/changes.xml --
[2/2] logging-log4j2 git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/ba5cf456 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/ba5cf456 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/ba5cf456 Branch: refs/heads/master Commit: ba5cf45628fe48a915821aad92b58a5f3b322fc2 Parents: 8e13c98 52d04e0 Author: ggregory Authored: Tue Mar 15 02:08:30 2016 -0700 Committer: ggregory Committed: Tue Mar 15 02:08:30 2016 -0700 -- log4j-core/pom.xml | 6 + .../logging/log4j/core/GcFreeLoggingTest.java | 131 +++ pom.xml | 6 + 3 files changed, 143 insertions(+) --
[2/2] logging-log4j2 git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/1ecc28bb Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/1ecc28bb Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/1ecc28bb Branch: refs/heads/master Commit: 1ecc28bba0b980a771c863de4028175cd34398fd Parents: 3245c20 3d4fb63 Author: ggregory Authored: Wed Mar 9 09:50:18 2016 -0800 Committer: ggregory Committed: Wed Mar 9 09:50:18 2016 -0800 -- .../apache/logging/log4j/core/util/Compare.java | 134 --- .../log4j/web/appender/ServletAppender.java | 4 +- 2 files changed, 1 insertion(+), 137 deletions(-) --
[2/2] logging-log4j2 git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/9a01ec66 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/9a01ec66 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/9a01ec66 Branch: refs/heads/master Commit: 9a01ec66e78a5f3780a46be675616ecd462add44 Parents: 9371266 3542dae Author: ggregory Authored: Wed Mar 9 00:20:31 2016 -0800 Committer: ggregory Committed: Wed Mar 9 00:20:31 2016 -0800 -- .../log4j/core/async/AsyncLoggerConfigDisruptor.java | 4 ++-- .../log4j/core/async/AsyncLoggerDisruptor.java | 4 ++-- .../appender/rolling/RollingAppenderSizeTest.java| 15 +-- .../logging/log4j/web/Log4jWebInitializerImpl.java | 5 +++-- src/changes/changes.xml | 3 +++ 5 files changed, 15 insertions(+), 16 deletions(-) --
[2/2] logging-log4j2 git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/9c9bc95d Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/9c9bc95d Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/9c9bc95d Branch: refs/heads/master Commit: 9c9bc95d348837a1e2e9fdc3619146dba7ebcff7 Parents: 9ebf072 c83366e Author: ggregory Authored: Tue Mar 1 16:56:25 2016 -0800 Committer: ggregory Committed: Tue Mar 1 16:56:25 2016 -0800 -- .../core/async/perftest/SimplePerfTest.java | 1 - .../log4j/core/async/perftest/SimplePerfTest.sh | 22 2 files changed, 22 insertions(+), 1 deletion(-) --
[2/2] logging-log4j2 git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/0434a271 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/0434a271 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/0434a271 Branch: refs/heads/master Commit: 0434a271338a0f2defa345f5570cff9544be7693 Parents: 82d2722 8717cad Author: ggregory Authored: Tue Mar 1 07:50:07 2016 -0800 Committer: ggregory Committed: Tue Mar 1 07:50:07 2016 -0800 -- .../logging/log4j/core/LoggerContext.java | 1 - .../core/appender/db/jdbc/JdbcAppender.java | 1 - .../log4j/core/appender/db/jpa/JpaAppender.java | 1 - .../log4j/core/appender/mom/JmsAppender.java| 1 - .../appender/mom/jeromq/JeroMqAppender.java | 2 - .../core/appender/mom/kafka/KafkaAppender.java | 10 +- .../core/appender/rewrite/RewriteAppender.java | 2 - .../core/appender/routing/IdlePurgePolicy.java | 99 ++-- .../core/appender/routing/RoutingAppender.java | 1 - .../log4j/core/config/DefaultAdvertiser.java| 5 +- .../core/config/json/JsonConfiguration.java | 21 ++--- .../properties/PropertiesConfiguration.java | 6 +- .../log4j/core/config/xml/XmlConfiguration.java | 2 - .../core/config/yaml/YamlConfiguration.java | 2 - .../util/DefaultShutdownCallbackRegistry.java | 4 +- .../logging/log4j/core/util/KeyValuePair.java | 22 + .../logging/log4j/core/util/WatchManager.java | 11 +-- .../log4j/web/Log4jWebInitializerImpl.java | 2 - .../log4j/web/appender/ServletAppender.java | 2 - src/changes/changes.xml | 3 + 20 files changed, 75 insertions(+), 123 deletions(-) --
[2/2] logging-log4j2 git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/99a08455 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/99a08455 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/99a08455 Branch: refs/heads/master Commit: 99a08455255eb889a7035b4553c08ceef6b65cac Parents: 880e0b6 d353e3f Author: ggregory Authored: Sun Feb 21 22:51:08 2016 -0800 Committer: ggregory Committed: Sun Feb 21 22:51:08 2016 -0800 -- .../logging/log4j/message/ObjectMessage.java| 21 +++- .../logging/log4j/message/SimpleMessage.java| 9 - .../log4j/message/ThreadDumpMessage.java| 13 +--- 3 files changed, 34 insertions(+), 9 deletions(-) --
[2/2] logging-log4j2 git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/c959ef11 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/c959ef11 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/c959ef11 Branch: refs/heads/master Commit: c959ef1140597ea5c5a80c32605245da6c4b9422 Parents: b20617e cd46be7 Author: ggregory Authored: Sun Feb 21 22:25:42 2016 -0800 Committer: ggregory Committed: Sun Feb 21 22:25:42 2016 -0800 -- .../log4j/util/StringBuilderFormattable.java| 33 1 file changed, 33 insertions(+) --
[2/2] logging-log4j2 git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/6532cd7b Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/6532cd7b Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/6532cd7b Branch: refs/heads/master Commit: 6532cd7b7803b3795db2bfcc33d8ddd988c7 Parents: cd881ce 1f30fec Author: ggregory Authored: Thu Feb 11 22:00:47 2016 -0800 Committer: ggregory Committed: Thu Feb 11 22:00:47 2016 -0800 -- .../apache/logging/log4j/core/appender/OutputStreamManager.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --
[2/2] logging-log4j2 git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/fe4ace50 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/fe4ace50 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/fe4ace50 Branch: refs/heads/master Commit: fe4ace50c91384ae6fc7c3314a5669aabb5db6ae Parents: 9ef298b 5a14032 Author: ggregory Authored: Wed Dec 2 07:52:58 2015 -0800 Committer: ggregory Committed: Wed Dec 2 07:52:58 2015 -0800 -- .../log4j/core/appender/HangingAppender.java| 29 ++-- 1 file changed, 27 insertions(+), 2 deletions(-) --
[2/2] logging-log4j2 git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/28af48ef Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/28af48ef Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/28af48ef Branch: refs/heads/master Commit: 28af48efb4725ecbdf7dd6a4dd1d575e8dca2043 Parents: 4b3d073 c5d1718 Author: rpopma Authored: Sun Nov 29 11:34:04 2015 +0900 Committer: rpopma Committed: Sun Nov 29 11:34:04 2015 +0900 -- .../log4j/core/script/ScriptManager.java| 47 1 file changed, 39 insertions(+), 8 deletions(-) --
[2/2] logging-log4j2 git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/d9fa7eb2 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/d9fa7eb2 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/d9fa7eb2 Branch: refs/heads/master Commit: d9fa7eb29a9382c6a1cc75a7fcb3848683ad49c3 Parents: f393467 ee06a27 Author: rpopma Authored: Sun Nov 15 02:49:02 2015 +0900 Committer: rpopma Committed: Sun Nov 15 02:49:02 2015 +0900 -- .../core/appender/mom/kafka/KafkaAppender.java | 24 +--- .../appender/mom/kafka/KafkaAppenderTest.java | 39 .../src/test/resources/KafkaAppenderTest.xml| 5 +++ src/changes/changes.xml | 3 ++ 4 files changed, 57 insertions(+), 14 deletions(-) --
[2/2] logging-log4j2 git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-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/d86ac2ac Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/d86ac2ac Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/d86ac2ac Branch: refs/heads/master Commit: d86ac2ac4e033b386d747d3f73e6240f5ef7197f Parents: 016008c 1ee6758 Author: Ralph Goers Authored: Sun Nov 1 21:48:00 2015 -0700 Committer: Ralph Goers Committed: Sun Nov 1 21:48:00 2015 -0700 -- .../main/java/org/apache/log4j/LogManager.java | 444 +-- .../log4j/simple/SimpleLoggerContext.java | 31 +- .../apache/logging/log4j/spi/LoggerContext.java | 16 + .../logging/log4j/spi/LoggerContextKey.java | 40 ++ .../apache/logging/log4j/TestLoggerContext.java | 14 +- .../org/apache/logging/log4j/core/Logger.java | 8 +- .../logging/log4j/core/LoggerContext.java | 36 +- .../apache/logging/log4j/core/LoggerTest.java | 16 +- .../core/util/datetime/FixedDateFormatTest.java | 2 +- .../log4j/taglib/Log4jTaglibLoggerContext.java | 15 +- .../logging/slf4j/SLF4JLoggerContext.java | 15 +- .../log4j/web/Log4jWebInitializerImplTest.java | 74 ++-- .../resources/WEB-INF/classes/log4j-servlet.xml | 64 +-- src/changes/changes.xml | 3 + 14 files changed, 466 insertions(+), 312 deletions(-) --
[2/2] logging-log4j2 git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/8b9d1009 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/8b9d1009 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/8b9d1009 Branch: refs/heads/master Commit: 8b9d10095445d51614e0f3b05ba0c6eeb54bbafe Parents: 1360daa 2612b61 Author: rpopma Authored: Tue Oct 6 01:14:38 2015 +0200 Committer: rpopma Committed: Tue Oct 6 01:14:38 2015 +0200 -- .../flume/appender/FlumePersistentManager.java | 3 +- .../logging/log4j/taglib/DumpTagTest.java | 243 ++- 2 files changed, 124 insertions(+), 122 deletions(-) --
[2/2] logging-log4j2 git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/8d75506e Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/8d75506e Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/8d75506e Branch: refs/heads/master Commit: 8d75506e39d992cc7c2d6b0f0bad7fd08a344b05 Parents: 1ef170d e7988df Author: rpopma Authored: Mon Oct 5 12:26:10 2015 +0200 Committer: rpopma Committed: Mon Oct 5 12:26:10 2015 +0200 -- pom.xml | 2 +- src/changes/changes.xml | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) --
[2/2] logging-log4j2 git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/30806ada Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/30806ada Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/30806ada Branch: refs/heads/master Commit: 30806ada668bb5c9a6385a1feb860d969a518489 Parents: 9cefab4 dd75cd7 Author: ggregory Authored: Mon Sep 28 23:50:39 2015 -0700 Committer: ggregory Committed: Mon Sep 28 23:50:39 2015 -0700 -- .../appender/rolling/RollingAppenderSizeTest.java| 15 +++ 1 file changed, 11 insertions(+), 4 deletions(-) --
[2/2] logging-log4j2 git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/dd75cd75 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/dd75cd75 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/dd75cd75 Branch: refs/heads/master Commit: dd75cd758f325b056f7b51948dd8e96b27ccc6c1 Parents: f49ed94 b17d7c0 Author: rpopma Authored: Tue Sep 29 01:05:15 2015 +0200 Committer: rpopma Committed: Tue Sep 29 01:05:15 2015 +0200 -- .../core/config/AbstractConfiguration.java | 42 ++-- 1 file changed, 21 insertions(+), 21 deletions(-) --
[2/2] logging-log4j2 git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/82adb21a Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/82adb21a Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/82adb21a Branch: refs/heads/master Commit: 82adb21a596b2df787637a955849fdedb6927d0f Parents: b150921 13b8b0f Author: rpopma Authored: Fri Sep 18 20:39:50 2015 +0900 Committer: rpopma Committed: Fri Sep 18 20:39:50 2015 +0900 -- .../org/apache/logging/log4j/util/Strings.java | 80 ++-- .../logging/log4j/core/config/Configurator.java | 3 +- .../core/config/status/StatusConfiguration.java | 4 +- .../logging/log4j/core/util/FileUtilsTest.java | 2 +- 4 files changed, 45 insertions(+), 44 deletions(-) --
[2/2] logging-log4j2 git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/a61f1a12 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/a61f1a12 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/a61f1a12 Branch: refs/heads/master Commit: a61f1a129ecf622a9ad67d931178b26a831c0e25 Parents: a41c6cc fde3573 Author: rpopma Authored: Sat Sep 12 15:13:11 2015 +0900 Committer: rpopma Committed: Sat Sep 12 15:13:11 2015 +0900 -- .../java/org/apache/logging/log4j/core/FileConfigTest.java | 8 ++-- .../test/java/org/apache/logging/log4j/core/LoggerTest.java | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) --
[2/2] logging-log4j2 git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-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/fde35735 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/fde35735 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/fde35735 Branch: refs/heads/master Commit: fde357353f4eb173ab7d5c092dfed7ef91d6470b Parents: 7c97ba8 6eafff1 Author: Ralph Goers Authored: Fri Sep 11 22:12:42 2015 -0700 Committer: Ralph Goers Committed: Fri Sep 11 22:12:42 2015 -0700 -- .../java/org/apache/logging/log4j/core/jmx/Server.java| 10 +++--- 1 file changed, 7 insertions(+), 3 deletions(-) --
[2/2] logging-log4j2 git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/8cef1811 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/8cef1811 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/8cef1811 Branch: refs/heads/master Commit: 8cef18115f18a633312b8550b75ba335e85b1ffd Parents: d765fcc 75c93b0 Author: rpopma Authored: Sat Sep 12 13:59:33 2015 +0900 Committer: rpopma Committed: Sat Sep 12 13:59:33 2015 +0900 -- .../apache/logging/log4j/core/LifeCycle.java| 2 +- .../log4j/core/appender/ConsoleAppender.java| 16 .../appender/mom/jeromq/JeroMqAppender.java | 40 ++-- .../core/config/AbstractConfiguration.java | 4 +- src/changes/changes.xml | 3 ++ 5 files changed, 34 insertions(+), 31 deletions(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/8cef1811/src/changes/changes.xml --
[2/2] logging-log4j2 git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/c378259f Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/c378259f Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/c378259f Branch: refs/heads/master Commit: c378259fb6bf332754ec84c31bd1c6649f531422 Parents: 0d6c4d8 ffb256e Author: rpopma Authored: Thu Aug 20 01:50:33 2015 +0900 Committer: rpopma Committed: Thu Aug 20 01:50:33 2015 +0900 -- .../apache/logging/log4j/core/config/AbstractConfiguration.java| 2 +- .../org/apache/logging/log4j/core/config/ConfigurationTest.java| 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) --
[2/2] logging-log4j2 git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/ffb256e6 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/ffb256e6 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/ffb256e6 Branch: refs/heads/master Commit: ffb256e6d066ac75e48f3d4c7f2e6a95cb73132b Parents: 4539a19 9730315 Author: ggregory Authored: Tue Aug 18 12:50:56 2015 -0700 Committer: ggregory Committed: Tue Aug 18 12:50:56 2015 -0700 -- .../logging/log4j/core/config/LoggerConfig.java | 53 +--- .../logging/log4j/core/impl/Log4jLogEvent.java | 2 +- 2 files changed, 35 insertions(+), 20 deletions(-) --
[2/2] logging-log4j2 git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/36556a0a Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/36556a0a Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/36556a0a Branch: refs/heads/master Commit: 36556a0a3272101366834f984640885554d12b97 Parents: bb8b302 4060d79 Author: rpopma Authored: Wed Aug 19 00:44:36 2015 +0900 Committer: rpopma Committed: Wed Aug 19 00:44:36 2015 +0900 -- .../src/main/java/org/apache/log4j/Category.java | 5 +++-- .../src/main/java/org/apache/logging/log4j/Level.java | 5 +++-- .../logging/log4j/simple/SimpleLoggerContext.java | 9 - .../logging/log4j/spi/AbstractLoggerAdapter.java | 5 +++-- .../org/apache/logging/log4j/TestLoggerContext.java| 5 +++-- .../logging/log4j/core/appender/AsyncAppender.java | 11 ++- .../logging/log4j/core/appender/FailoverAppender.java | 10 ++ .../log4j/core/config/AbstractConfiguration.java | 10 ++ .../apache/logging/log4j/core/config/Configurator.java | 13 +++-- .../apache/logging/log4j/core/impl/ThrowableProxy.java | 5 +++-- .../logging/log4j/core/layout/Rfc5424Layout.java | 9 + .../apache/logging/log4j/core/lookup/MapLookup.java| 5 +++-- .../org/apache/logging/log4j/core/util/NameUtil.java | 2 +- .../logging/log4j/core/config/ConfigurationTest.java | 12 14 files changed, 65 insertions(+), 41 deletions(-) --
[2/2] logging-log4j2 git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/60a9a28b Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/60a9a28b Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/60a9a28b Branch: refs/heads/master Commit: 60a9a28b50c1228fa7587a8b816171d05f7fb3d7 Parents: e4dd47a3 b2acf12 Author: rpopma Authored: Mon Aug 10 01:32:35 2015 +0900 Committer: rpopma Committed: Mon Aug 10 01:32:35 2015 +0900 -- .../org/apache/logging/log4j/LogManager.java| 16 +- .../java/org/apache/logging/log4j/Logger2.java | 1476 +- .../logging/log4j/util/MessageSupplier.java | 80 +- .../org/apache/logging/log4j/util/Supplier.java | 80 +- 4 files changed, 826 insertions(+), 826 deletions(-) --
[2/2] logging-log4j2 git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-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/1454587f Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/1454587f Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/1454587f Branch: refs/heads/master Commit: 1454587f6bd07fbf6f13185fdb170d4fc6a01e7e Parents: 416477f 62b47cb Author: Ralph Goers Authored: Sat Aug 8 21:12:30 2015 -0700 Committer: Ralph Goers Committed: Sat Aug 8 21:12:30 2015 -0700 -- .../log4j/core/config/Configuration.java| 7 ++ .../logging/log4j/core/config/Configurator.java | 121 --- .../apache/logging/log4j/core/LoggerTest.java | 14 +++ src/changes/changes.xml | 3 + src/site/xdoc/faq.xml | 12 ++ 5 files changed, 111 insertions(+), 46 deletions(-) --
[2/2] logging-log4j2 git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/27cacebe Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/27cacebe Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/27cacebe Branch: refs/heads/master Commit: 27cacebe9f793dec167c51a72e724b50bec5c474 Parents: b5ee90a aa5151e Author: rpopma Authored: Thu Aug 6 07:52:16 2015 +0900 Committer: rpopma Committed: Thu Aug 6 07:52:16 2015 +0900 -- .../org/apache/logging/log4j/LogManager.java| 1100 +- .../rolling/DefaultRolloverStrategy.java|4 +- .../logging/log4j/core/config/LoggerConfig.java |8 +- log4j-samples/loggerProperties/pom.xml | 55 + .../logging/log4j/lookup/CustomLookup.java | 84 ++ .../logging/log4j/lookup/CustomMapMessage.java | 51 + .../logging/log4j/lookup/MapMessageLookup.java | 90 ++ .../logging/log4j/CustomPropertiesTest.java | 51 + .../src/test/resources/log4j2.xml | 48 + log4j-samples/pom.xml |1 + pom.xml |2 +- src/changes/changes.xml |8 +- 12 files changed, 947 insertions(+), 555 deletions(-) --
[2/2] logging-log4j2 git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-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/9f1c6adb Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/9f1c6adb Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/9f1c6adb Branch: refs/heads/master Commit: 9f1c6adb2c7f7f146a7e77cf1d08b3ad23d3de01 Parents: 444a748 a2fd2ef Author: Ralph Goers Authored: Sun Jul 12 14:14:27 2015 -0700 Committer: Ralph Goers Committed: Sun Jul 12 14:14:27 2015 -0700 -- .../java/org/apache/logging/log4j/Marker.java | 208 +++ log4j-core/pom.xml | 1 + .../core/appender/OutputStreamManager.java | 2 +- .../rolling/DefaultRolloverStrategy.java| 40 +-- .../rolling/action/CommonsCompressAction.java | 6 +- .../core/async/AsyncLoggerConfigHelper.java | 6 + .../logging/log4j/core/impl/ThrowableProxy.java | 18 +- .../logging/log4j/core/layout/GelfLayout.java | 2 +- .../log4j/core/layout/PatternLayout.java| 7 +- .../core/pattern/DatePatternConverter.java | 48 ++-- .../core/util/datetime/FastDateParser.java | 12 +- .../core/util/datetime/FastDatePrinter.java | 2 +- .../log4j/core/util/datetime/Format.java| 8 +- .../apache/logging/log4j/core/LoggerTest.java | 1 - ...nsoleAppenderDefaultSuppressedThrowable.java | 6 +- .../ConsoleAppenderNoAnsiStyleLayoutMain.java | 4 +- .../log4j/core/appender/FileAppenderTest.java | 2 +- .../core/appender/OutputStreamAppenderTest.java | 2 +- .../rolling/action/Bzip2CompressActionTest.java | 2 +- .../plugins/validation/ValidatingPlugin.java| 1 - .../log4j/core/impl/ThrowableProxyTest.java | 22 +- .../log4j/core/layout/LogEventFixtures.java | 1 - .../log4j/core/layout/XmlLayoutTest.java| 1 - .../log4j/core/selector/TestClassLoader.java| 2 +- .../log4j/flume/appender/FlumeAvroManager.java | 4 +- .../log4j/flume/appender/FlumeAppenderTest.java | 2 +- .../log4j/jul/DefaultLevelConverter.java| 14 +- ...efaultLevelConverterCustomJulLevelsTest.java | 5 +- .../nosql/appender/mongodb/MongoDbProvider.java | 2 +- .../perf/jmh/SimpleDateFormatBenchmark.java | 34 +-- .../org/apache/logging/slf4j/Log4jMarker.java | 264 +-- .../apache/logging/slf4j/Log4jMarkerTest.java | 76 +++--- .../org/apache/logging/slf4j/MarkerTest.java| 28 +- pom.xml | 2 +- 34 files changed, 421 insertions(+), 414 deletions(-) --
[2/2] logging-log4j2 git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/b38f0cb5 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/b38f0cb5 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/b38f0cb5 Branch: refs/heads/master Commit: b38f0cb560efe605cb9a6da203fe7171f144ec20 Parents: e548479 72ef0eb Author: rpopma Authored: Sun Jul 5 16:29:25 2015 +0900 Committer: rpopma Committed: Sun Jul 5 16:29:25 2015 +0900 -- log4j-samples/configuration/pom.xml | 55 .../configuration/CustomConfiguration.java | 67 .../CustomConfigurationFactory.java | 47 ++ .../configuration/CustomConfigurationTest.java | 17 + log4j-samples/pom.xml | 1 + 5 files changed, 187 insertions(+) --
[2/2] logging-log4j2 git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-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/72ef0eb4 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/72ef0eb4 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/72ef0eb4 Branch: refs/heads/master Commit: 72ef0eb4cbd6ca6bed72420bb39fb5b16627624d Parents: 7c8dffc 8d4dc1f Author: Ralph Goers Authored: Sat Jul 4 23:02:14 2015 -0700 Committer: Ralph Goers Committed: Sat Jul 4 23:02:14 2015 -0700 -- .../log4j/core/appender/AbstractManager.java| 7 +- .../core/appender/rolling/PatternProcessor.java | 6 +- .../rolling/TimeBasedTriggeringPolicy.java | 8 +- .../logging/log4j/core/impl/ThrowableProxy.java | 112 +++ .../core/pattern/DatePatternConverter.java | 4 +- ...nsoleAppenderDefaultSuppressedThrowable.java | 67 +++ .../log4j/core/impl/ThrowableProxyTest.java | 25 + ...4j2-console-default-suppressed-throwable.xml | 31 + pom.xml | 8 +- src/changes/changes.xml | 8 +- src/site/xdoc/articles.xml | 4 + src/site/xdoc/manual/async.xml | 6 +- 12 files changed, 224 insertions(+), 62 deletions(-) --
[2/2] logging-log4j2 git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/155dfc73 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/155dfc73 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/155dfc73 Branch: refs/heads/master Commit: 155dfc739211f3262fc089c56da939393b4ed80b Parents: 2d73111 794c469 Author: rpopma Authored: Thu Jun 18 00:21:16 2015 +0900 Committer: rpopma Committed: Thu Jun 18 00:21:16 2015 +0900 -- doap_log4j2.rdf | 66 ++ .../log4j/core/config/ConfigurationFactory.java | 48 + .../log4j/core/BasicConfigurationFactory.java | 4 +- .../log4j/flume/appender/FlumeAppender.java | 4 +- .../log4j/flume/appender/FlumeAvroManager.java | 71 ++-- .../flume/appender/FlumePersistentManager.java | 15 ++--- .../log4j/flume/appender/FlumeAppenderTest.java | 41 +++ .../ext/logging/log4j2/Log4j2Logger.java| 2 +- src/changes/changes.xml | 6 ++ src/site/xdoc/articles.xml | 4 ++ 10 files changed, 211 insertions(+), 50 deletions(-) --
[2/2] logging-log4j2 git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/4c6d636b Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/4c6d636b Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/4c6d636b Branch: refs/heads/master Commit: 4c6d636b669b10753a214c4af869b0dbe7386f18 Parents: 62ce932 3d92506 Author: Gary Gregory Authored: Sun Jun 14 12:11:47 2015 -0700 Committer: Gary Gregory Committed: Sun Jun 14 12:11:47 2015 -0700 -- src/site/site.xml | 1 + src/site/xdoc/manual/configuration.xml.vm | 4 +++- src/site/xdoc/manual/lookups.xml | 18 ++ 3 files changed, 22 insertions(+), 1 deletion(-) --
[2/2] logging-log4j2 git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/61b419dd Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/61b419dd Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/61b419dd Branch: refs/heads/master Commit: 61b419dd687b32dc827bf54188a152f57f4ab4fb Parents: 1ab4946 f64a150 Author: Gary Gregory Authored: Thu Jun 11 23:40:06 2015 -0700 Committer: Gary Gregory Committed: Thu Jun 11 23:40:06 2015 -0700 -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --
[2/2] logging-log4j2 git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-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/f64a150a Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/f64a150a Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/f64a150a Branch: refs/heads/master Commit: f64a150ac5f8bdd4dc9c1a57dabf296f9ba4f16a Parents: 3136173 4fba3c4 Author: Ralph Goers Authored: Thu Jun 11 23:24:07 2015 -0700 Committer: Ralph Goers Committed: Thu Jun 11 23:24:07 2015 -0700 -- .../main/java/org/apache/logging/log4j/core/util/Loader.java | 8 1 file changed, 8 deletions(-) --
[2/2] logging-log4j2 git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/cf67e8aa Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/cf67e8aa Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/cf67e8aa Branch: refs/heads/master Commit: cf67e8aa72400358f888d326f6a2a159d451cb0c Parents: 23dc3f0 763165d Author: Gary Gregory Authored: Mon May 18 20:27:51 2015 -0700 Committer: Gary Gregory Committed: Mon May 18 20:27:51 2015 -0700 -- .../log4j/core/pattern/MdcPatternConverter.java | 55 ++--- .../core/pattern/MdcPatternConverterTest.java | 86 src/changes/changes.xml | 3 + src/site/xdoc/manual/layouts.xml.vm | 19 +++-- 4 files changed, 144 insertions(+), 19 deletions(-) --
[2/2] logging-log4j2 git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-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/2d00e295 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/2d00e295 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/2d00e295 Branch: refs/heads/master Commit: 2d00e2957d5fa845dfd4e6fc94b7e47b12d0431a Parents: 9869eac 7da3d62 Author: Ralph Goers Authored: Sun May 3 11:40:18 2015 -0700 Committer: Ralph Goers Committed: Sun May 3 11:40:18 2015 -0700 -- .../logging/log4j/core/util/FileUtilsTest.java | 23 ++-- 1 file changed, 21 insertions(+), 2 deletions(-) --
[2/2] logging-log4j2 git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-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/b76a9b2d Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/b76a9b2d Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/b76a9b2d Branch: refs/heads/master Commit: b76a9b2de1cc295d6783a236dbd5f236ee3e280d Parents: e79279c 13d1d78 Author: Ralph Goers Authored: Sun Apr 5 17:24:29 2015 -0700 Committer: Ralph Goers Committed: Sun Apr 5 17:24:29 2015 -0700 -- .../apache/logging/log4j/core/filter/AbstractFilter.java | 10 -- .../org/apache/logging/log4j/core/filter/BurstFilter.java | 2 +- src/changes/changes.xml | 3 +++ 3 files changed, 8 insertions(+), 7 deletions(-) --
[2/2] logging-log4j2 git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/e6e99447 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/e6e99447 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/e6e99447 Branch: refs/heads/master Commit: e6e99447f456dc0bd42ae0c3fa688c04e764351c Parents: dba6e98 3f48311 Author: Gary Gregory Authored: Mon Feb 23 10:48:43 2015 -0800 Committer: Gary Gregory Committed: Mon Feb 23 10:48:43 2015 -0800 -- RELEASE-NOTES.txt | 294 --- log4j-1.2-api/pom.xml | 2 +- log4j-api/pom.xml | 2 +- .../org/apache/logging/log4j/util/Strings.java | 30 +- log4j-bom/pom.xml | 2 +- log4j-core/pom.xml | 2 +- .../apache/logging/log4j/core/jmx/Server.java | 58 ++-- log4j-distribution/pom.xml | 2 +- log4j-flume-ng/pom.xml | 2 +- log4j-iostreams/pom.xml | 2 +- log4j-jcl/pom.xml | 2 +- log4j-jmx-gui/pom.xml | 2 +- log4j-jul/pom.xml | 2 +- log4j-nosql/pom.xml | 2 +- log4j-perf/pom.xml | 2 +- log4j-samples/flume-common/pom.xml | 2 +- log4j-samples/flume-embedded/pom.xml| 2 +- log4j-samples/flume-remote/pom.xml | 2 +- log4j-samples/pom.xml | 2 +- log4j-slf4j-impl/pom.xml| 2 +- log4j-taglib/pom.xml| 2 +- log4j-to-slf4j/pom.xml | 2 +- log4j-web/pom.xml | 2 +- pom.xml | 2 +- src/changes/announcement.vm | 185 +--- src/changes/changes.xml | 9 +- src/site/xdoc/faq.xml | 5 +- src/site/xdoc/manual/configuration.xml.vm | 10 + 28 files changed, 151 insertions(+), 482 deletions(-) --
[2/2] logging-log4j2 git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-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/d82dba5d Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/d82dba5d Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/d82dba5d Branch: refs/heads/master Commit: d82dba5d8213562217a7a681674409d46dbdb4ae Parents: 5dda63d d329cf3 Author: rgoers Authored: Sun Feb 22 14:41:33 2015 -0700 Committer: rgoers Committed: Sun Feb 22 14:41:33 2015 -0700 -- .../apache/logging/log4j/core/jmx/Server.java | 58 +--- src/changes/changes.xml | 5 ++ src/site/xdoc/faq.xml | 5 +- src/site/xdoc/manual/configuration.xml.vm | 10 4 files changed, 56 insertions(+), 22 deletions(-) --