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 2016/12/30 21:04:28 UTC
[1/2] logging-log4j2 git commit: [LOG4J2-1756] Adds xmlns in schema
and some other tags.
Repository: logging-log4j2
Updated Branches:
refs/heads/master 4254e2558 -> 6466fa171
[LOG4J2-1756] Adds xmlns in schema and some other tags.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/694f26df
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/694f26df
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/694f26df
Branch: refs/heads/master
Commit: 694f26df214f22ca256b054c0e65bcd46bc93277
Parents: 367d26b
Author: Shubhankar <sh...@gmail.com>
Authored: Fri Dec 30 13:03:43 2016 -0800
Committer: Gary Gregory <ga...@gmail.com>
Committed: Fri Dec 30 13:03:43 2016 -0800
----------------------------------------------------------------------
log4j-core/src/main/resources/Log4j-config.xsd | 26 +++++++++++++++++----
src/changes/changes.xml | 3 +++
2 files changed, 24 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/694f26df/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 e75cb9e..a7122ef 100644
--- a/log4j-core/src/main/resources/Log4j-config.xsd
+++ b/log4j-core/src/main/resources/Log4j-config.xsd
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="http://logging.apache.org/log4j/2.0/config" elementFormDefault="qualified" attributeFormDefault="unqualified">
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://logging.apache.org/log4j/2.0/config" targetNamespace="http://logging.apache.org/log4j/2.0/config" elementFormDefault="qualified" attributeFormDefault="unqualified">
<xs:element name="Configuration" type="ConfigurationType"/>
<xs:complexType name="ConfigurationType">
<xs:sequence>
@@ -24,12 +24,12 @@
<xs:element name="CustomLevels" type="CustomLevelsType"/>
<xs:element name="CustomLevel" type="CustomLevelType"/>
</xs:choice>
- <xs:element name="Properties" type="PropertiesType"/>
+ <xs:element name="Properties" type="PropertiesType" minOccurs="0"/>
<xs:choice minOccurs="0" maxOccurs="1">
<xs:element name="Filters" type="FiltersType"/>
<xs:element name="Filter" type="FilterType"/>
</xs:choice>
- <xs:element name="ThresholdFilter" type="ThresholdFilterType"/>
+ <xs:element name="ThresholdFilter" type="ThresholdFilterType" minOccurs="0"/>
<xs:element name="Appenders" type="AppendersType"/>
<xs:element name="Loggers" type="LoggersType"/>
</xs:sequence>
@@ -81,10 +81,26 @@
</xs:complexType>
<xs:complexType name="AppendersType">
<xs:sequence>
- <xs:element name="Appender" type="AppenderType" minOccurs="1" maxOccurs="unbounded"/>
+ <xs:element name="Appender" type="AppenderType" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:element name="Console" type="ConsoleType" minOccur="0"/>
</xs:sequence>
</xs:complexType>
- <xs:complexType name="AppenderRefType">
+ <xs:complexType name="ConsoleType">
+ <xs:sequence>
+ <xs:element name="PatternLayout" type="PatternLayoutType" minOccur="1" maxOccurs="unbounded"/>
+ </xs:sequence>
+ <xs:attribute type="xs:string" name="name" use="required"/>
+ <xs:attribute type="xs:string" name="target" use="required"/>
+ <xs:attribute type="xs:string" name="follow" use="optional"/>
+ </xs:complexType>
+ <xs:complexType name="PatternLayoutType">
+ <xs:simpleContent>
+ <xs:extension base="xs:string">
+ <xs:attribute type="xs:string" name="pattern" use="required"/>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+ <xs:complexType name="AppenderRefType">
<xs:simpleContent>
<xs:extension base="xs:string">
<xs:attribute name="ref" type="xs:string" use="required"/>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/694f26df/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index c05de09..31b7f0b 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -177,6 +177,9 @@
<action issue="LOG4J2-1743" dev="ggregory" type="fix" due-to="Toby Shepheard">
CompositeConfiguration does not add filters to appenderRefs.
</action>
+ <action issue="LOG4J2-1756" dev="ggregory" type="fix" due-to="shubhankar1100">
+ Adds xmlns in schema and some other tags.
+ </action>
<action issue="LOG4J2-1644" dev="ggregory" type="update" due-to="Tim Gokcen, Pavel Sivolobtchik">
Inefficient locking in AbstractLoggerAdapter.
</action>
[2/2] logging-log4j2 git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/logging-log4j2.git
Posted by gg...@apache.org.
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 <ga...@gmail.com>
Authored: Fri Dec 30 13:04:12 2016 -0800
Committer: Gary Gregory <ga...@gmail.com>
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
----------------------------------------------------------------------