** Initial commit of adding new log manager.

Signed-off-by: James R. Perkins <[email protected]>

core-feature-pack/common/pom.xml

@@ -761,6 +761,11 @@
             </exclusions>
         </dependency>
 
+        <dependency>
+            <groupId>org.wildfly.core</groupId>
+            <artifactId>wildfly-logmanager</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.wildfly.core</groupId>
             <artifactId>wildfly-management-client-content</artifactId>

core-feature-pack/common/src/main/resources/modules/system/layers/base/org/jboss/as/logging/main/module.xml

@@ -50,6 +50,7 @@
         <module name="org.jboss.modules"/>
         <module name="org.jboss.stdio"/>
         <module name="org.jboss.vfs"/>
+        <module name="org.wildfly.core.logmanager" services="import"/>
         <module name="org.wildfly.common"/>
     </dependencies>
 </module>

core-feature-pack/common/src/main/resources/modules/system/layers/base/org/jboss/as/standalone/main/module.xml

@@ -41,6 +41,7 @@
         <module name="org.jboss.as.jmx" services="import"/>
         <module name="org.jboss.as.server" export="true"/>
         <module name="org.jboss.vfs" services="import"/>
+        <module name="org.wildfly.core.logmanager" services="import"/>
         <module name="org.wildfly.security.elytron-private" services="import"/>
     </dependencies>
 </module>

core-feature-pack/common/src/main/resources/modules/system/layers/base/org/jboss/logmanager/main/module.xml

@@ -32,7 +32,7 @@
         <module name="java.desktop"/>
         <module name="java.logging"/>
         <module name="java.xml"/>
-        <module name="internal.javax.json.api.ee8"/>
+        <module name="jakarta.json.api"/>
         <module name="io.smallrye.common.constraint"/>
         <module name="io.smallrye.common.cpu"/>
         <module name="io.smallrye.common.expression"/>

core-feature-pack/common/src/main/resources/modules/system/layers/base/org/wildfly/core/logmanager/main/module.xml

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  ~ JBoss, Home of Professional Open Source.
+  ~
+  ~ Copyright 2023 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.
+  -->
+
+<module xmlns="urn:jboss:module:1.9" name="org.wildfly.core.logmanager">
+    <properties>
+        <property name="jboss.api" value="private"/>
+    </properties>
+
+    <resources>
+        <artifact name="${org.wildfly.core:wildfly-logmanager}"/>
+    </resources>
+
+    <dependencies>
+        <module name="java.logging"/>
+        <module name="org.jboss.logging"/>
+        <module name="org.jboss.logmanager"/>
+        <module name="org.jboss.modules"/>
+    </dependencies>
+</module>

core-feature-pack/common/src/main/resources/modules/system/layers/base/org/wildfly/embedded/main/module.xml

@@ -39,6 +39,7 @@
 
     <dependencies>
         <module name="java.desktop"/>
+        <module name="java.logging"/>
         <module name="org.wildfly.security.elytron-private"/>
         <module name="org.wildfly.common"/>
         <module name="org.jboss.as.server"/>
@@ -49,5 +50,6 @@
         <module name="org.jboss.modules"/>
         <module name="org.jboss.stdio"/>
         <module name="org.jboss.threads"/>
+        <module name="org.wildfly.core.logmanager" services="import"/>
     </dependencies>
 </module>

logging/pom.xml

@@ -240,6 +240,12 @@
         </dependency>
 
         <!-- Test dependencies -->
+        <!-- Required by the log manager for JSON logging -->
+        <dependency>
+            <groupId>org.eclipse.parsson</groupId>
+            <artifactId>parsson</artifactId>
+            <scope>test</scope>
+        </dependency>
 
         <!-- Would be brought in transitively by wildfly-controller normally. Required for ParseUtils -->
         <dependency>
@@ -248,6 +254,11 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.wildfly.core</groupId>
+            <artifactId>wildfly-logmanager</artifactId>
+        </dependency>
+
         <!-- JSONP API and IMPL -->
         <dependency>
             <groupId>org.glassfish</groupId>

logging/src/main/java/org/jboss/as/logging/Logging.java

@@ -28,6 +28,8 @@
 import org.jboss.as.controller.OperationFailedException;
 import org.jboss.as.controller.registry.AttributeAccess.Flag;
 import org.jboss.dmr.ModelNode;
+import org.jboss.logmanager.LogContext;
+import org.wildfly.core.logmanager.WildFlyLogContextSelector;
 
 /**
  * A set of utilities for the logging subsystem.
@@ -40,6 +42,14 @@ public final class Logging {
     private Logging() {
     }
 
+    // TODO (jrp) we should handle this better
+    public static LogContext getLogContext(final String profileName) {
+        if (profileName != null) {
+            return WildFlyLogContextSelector.getContextSelector().getOrCreateProfile(profileName);
+        }
+        return WildFlyLogContextSelector.getContextSelector().getLogContext();
+    }
+
     /**
      * Checks to see within the flags if a restart of any kind is required.
      *

logging/src/main/java/org/jboss/as/logging/LoggingExtension.java

@@ -75,7 +75,7 @@
 import org.jboss.as.logging.loggers.LoggerResourceDefinition;
 import org.jboss.as.logging.loggers.RootLoggerResourceDefinition;
 import org.jboss.as.logging.logging.LoggingLogger;
-import org.jboss.as.logging.logmanager.WildFlyLogContextSelector;
+import org.wildfly.core.logmanager.WildFlyLogContextSelector;
 import org.jboss.as.logging.stdio.LogContextStdioContextSelector;
 import org.jboss.dmr.ModelNode;
 import org.jboss.logmanager.LogContext;
@@ -163,9 +163,9 @@ public void initialize(final ExtensionContext context) {
         if (embedded) {
             // Use the standard WildFlyLogContextSelector if we should wrap the current log context
             if (getBooleanProperty(EMBEDDED_PROPERTY, true)) {
-                contextSelector = WildFlyLogContextSelector.Factory.createEmbedded();
+                contextSelector = WildFlyLogContextSelector.getEmbeddedContextSelector();
             } else {
-                contextSelector = WildFlyLogContextSelector.Factory.create();
+                contextSelector = WildFlyLogContextSelector.getContextSelector();
             }
         } else {
 
@@ -186,7 +186,7 @@ public void initialize(final ExtensionContext context) {
                     throw LoggingLogger.ROOT_LOGGER.extensionNotInitialized();
                 }
             }
-            contextSelector = WildFlyLogContextSelector.Factory.create();
+            contextSelector = WildFlyLogContextSelector.getContextSelector();
 
             // Install STDIO context selector
             StdioContext.setStdioContextSelector(new LogContextStdioContextSelector(StdioContext.getStdioContext()));

logging/src/main/java/org/jboss/as/logging/LoggingOperations.java

@@ -92,7 +92,7 @@ private static ConfigurationPersistence getOrCreateConfigurationPersistence(fina
         final PathAddress address = context.getCurrentAddress();
         final ConfigurationPersistence configurationPersistence;
         if (LoggingProfileOperations.isLoggingProfileAddress(address)) {
-            final LogContext logContext = LoggingProfileContextSelector.getInstance().getOrCreate(LoggingProfileOperations.getLoggingProfileName(address));
+            final LogContext logContext = Logging.getLogContext(LoggingProfileOperations.getLoggingProfileName(address));
             configurationPersistence = ConfigurationPersistence.getOrCreateConfigurationPersistence(logContext);
         } else {
             configurationPersistence = ConfigurationPersistence.getOrCreateConfigurationPersistence();
@@ -104,7 +104,7 @@ private static ConfigurationPersistence getConfigurationPersistence(final Operat
         final PathAddress address = context.getCurrentAddress();
         final LogContext logContext;
         if (LoggingProfileOperations.isLoggingProfileAddress(address)) {
-            logContext = LoggingProfileContextSelector.getInstance().get(LoggingProfileOperations.getLoggingProfileName(address));
+            logContext = Logging.getLogContext(LoggingProfileOperations.getLoggingProfileName(address));
         } else {
             logContext = LogContext.getLogContext();
         }

logging/src/main/java/org/jboss/as/logging/LoggingProfileOperations.java

@@ -38,6 +38,7 @@
 import org.jboss.dmr.ModelNode;
 import org.jboss.logmanager.LogContext;
 import org.jboss.logmanager.config.LogContextConfiguration;
+import org.wildfly.core.logmanager.WildFlyLogContextSelector;
 
 /**
  * @author <a href="mailto:[email protected]">James R. Perkins</a>
@@ -76,8 +77,8 @@ protected void performRuntime(final OperationContext context, final ModelNode op
             final PathAddress address = PathAddress.pathAddress(operation.get(ModelDescriptionConstants.OP_ADDR));
             // Get the logging profile
             final String loggingProfile = getLoggingProfileName(address);
-            final LoggingProfileContextSelector contextSelector = LoggingProfileContextSelector.getInstance();
-            final LogContext logContext = contextSelector.get(loggingProfile);
+            final WildFlyLogContextSelector contextSelector = WildFlyLogContextSelector.getContextSelector();
+            final LogContext logContext = contextSelector.getProfileContext(loggingProfile);
             if (logContext != null) {
                 context.addStep(new OperationStepHandler() {
                     @Override
@@ -113,7 +114,7 @@ public void execute(final OperationContext context, final ModelNode operation) {
                             @Override
                             public void handleResult(final ResultAction resultAction, final OperationContext context, final ModelNode operation) {
                                 if (resultAction == ResultAction.KEEP) {
-                                    contextSelector.remove(loggingProfile);
+                                    contextSelector.removeProfileContext(loggingProfile);
                                 } else if (configuration != null) {
                                     context.revertReloadRequired();
                                 }

logging/src/main/java/org/jboss/as/logging/LoggingResourceDefinition.java

@@ -65,7 +65,7 @@
 import org.jboss.as.controller.transform.description.RejectAttributeChecker;
 import org.jboss.as.controller.transform.description.ResourceTransformationDescriptionBuilder;
 import org.jboss.as.logging.logging.LoggingLogger;
-import org.jboss.as.logging.logmanager.WildFlyLogContextSelector;
+import org.wildfly.core.logmanager.WildFlyLogContextSelector;
 import org.jboss.as.server.ServerEnvironment;
 import org.jboss.dmr.ModelNode;
 import org.jboss.dmr.ModelType;

logging/src/main/java/org/jboss/as/logging/LoggingSubsystemAdd.java

@@ -56,7 +56,7 @@
 import org.jboss.as.logging.loggers.RootLoggerResourceDefinition;
 import org.jboss.as.logging.logging.LoggingLogger;
 import org.jboss.as.logging.logmanager.ConfigurationPersistence;
-import org.jboss.as.logging.logmanager.WildFlyLogContextSelector;
+import org.wildfly.core.logmanager.WildFlyLogContextSelector;
 import org.jboss.as.server.AbstractDeploymentChainStep;
 import org.jboss.as.server.DeploymentProcessorTarget;
 import org.jboss.as.server.deployment.Phase;

logging/src/main/java/org/jboss/as/logging/deployments/AbstractLoggingDeploymentProcessor.java

@@ -29,7 +29,7 @@
 import java.util.List;
 
 import org.jboss.as.logging.logging.LoggingLogger;
-import org.jboss.as.logging.logmanager.WildFlyLogContextSelector;
+import org.wildfly.core.logmanager.WildFlyLogContextSelector;
 import org.jboss.as.server.deployment.AttachmentKey;
 import org.jboss.as.server.deployment.Attachments;
 import org.jboss.as.server.deployment.DeploymentPhaseContext;

logging/src/main/java/org/jboss/as/logging/deployments/LoggingConfigDeploymentProcessor.java

@@ -34,15 +34,15 @@
 import java.util.Set;
 
 import org.jboss.as.logging.logging.LoggingLogger;
-import org.jboss.as.logging.logmanager.WildFlyLogContextSelector;
+import org.wildfly.core.logmanager.WildFlyLogContextSelector;
 import org.jboss.as.server.deployment.Attachments;
 import org.jboss.as.server.deployment.DeploymentPhaseContext;
 import org.jboss.as.server.deployment.DeploymentUnit;
 import org.jboss.as.server.deployment.DeploymentUnitProcessingException;
 import org.jboss.as.server.deployment.DeploymentUnitProcessor;
 import org.jboss.as.server.deployment.module.ResourceRoot;
 import org.jboss.logmanager.LogContext;
-import org.jboss.logmanager.PropertyConfigurator;
+import org.jboss.logmanager.config.LogContextConfiguration;
 import org.jboss.modules.Module;
 import org.jboss.vfs.VirtualFile;
 import org.jboss.vfs.VirtualFileFilter;
@@ -217,9 +217,7 @@ private LoggingConfigurationService configure(final ResourceRoot root, final Vir
                 final ClassLoader current = WildFlySecurityManager.getCurrentContextClassLoaderPrivileged();
                 try {
                     WildFlySecurityManager.setCurrentContextClassLoaderPrivileged(classLoader);
-                    final PropertyConfigurator propertyConfigurator = new PropertyConfigurator(logContext);
-                    propertyConfigurator.configure(properties);
-                    return new LoggingConfigurationService(propertyConfigurator.getLogContextConfiguration(), resolveRelativePath(root, configFile));
+                    return new LoggingConfigurationService(LogContextConfiguration.create(logContext, properties), resolveRelativePath(root, configFile));
                 } finally {
                     WildFlySecurityManager.setCurrentContextClassLoaderPrivileged(current);
                 }