You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by mi...@apache.org on 2016/05/25 08:09:51 UTC
logging-log4j2 git commit: Fix Javadoc
Repository: logging-log4j2
Updated Branches:
refs/heads/master 27c86df7b -> 6611fd3bc
Fix Javadoc
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/6611fd3b
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/6611fd3b
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/6611fd3b
Branch: refs/heads/master
Commit: 6611fd3bca509df803fe59a87670b6c852f2a401
Parents: 27c86df
Author: Mikael St�ldal <mi...@magine.com>
Authored: Wed May 25 10:09:41 2016 +0200
Committer: Mikael St�ldal <mi...@magine.com>
Committed: Wed May 25 10:09:41 2016 +0200
----------------------------------------------------------------------
.../java/org/apache/logging/log4j/core/layout/JsonLayout.java | 7 ++++++-
.../java/org/apache/logging/log4j/core/layout/XmlLayout.java | 2 +-
.../java/org/apache/logging/log4j/core/layout/YamlLayout.java | 2 +-
3 files changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/6611fd3b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JsonLayout.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JsonLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JsonLayout.java
index 90074bc..e9d87ae 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JsonLayout.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JsonLayout.java
@@ -878,7 +878,12 @@ public final class JsonLayout extends AbstractJacksonLayout {
* @param locationInfo
* If "true", includes the location information in the generated JSON.
* @param properties
- * If "true", includes the thread context in the generated JSON.
+ * If "true", includes the thread context map in the generated JSON.
+ * @param propertiesAsList
+ * If true, the thread context map is included as a list of map entry objects, where each entry has
+ * a "key" attribute (whose value is the key) and a "value" attribute (whose value is the value).
+ * Defaults to false, in which case the thread context map is included as a simple map of key-value
+ * pairs.
* @param complete
* If "true", includes the JSON header and footer, and comma between records.
* @param compact
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/6611fd3b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/XmlLayout.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/XmlLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/XmlLayout.java
index 4364d9d..afa6db7 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/XmlLayout.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/XmlLayout.java
@@ -268,7 +268,7 @@ public final class XmlLayout extends AbstractJacksonLayout {
* Creates an XML Layout.
*
* @param locationInfo If "true", includes the location information in the generated XML.
- * @param properties If "true", includes the thread context in the generated XML.
+ * @param properties If "true", includes the thread context map in the generated XML.
* @param complete If "true", includes the XML header and footer, defaults to "false".
* @param compact If "true", does not use end-of-lines and indentation, defaults to "false".
* @param charset The character set to use, if {@code null}, uses "UTF-8".
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/6611fd3b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/YamlLayout.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/YamlLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/YamlLayout.java
index 6401fac..6f3e103 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/YamlLayout.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/YamlLayout.java
@@ -779,7 +779,7 @@ public final class YamlLayout extends AbstractJacksonLayout {
* @param locationInfo
* If "true", includes the location information in the generated YAML.
* @param properties
- * If "true", includes the thread context in the generated YAML.
+ * If "true", includes the thread context map in the generated YAML.
* @param headerPattern
* The header pattern, defaults to {@code ""} if null.
* @param footerPattern