logging-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ggreg...@apache.org
Subject svn commit: r1512792 - /logging/log4j/log4j2/trunk/core/src/main/resources/Log4j-config.xsd
Date Sat, 10 Aug 2013 16:38:30 GMT
Author: ggregory
Date: Sat Aug 10 16:38:30 2013
New Revision: 1512792

URL: http://svn.apache.org/r1512792
Log:
Add missing thresholdFilter element. (XMLSpy looks like it formated things around a bit though.)

Modified:
    logging/log4j/log4j2/trunk/core/src/main/resources/Log4j-config.xsd

Modified: logging/log4j/log4j2/trunk/core/src/main/resources/Log4j-config.xsd
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/resources/Log4j-config.xsd?rev=1512792&r1=1512791&r2=1512792&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/resources/Log4j-config.xsd (original)
+++ logging/log4j/log4j2/trunk/core/src/main/resources/Log4j-config.xsd Sat Aug 10 16:38:30
2013
@@ -16,112 +16,118 @@
  limitations under the License.
 
 -->
-<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-  <xs:element name="configuration" type="configurationType"/>
-  <xs:complexType name="configurationType">
-    <xs:sequence>
-      <xs:element type="propertiesType" name="properties"/>
-      <xs:choice minOccurs="0" maxOccurs="1">
-        <xs:element type="filtersType" name="filters"/>
-        <xs:element type="filterType" name="filter"/>
-      </xs:choice>
-      <xs:element type="appendersType" name="appenders"/>
-      <xs:element type="loggersType" name="loggers"/>
-    </xs:sequence>
-    <xs:attribute type="xs:string" name="packages"/>
-    <xs:attribute type="xs:string" name="status"/>
-    <xs:attribute type="xs:string" name="strict"/>
-    <xs:attribute type="xs:string" name="name"/>
-    <xs:attribute type="xs:string" name="advertiser"/>
-  </xs:complexType>
-  <xs:complexType name="propertiesType">
-    <xs:sequence>
-      <xs:element type="propertyType" name="property"/>
-    </xs:sequence>
-  </xs:complexType>
-  <xs:complexType name="appenderType">
-    <xs:sequence>
-      <xs:element type="layoutType" name="layout" minOccurs="0"/>
-      <xs:choice minOccurs="0" maxOccurs="1">
-        <xs:element type="filtersType" name="filters"/>
-        <xs:element type="filterType" name="filter"/>
-      </xs:choice>
-    </xs:sequence>
-    <xs:attribute type="xs:string" name="type" use="required"/>
-    <xs:attribute type="xs:string" name="name" use="required"/>
-    <xs:attribute type="xs:string" name="fileName" use="optional"/>
-  </xs:complexType>
-  <xs:complexType name="rootType">
-    <xs:sequence>
-      <xs:element type="appender-refType" name="appender-ref" maxOccurs="unbounded" minOccurs="1"/>
-    </xs:sequence>
-    <xs:attribute type="xs:string" name="level"/>
-  </xs:complexType>
-  <xs:complexType name="propertyType">
-    <xs:simpleContent>
-      <xs:extension base="xs:string">
-        <xs:attribute type="xs:string" name="name"/>
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-  <xs:complexType name="KeyValuePairType">
-    <xs:simpleContent>
-      <xs:extension base="xs:string">
-        <xs:attribute type="xs:string" name="key"/>
-        <xs:attribute type="xs:string" name="value"/>
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-  <xs:complexType name="appendersType">
-    <xs:sequence>
-      <xs:element type="appenderType" name="appender" maxOccurs="unbounded" minOccurs="1"/>
-    </xs:sequence>
-  </xs:complexType>
-  <xs:complexType name="appender-refType">
-    <xs:simpleContent>
-      <xs:extension base="xs:string">
-        <xs:attribute type="xs:string" name="ref" use="required"/>
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-  <xs:complexType name="loggerType">
-    <xs:sequence>
-      <xs:choice minOccurs="0" maxOccurs="1">
-        <xs:element type="filtersType" name="filters"/>
-        <xs:element type="filterType" name="filter"/>
-      </xs:choice>
-      <xs:element type="appender-refType" name="appender-ref"/>
-    </xs:sequence>
-    <xs:attribute type="xs:string" name="name" use="required"/>
-    <xs:attribute type="xs:string" name="level" use="optional"/>
-    <xs:attribute type="xs:string" name="additivity" use="optional"/>
-  </xs:complexType>
-  <xs:complexType name="filterType" mixed="true">
-    <xs:sequence>
-      <xs:element type="KeyValuePairType" name="KeyValuePair" minOccurs="0"/>
-    </xs:sequence>
-    <xs:attribute type="xs:string" name="type" use="required"/>
-    <xs:attribute type="xs:string" name="level" use="optional"/>
-    <xs:attribute type="xs:string" name="marker" use="optional"/>
-    <xs:attribute type="xs:string" name="onMatch" use="optional"/>
-    <xs:attribute type="xs:string" name="onMismatch" use="optional"/>
-  </xs:complexType>
-  <xs:complexType name="filtersType">
-    <xs:sequence>
-      <xs:element type="filterType" name="filter" maxOccurs="unbounded" minOccurs="0"/>
-    </xs:sequence>
-  </xs:complexType>
-  <xs:complexType name="loggersType" mixed="true">
-    <xs:sequence>
-      <xs:element type="loggerType" name="logger" maxOccurs="unbounded" minOccurs="0"/>
-      <xs:element type="rootType" name="root" maxOccurs="1" minOccurs="1"/>
-    </xs:sequence>
-  </xs:complexType>
-  <xs:complexType name="layoutType" mixed="true">
-    <xs:sequence>
-      <xs:element type="xs:string" name="pattern" minOccurs="0"/>
-    </xs:sequence>
-    <xs:attribute type="xs:string" name="type" use="required"/>
-    <xs:attribute type="xs:string" name="pattern" use="optional"/>
-  </xs:complexType>
-</xs:schema>
\ No newline at end of file
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified"
attributeFormDefault="unqualified">
+    <xs:element name="configuration" type="configurationType"/>
+    <xs:complexType name="configurationType">
+        <xs:sequence>
+            <xs:element name="properties" type="propertiesType"/>
+            <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="appenders" type="appendersType"/>
+            <xs:element name="loggers" type="loggersType"/>
+        </xs:sequence>
+        <xs:attribute name="packages" type="xs:string"/>
+        <xs:attribute name="status" type="xs:string"/>
+        <xs:attribute name="strict" type="xs:string"/>
+        <xs:attribute name="name" type="xs:string"/>
+        <xs:attribute name="advertiser" type="xs:string"/>
+    </xs:complexType>
+    <xs:complexType name="propertiesType">
+        <xs:sequence>
+            <xs:element name="property" type="propertyType"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="appenderType">
+        <xs:sequence>
+            <xs:element name="layout" type="layoutType" minOccurs="0"/>
+            <xs:choice minOccurs="0" maxOccurs="1">
+                <xs:element name="filters" type="filtersType"/>
+                <xs:element name="filter" type="filterType"/>
+            </xs:choice>
+        </xs:sequence>
+        <xs:attribute name="type" type="xs:string" use="required"/>
+        <xs:attribute name="name" type="xs:string" use="required"/>
+        <xs:attribute name="fileName" type="xs:string" use="optional"/>
+    </xs:complexType>
+    <xs:complexType name="rootType">
+        <xs:sequence>
+            <xs:element name="appender-ref" type="appender-refType" minOccurs="1" maxOccurs="unbounded"/>
+        </xs:sequence>
+        <xs:attribute name="level" type="xs:string"/>
+    </xs:complexType>
+    <xs:complexType name="propertyType">
+        <xs:simpleContent>
+            <xs:extension base="xs:string">
+                <xs:attribute name="name" type="xs:string"/>
+            </xs:extension>
+        </xs:simpleContent>
+    </xs:complexType>
+    <xs:complexType name="KeyValuePairType">
+        <xs:simpleContent>
+            <xs:extension base="xs:string">
+                <xs:attribute name="key" type="xs:string"/>
+                <xs:attribute name="value" type="xs:string"/>
+            </xs:extension>
+        </xs:simpleContent>
+    </xs:complexType>
+    <xs:complexType name="appendersType">
+        <xs:sequence>
+            <xs:element name="appender" type="appenderType" minOccurs="1" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="appender-refType">
+        <xs:simpleContent>
+            <xs:extension base="xs:string">
+                <xs:attribute name="ref" type="xs:string" use="required"/>
+            </xs:extension>
+        </xs:simpleContent>
+    </xs:complexType>
+    <xs:complexType name="loggerType">
+        <xs:sequence>
+            <xs:choice minOccurs="0" maxOccurs="1">
+                <xs:element name="filters" type="filtersType"/>
+                <xs:element name="filter" type="filterType"/>
+            </xs:choice>
+            <xs:element name="appender-ref" type="appender-refType"/>
+        </xs:sequence>
+        <xs:attribute name="name" type="xs:string" use="required"/>
+        <xs:attribute name="level" type="xs:string" use="optional"/>
+        <xs:attribute name="additivity" type="xs:string" use="optional"/>
+    </xs:complexType>
+    <xs:complexType name="filterType" mixed="true">
+        <xs:sequence>
+            <xs:element name="KeyValuePair" type="KeyValuePairType" minOccurs="0"/>
+        </xs:sequence>
+        <xs:attribute name="type" type="xs:string" use="required"/>
+        <xs:attribute name="level" type="xs:string" use="optional"/>
+        <xs:attribute name="marker" type="xs:string" use="optional"/>
+        <xs:attribute name="onMatch" type="xs:string" use="optional"/>
+        <xs:attribute name="onMismatch" type="xs:string" use="optional"/>
+    </xs:complexType>
+    <xs:complexType name="filtersType">
+        <xs:sequence>
+            <xs:element name="filter" type="filterType" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="loggersType" mixed="true">
+        <xs:sequence>
+            <xs:element name="logger" type="loggerType" minOccurs="0" maxOccurs="unbounded"/>
+            <xs:element name="root" type="rootType" minOccurs="1" maxOccurs="1"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="layoutType" mixed="true">
+        <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:complexType>
+    <xs:complexType name="thresholdFilterType">
+        <xs:attribute name="level" type="xs:string" use="optional"/>
+        <xs:attribute name="onMatch" type="xs:string" use="optional"/>
+        <xs:attribute name="onMismatch" type="xs:string" use="optional"/>
+    </xs:complexType>
+</xs:schema>



Mime
View raw message