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/05/03 15:35:52 UTC
[1/2] logging-log4j2 git commit: LOG4J2-1011 Document dependencies
for XML layout
Repository: logging-log4j2
Updated Branches:
refs/heads/master 6dc663de3 -> 57d147266
LOG4J2-1011 Document dependencies for XML layout
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/50ef6235
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/50ef6235
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/50ef6235
Branch: refs/heads/master
Commit: 50ef62351f9c808f396183ed01fe5f56d338c459
Parents: ff8aede
Author: rpopma <rp...@apache.org>
Authored: Tue May 3 22:33:16 2016 +0900
Committer: rpopma <rp...@apache.org>
Committed: Tue May 3 22:33:16 2016 +0900
----------------------------------------------------------------------
src/site/xdoc/runtime-dependencies.xml | 32 ++++++++++++++++++-----------
1 file changed, 20 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/50ef6235/src/site/xdoc/runtime-dependencies.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/runtime-dependencies.xml b/src/site/xdoc/runtime-dependencies.xml
index ba7273b..6ebbc9b 100644
--- a/src/site/xdoc/runtime-dependencies.xml
+++ b/src/site/xdoc/runtime-dependencies.xml
@@ -53,6 +53,22 @@
<th>Requirements</th>
</tr>
<tr>
+ <td>XML configuration</td>
+ <td>-</td>
+ </tr>
+ <tr>
+ <td>Properties configuration</td>
+ <td>-</td>
+ </tr>
+ <tr>
+ <td>JSON configuration</td>
+ <td><a href="https://github.com/FasterXML/jackson">Jackson core and databind</a></td>
+ </tr>
+ <tr>
+ <td>YAML configuration</td>
+ <td><a href="https://github.com/FasterXML/jackson-dataformat-yaml">Jackson YAML data format</a></td>
+ </tr>
+ <tr>
<td>CSV Layout</td>
<td><a href="https://commons.apache.org/proper/commons-csv/">Apache Commons CSV</a></td>
</tr>
@@ -65,18 +81,10 @@
<td><a href="https://github.com/FasterXML/jackson">Jackson core and databind</a></td>
</tr>
<tr>
- <td>XML configuration</td>
- <td>-</td>
- </tr>
- <tr>
- <td>JSON configuration</td>
+ <td>XML Layout</td>
<td><a href="https://github.com/FasterXML/jackson">Jackson core and databind</a></td>
</tr>
<tr>
- <td>YAML configuration</td>
- <td><a href="https://github.com/FasterXML/jackson-dataformat-yaml">Jackson YAML data format</a></td>
- </tr>
- <tr>
<td>Async Loggers</td>
<td><a href="http://lmax-exchange.github.io/disruptor/">LMAX Disruptor</a></td>
</tr>
@@ -123,9 +131,9 @@
<tr>
<td>ZeroMQ Appender</td>
<td>
- The ZeroMQ appender uses the <a href="https://github.com/zeromq/jeromq">JeroMQ</a> library which is
- licensed under the terms of the GNU Lesser General Public License (LGPL). For details see the
- files <code>COPYING</code> and <code>COPYING.LESSER</code> included with the JeroMQ distribution.
+ The ZeroMQ appender uses the <a href="https://github.com/zeromq/jeromq">JeroMQ</a> library which is
+ licensed under the terms of the GNU Lesser General Public License (LGPL). For details see the
+ files <code>COPYING</code> and <code>COPYING.LESSER</code> included with the JeroMQ distribution.
</td>
</tr>
</table>
[2/2] logging-log4j2 git commit: Merge remote-tracking branch
'origin/master'
Posted by rp...@apache.org.
Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/57d14726
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/57d14726
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/57d14726
Branch: refs/heads/master
Commit: 57d147266a7f86e2e375b75f5933ce9a4841e3c8
Parents: 50ef623 6dc663d
Author: rpopma <rp...@apache.org>
Authored: Tue May 3 22:36:16 2016 +0900
Committer: rpopma <rp...@apache.org>
Committed: Tue May 3 22:36:16 2016 +0900
----------------------------------------------------------------------
.../log4j/core/layout/Rfc5424Layout.java | 5 +-
.../log4j/core/pattern/NameAbbreviator.java | 77 ++++++-
.../log4j/core/layout/PatternLayoutTest.java | 202 +++++++++++++++++++
src/changes/changes.xml | 7 +-
src/site/xdoc/manual/layouts.xml.vm | 34 +++-
5 files changed, 310 insertions(+), 15 deletions(-)
----------------------------------------------------------------------