You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gg...@apache.org on 2015/12/08 21:20:41 UTC
logging-log4j2 git commit: [LOG4J2-1215] Documentation/XSD
inconsistencies.
Repository: logging-log4j2
Updated Branches:
refs/heads/master 009fd74eb -> ad58061e9
[LOG4J2-1215] Documentation/XSD inconsistencies.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/ad58061e
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/ad58061e
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/ad58061e
Branch: refs/heads/master
Commit: ad58061e9b54009d3c051e1e25dbc63031492ed9
Parents: 009fd74
Author: ggregory <gg...@apache.org>
Authored: Tue Dec 8 15:20:37 2015 -0500
Committer: ggregory <gg...@apache.org>
Committed: Tue Dec 8 15:20:37 2015 -0500
----------------------------------------------------------------------
log4j-core/src/main/resources/Log4j-config.xsd | 7 ++++---
src/changes/changes.xml | 5 +++++
2 files changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ad58061e/log4j-core/src/main/resources/Log4j-config.xsd
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/resources/Log4j-config.xsd b/log4j-core/src/main/resources/Log4j-config.xsd
index 8f492d1..2310aa9 100644
--- a/log4j-core/src/main/resources/Log4j-config.xsd
+++ b/log4j-core/src/main/resources/Log4j-config.xsd
@@ -38,10 +38,11 @@
<xs:attribute name="strict" type="xs:string"/>
<xs:attribute name="name" type="xs:string"/>
<xs:attribute name="advertiser" type="xs:string"/>
+ <xs:attribute name="schema" type="xs:string"/>
</xs:complexType>
<xs:complexType name="PropertiesType">
<xs:sequence>
- <xs:element name="Property" type="PropertyType"/>
+ <xs:element name="Property" type="PropertyType" minOccurs="0" maxOccurs="unbounded"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="AppenderType">
@@ -135,8 +136,8 @@
<xs:sequence>
<xs:element name="Pattern" type="xs:string" minOccurs="0"/>
</xs:sequence>
- <xs:attribute name="Type" type="xs:string" use="required"/>
- <xs:attribute name="Pattern" type="xs:string" use="optional"/>
+ <xs:attribute name="type" type="xs:string" use="required"/>
+ <xs:attribute name="pattern" type="xs:string" use="optional"/>
</xs:complexType>
<xs:complexType name="ThresholdFilterType">
<xs:attribute name="level" type="xs:string" use="optional"/>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ad58061e/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 3fdf8a2..bb3aad9 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -23,6 +23,11 @@
<title>Changes</title>
</properties>
<body>
+ <release version="2.5.1" date="201Y-MM-DD" description="GA Release 2.5.1">
+ <action issue="LOG4J2-1215" dev="ggregory" type="fix" due-to="Erik Kemperman">
+ Documentation/XSD inconsistencies.
+ </action>
+ </release>
<release version="2.5" date="2015-12-06" description="GA Release 2.5">
<action issue="LOG4J2-324" dev="rpopma" type="fix">
Reduced memory usage of status messages in bounded queue; support zero-length queue that stores no messages.