[WFCORE-4337] Bump the logging subsystem schema and model versions.

wildfly · Feb 18, 2019 · d4b5cf3992ff5c4b3f1b6300b2f702dc6b1832bd · d4b5cf3
1 parent 3889c29
commit d4b5cf3992ff5c4b3f1b6300b2f702dc6b1832bd
diff --git a/logging/src/main/java/org/jboss/as/logging/KnownModelVersion.java b/logging/src/main/java/org/jboss/as/logging/KnownModelVersion.java
@@ -15,6 +15,7 @@
     VERSION_5_0_0(ModelVersion.create(5, 0, 0), true),
     VERSION_6_0_0(ModelVersion.create(6, 0, 0), true),
     VERSION_7_0_0(ModelVersion.create(7, 0, 0), false),
+    VERSION_8_0_0(ModelVersion.create(8, 0, 0), false),
     ;
     private final ModelVersion modelVersion;
     private final boolean hasTransformers;

diff --git a/logging/src/main/java/org/jboss/as/logging/LoggingExtension.java b/logging/src/main/java/org/jboss/as/logging/LoggingExtension.java
@@ -98,7 +98,7 @@
 
     private static final GenericSubsystemDescribeHandler DESCRIBE_HANDLER = GenericSubsystemDescribeHandler.create(LoggingChildResourceComparator.INSTANCE);
 
-    private static final int MANAGEMENT_API_MAJOR_VERSION = 7;
+    private static final int MANAGEMENT_API_MAJOR_VERSION = 8;
     private static final int MANAGEMENT_API_MINOR_VERSION = 0;
     private static final int MANAGEMENT_API_MICRO_VERSION = 0;
 
@@ -269,6 +269,7 @@ public void initializeParsers(final ExtensionParsingContext context) {
         setParser(context, Namespace.LOGGING_4_0, new LoggingSubsystemParser_4_0());
         setParser(context, Namespace.LOGGING_5_0, new LoggingSubsystemParser_5_0());
         setParser(context, Namespace.LOGGING_6_0, new LoggingSubsystemParser_6_0());
+        setParser(context, Namespace.LOGGING_7_0, new LoggingSubsystemParser_7_0());
 
         // Hack to ensure the Element and Attribute enums are loaded during this call which
         // is part of concurrent boot. These enums trigger a lot of classloading and static

diff --git a/logging/src/main/java/org/jboss/as/logging/LoggingSubsystemParser_7_0.java b/logging/src/main/java/org/jboss/as/logging/LoggingSubsystemParser_7_0.java
@@ -0,0 +1,28 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ *
+ * Copyright 2019 Red Hat, Inc., and individual contributors
+ * as indicated by the @author tags.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jboss.as.logging;
+
+/**
+ * Subsystem parser for 6.0 of the logging subsystem.
+ *
+ * @author <a href="mailto:jperkins@redhat.com">James R. Perkins</a>
+ */
+class LoggingSubsystemParser_7_0 extends LoggingSubsystemParser_6_0 {
+}
diff --git a/logging/src/main/java/org/jboss/as/logging/Namespace.java b/logging/src/main/java/org/jboss/as/logging/Namespace.java
@@ -56,12 +56,14 @@
     LOGGING_5_0("urn:jboss:domain:logging:5.0"),
 
     LOGGING_6_0("urn:jboss:domain:logging:6.0"),
+
+    LOGGING_7_0("urn:jboss:domain:logging:7.0"),
     ;
 
     /**
      * The current namespace version.
      */
-    public static final Namespace CURRENT = LOGGING_6_0;
+    public static final Namespace CURRENT = LOGGING_7_0;
 
     private final String name;
 

diff --git a/logging/src/main/resources/schema/jboss-as-logging_7_0.xsd b/logging/src/main/resources/schema/jboss-as-logging_7_0.xsd
diff --git a/logging/src/main/resources/subsystem-templates/logging.xml b/logging/src/main/resources/subsystem-templates/logging.xml
@@ -2,7 +2,7 @@
 <!--  See src/resources/configuration/ReadMe.txt for how the configuration assembly works -->
 <config default-supplement="default">
    <extension-module>org.jboss.as.logging</extension-module>
-   <subsystem xmlns="urn:jboss:domain:logging:6.0">
+   <subsystem xmlns="urn:jboss:domain:logging:7.0">
        <?HANDLERS?>
        <periodic-rotating-file-handler name="FILE" autoflush="true">
            <formatter>

diff --git a/logging/src/test/java/org/jboss/as/logging/LoggingSubsystemTestCase.java b/logging/src/test/java/org/jboss/as/logging/LoggingSubsystemTestCase.java
@@ -71,7 +71,7 @@ protected String getSubsystemXml() throws IOException {
 
     @Override
     protected String getSubsystemXsdPath() throws Exception {
-        return "schema/jboss-as-logging_6_0.xsd";
+        return "schema/jboss-as-logging_7_0.xsd";
     }
 
     @Test

diff --git a/logging/src/test/resources/default-subsystem.xml b/logging/src/test/resources/default-subsystem.xml
@@ -20,7 +20,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<subsystem xmlns="urn:jboss:domain:logging:6.0">
+<subsystem xmlns="urn:jboss:domain:logging:7.0">
     <console-handler name="CONSOLE">
         <level name="INFO"/>
         <formatter>

diff --git a/logging/src/test/resources/empty-subsystem.xml b/logging/src/test/resources/empty-subsystem.xml
@@ -20,7 +20,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<subsystem xmlns="urn:jboss:domain:logging:6.0">
+<subsystem xmlns="urn:jboss:domain:logging:7.0">
 
     <!-- Set-up a default logging profile -->
     <logging-profiles>

diff --git a/logging/src/test/resources/expressions.xml b/logging/src/test/resources/expressions.xml
@@ -20,7 +20,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<subsystem xmlns="urn:jboss:domain:logging:6.0">
+<subsystem xmlns="urn:jboss:domain:logging:7.0">
     <add-logging-api-dependencies value="${test.add.deps:true}"/>
     <use-deployment-logging-config value="${test.use.dep.config:true}"/>
 

diff --git a/logging/src/test/resources/expressions_6_0.xml b/logging/src/test/resources/expressions_6_0.xml
@@ -0,0 +1,249 @@
+<!--
+  ~ JBoss, Home of Professional Open Source.
+  ~ Copyright 2013, Red Hat, Inc., and individual contributors
+  ~ as indicated by the @author tags. See the copyright.txt file in the
+  ~ distribution for a full listing of individual contributors.
+  ~
+  ~ This is free software; you can redistribute it and/or modify it
+  ~ under the terms of the GNU Lesser General Public License as
+  ~ published by the Free Software Foundation; either version 2.1 of
+  ~ the License, or (at your option) any later version.
+  ~
+  ~ This software is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  ~ Lesser General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU Lesser General Public
+  ~ License along with this software; if not, write to the Free
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+  -->
+
+<subsystem xmlns="urn:jboss:domain:logging:6.0">
+    <add-logging-api-dependencies value="${test.add.deps:true}"/>
+    <use-deployment-logging-config value="${test.use.dep.config:true}"/>
+
+    <async-handler name="async">
+        <queue-length value="${test.queue.length:10}"/>
+        <overflow-action value="${test.overflow.action:block}"/>
+        <subhandlers>
+            <handler name="sizeLogger"/>
+        </subhandlers>
+    </async-handler>
+
+    <console-handler name="CONSOLE" autoflush="${test.autoflush:true}">
+        <level name="${test.console.level:INFO}"/>
+        <encoding value="${test.encoding:UTF-8}"/>
+        <filter-spec value="${test.console.filter:levelRange(TRACE,WARN)}" />
+        <formatter>
+            <pattern-formatter pattern="${test.console.pattern:%K{level}%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%e%n}"/>
+        </formatter>
+        <target name="${test.console.target:System.out}"/>
+    </console-handler>
+
+    <file-handler name="anotherFile" enabled="${test.file.enabled:false}" autoflush="${test.autoflush:true}">
+        <level name="${test.file.level:INFO}"/>
+        <encoding value="${test.encoding:UTF-8}"/>
+        <formatter>
+            <named-formatter name="PATTERN"/>
+        </formatter>
+        <file relative-to="jboss.server.log.dir" path="${test.another.filter:another.log}"/>
+        <append value="${test.file.append:true}"/>
+    </file-handler>
+
+    <periodic-rotating-file-handler name="FILE" autoflush="${test.autoflush:true}">
+        <level name="${test.file.level:INFO}"/>
+        <encoding value="${test.encoding:UTF-8}"/>
+        <filter-spec value="${test.file.filter:any(levels(INFO),not(levels(TRACE)))}"/>
+        <formatter>
+            <pattern-formatter pattern="${test.console.pattern:%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%e%n}"/>
+        </formatter>
+        <file relative-to="jboss.server.log.dir" path="${test.server.log.file:server.log}"/>
+        <suffix value="${test.file.suffix:.yyyy-MM-dd}"/>
+    </periodic-rotating-file-handler>
+
+    <periodic-size-rotating-file-handler name="psHandler" autoflush="${test.autoflush:true}" rotate-on-boot="${test.rotate-on-boot:false}">
+        <level name="${test.file.level:INFO}"/>
+        <encoding value="${test.encoding:UTF-8}"/>
+        <formatter>
+            <pattern-formatter pattern="${test.file.pattern:%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%e%n}"/>
+        </formatter>
+        <file relative-to="jboss.server.log.dir" path="${test.periodic.size.log.file:ps.log}"/>
+        <rotate-size value="${test.rotate.size:64m}"/>
+        <max-backup-index value="${test.max.backup.index:1024}"/>
+        <suffix value="${test.file.suffix:.yyyy-MM-dd}"/>
+        <append value="${test.file.append:false}"/>
+    </periodic-size-rotating-file-handler>
+
+    <size-rotating-file-handler name="sizeLogger" autoflush="${test.autoflush:true}" rotate-on-boot="${test.rotate-on-boot:false}">
+        <level name="${test.file.level:INFO}"/>
+        <encoding value="${test.encoding:UTF-8}"/>
+        <formatter>
+            <pattern-formatter pattern="${test.console.pattern:%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%e%n}"/>
+        </formatter>
+        <file relative-to="jboss.server.log.dir" path="${test.size.log.file:sizeLogger.log}"/>
+        <rotate-size value="${test.rotate.size:64m}"/>
+        <max-backup-index value="${test.max.backup.index:1024}"/>
+        <append value="${test.file.append:false}"/>
+        <suffix value="${test.file.suffix:.yyyy-MM-dd'T'HH:mm:ssZ}"/>
+    </size-rotating-file-handler>
+
+    <socket-handler name="socket-handler" autoflush="${test.autoflush:true}" block-on-reconnect="${test.reconnect:true}"
+                    enabled="${test.enableddd:true}" outbound-socket-binding-ref="${test.socket-binding:true}">
+        <encoding value="${test.encoding:UTF-8}"/>
+        <filter-spec value="${test.pattern:match(&quot;.*&quot;)}"/>
+        <level name="${test.file.level:INFO}"/>
+        <named-formatter name="PATTERN"/>
+        <protocol value="${test.protocol:UDP}"/>
+    </socket-handler>
+
+    <syslog-handler name="syslog" enabled="${test.syslog.enabled:false}">
+        <level name="${test.default.level:INFO}"/>
+        <server-address value="${test.syslog.server-address:127.0.0.1}"/>
+        <hostname value="${test.syslog.hostname:jboss.org}"/>
+        <port value="${test.syslog.port:514}"/>
+        <app-name value="${test.syslog.appname:jboss-as7}"/>
+        <formatter>
+            <syslog-format syslog-type="${test.syslog.format:RFC5424}"/>
+        </formatter>
+        <facility value="${test.syslog.facility:user-level}"/>
+    </syslog-handler>
+
+    <logger category="com.example" use-parent-handlers="${test.logger.use.parent.handlers:false}">
+        <level name="${test.logger.level:INFO}"/>
+        <filter-spec value="${test.logger.filter:levelRange[TRACE,WARN)}"/>
+        <handlers>
+            <handler name="sizeLogger"/>
+            <handler name="CONSOLE"/>
+        </handlers>
+    </logger>
+
+    <root-logger>
+        <level name="${test.root.level:INFO}"/>
+        <handlers>
+            <handler name="CONSOLE"/>
+            <handler name="FILE"/>
+        </handlers>
+    </root-logger>
+
+    <formatter name="PATTERN">
+        <pattern-formatter pattern="${test.console.pattern:%K{level}%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%e%n}" color-map="${test.console.color:info:cyan,warn:yellow,error:red}"/>
+    </formatter>
+
+    <formatter name="JSON">
+        <json-formatter date-format="${test.date.format:yyyy-MM-dd'T'HH:mm:ssSSS}"
+                pretty-print="${test.pretty.print:false}" print-details="${test.print.details:false}"
+                zone-id="${test.date.format.zoneId:GMT}">
+            <exception-output-type value="${test.exception.output.type:detailed}"/>
+            <record-delimiter value="${test.record.delimiter:\n}"/>
+            <key-overrides exception-caused-by="${test.cause.key:caused-by}" record="${test.record.key:record"/>
+            <meta-data>
+                <property name="test" value="value"/>
+            </meta-data>
+        </json-formatter>
+    </formatter>
+
+    <formatter name="XML">
+        <xml-formatter date-format="${test.date.format:yyyy-MM-dd'T'HH:mm:ssSSS}"
+                        pretty-print="${test.pretty.print:false}" print-details="${test.print.details:false}"
+                        zone-id="${test.date.format.zoneId:GMT}"
+                        print-namespace="${test.print.namespace:true}"
+                        namespace-uri="${test.namespace.uri}">
+            <exception-output-type value="${test.exception.output.type:detailed}"/>
+            <record-delimiter value="${test.record.delimiter:\n}"/>
+            <key-overrides exception-caused-by="${test.cause.key:caused-by}" record="${test.record.key:record"/>
+            <meta-data>
+                <property name="test-xml" value="value-xml"/>
+            </meta-data>
+        </xml-formatter>
+    </formatter>
+
+    <logging-profiles>
+        <logging-profile name="test-profile">
+
+            <console-handler name="CONSOLE" autoflush="${test.autoflush:true}">
+                <level name="${test.console.level:INFO}"/>
+                <encoding value="${test.encoding:UTF-8}"/>
+                <filter-spec value="${test.console.filter:levelRange(TRACE,WARN)}" />
+                <formatter>
+                    <pattern-formatter pattern="${test.console.pattern:%K{level}%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%e%n}"/>
+                </formatter>
+                <target name="${test.console.target:System.out}"/>
+            </console-handler>
+
+            <file-handler name="anotherFile" enabled="${test.file.enabled:false}" autoflush="${test.autoflush:true}">
+                <level name="${test.file.level:INFO}"/>
+                <encoding value="${test.encoding:UTF-8}"/>
+                <formatter>
+                    <named-formatter name="PATTERN"/>
+                </formatter>
+                <file relative-to="jboss.server.log.dir" path="${test.another.filter:anotherProfile.log}"/>
+                <append value="${test.file.append:true}"/>
+            </file-handler>
+
+            <periodic-size-rotating-file-handler name="psHandler" autoflush="${test.autoflush:true}" rotate-on-boot="${test.rotate-on-boot:false}">
+                <level name="${test.file.level:INFO}"/>
+                <encoding value="${test.encoding:UTF-8}"/>
+                <formatter>
+                    <pattern-formatter pattern="${test.file.pattern:%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%e%n}"/>
+                </formatter>
+                <file relative-to="jboss.server.log.dir" path="${test.periodic.size.log.file:ps.log}"/>
+                <rotate-size value="${test.rotate.size:64m}"/>
+                <max-backup-index value="${test.max.backup.index:1024}"/>
+                <suffix value="${test.file.suffix:.yyyy-MM-dd}"/>
+                <append value="${test.file.append:false}"/>
+            </periodic-size-rotating-file-handler>
+
+            <size-rotating-file-handler name="sizeLogger" autoflush="${test.autoflush:true}" rotate-on-boot="${test.rotate-on-boot:false}">
+                <level name="${test.file.level:INFO}"/>
+                <encoding value="${test.encoding:UTF-8}"/>
+                <formatter>
+                    <pattern-formatter pattern="${test.console.pattern:%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%e%n}"/>
+                </formatter>
+                <file relative-to="jboss.server.log.dir" path="${test.size.log.file:sizeLogger.log}"/>
+                <rotate-size value="${test.rotate.size:64m}"/>
+                <max-backup-index value="${test.max.backup.index:1024}"/>
+                <append value="${test.file.append:false}"/>
+                <suffix value="${test.file.suffix:.yyyy-MM-dd'T'HH:mm:ssZ}"/>
+            </size-rotating-file-handler>
+
+            <socket-handler name="socket-handler" autoflush="${test.autoflush:true}" block-on-reconnect="${test.reconnect:true}"
+                            enabled="${test.enableddd:true}" outbound-socket-binding-ref="${test.socket-binding:true}">
+                <encoding value="${test.encoding:UTF-8}"/>
+                <filter-spec value="${test.pattern:match(&quot;.*&quot;)}"/>
+                <level name="${test.file.level:INFO}"/>
+                <named-formatter name="PATTERN"/>
+                <protocol value="${test.protocol:UDP}"/>
+            </socket-handler>
+
+            <syslog-handler name="syslog" enabled="${test.syslog.enabled:false}">
+                <level name="${test.default.level:INFO}"/>
+                <server-address value="${test.syslog.server-address:127.0.0.1}"/>
+                <hostname value="${test.syslog.hostname:jboss.org}"/>
+                <port value="${test.syslog.port:514}"/>
+                <app-name value="${test.syslog.appname:jboss-as7}"/>
+                <formatter>
+                    <syslog-format syslog-type="${test.syslog.format:RFC5424}"/>
+                </formatter>
+                <facility value="${test.syslog.facility:user-level}"/>
+            </syslog-handler>
+
+            <logger category="com.example" use-parent-handlers="${test.logger.use.parent.handlers:false}">
+                <level name="${test.logger.level:INFO}"/>
+                <filter-spec value="${test.logger.filter:levelRange[TRACE,WARN)}"/>
+            </logger>
+
+            <root-logger>
+                <level name="${test.root.level:INFO}"/>
+                <handlers>
+                    <handler name="CONSOLE"/>
+                </handlers>
+            </root-logger>
+
+            <formatter name="PATTERN">
+                <pattern-formatter pattern="${test.console.pattern:%K{level}%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%e%n}" color-map="${test.console.color:info:cyan,warn:yellow,error:red}"/>
+            </formatter>
+        </logging-profile>
+    </logging-profiles>
+</subsystem>
diff --git a/logging/src/test/resources/logging.xml b/logging/src/test/resources/logging.xml
@@ -20,7 +20,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<subsystem xmlns="urn:jboss:domain:logging:6.0">
+<subsystem xmlns="urn:jboss:domain:logging:7.0">
     <add-logging-api-dependencies value="false"/>
     <use-deployment-logging-config value="false"/>