Merge branch 'update-slf4j' into update-jdk-11

Author: maximthomas

openam-slf4j/pom.xml

@@ -44,5 +44,10 @@
             <groupId>org.openidentityplatform.opendj</groupId>
             <artifactId>opendj-server-legacy</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.testng</groupId>
+            <artifactId>testng</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 </project>

openam-slf4j/src/main/java/org/forgerock/openam/slf4j/OpenAMServiceProvider.java

@@ -0,0 +1,67 @@
+/*
+ * The contents of this file are subject to the terms of the Common Development and
+ * Distribution License (the License). You may not use this file except in compliance with the
+ * License.
+ *
+ * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the
+ * specific language governing permission and limitations under the License.
+ *
+ * When distributing Covered Software, include this CDDL Header Notice in each file and include
+ * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL
+ * Header, with the fields enclosed by brackets [] replaced by your own identifying
+ * information: "Portions Copyrighted [year] [name of copyright owner]".
+ *
+ * Copyright 2025 3A SystemS LLC
+ */
+
+package org.forgerock.openam.slf4j;
+
+import org.slf4j.ILoggerFactory;
+import org.slf4j.IMarkerFactory;
+import org.slf4j.helpers.BasicMarkerFactory;
+import org.slf4j.helpers.NOPMDCAdapter;
+import org.slf4j.spi.MDCAdapter;
+import org.slf4j.spi.SLF4JServiceProvider;
+
+public class OpenAMServiceProvider implements SLF4JServiceProvider {
+    public static String REQUESTED_API_VERSION = "2.0.99"; // !final
+
+    // LoggerFactory expects providers to initialize markerFactory as early as possible.
+    private final IMarkerFactory markerFactory;
+    // LoggerFactory expects providers to initialize their MDCAdapter field
+    // as early as possible, preferably at construction time.
+    private final MDCAdapter mdcAdapter;
+
+    private ILoggerFactory loggerFactory;
+
+    public OpenAMServiceProvider() {
+        markerFactory = new BasicMarkerFactory();
+        mdcAdapter = new NOPMDCAdapter();
+    }
+
+    @Override
+    public ILoggerFactory getLoggerFactory() {
+        return loggerFactory;
+    }
+
+    @Override
+    public IMarkerFactory getMarkerFactory() {
+        return markerFactory;
+    }
+
+    @Override
+    public MDCAdapter getMDCAdapter() {
+        return mdcAdapter;
+    }
+
+    @Override
+    public String getRequestedApiVersion() {
+        return REQUESTED_API_VERSION;
+    }
+
+    @Override
+    public void initialize() {
+        loggerFactory = new AMLoggerFactory();
+    }
+}
+

openam-slf4j/src/main/java/org/slf4j/impl/StaticLoggerBinder.java

@@ -12,6 +12,7 @@
  * information: "Portions Copyrighted [year] [name of copyright owner]".
  *
  * Copyright 2014 ForgeRock AS. All rights reserved.
+ * Portions Copyrighted 2025 3A Systems LLC
  */
 
 package org.slf4j.impl;
@@ -24,6 +25,11 @@
 included as we don't want to update the code when we move to a newer version of slf4j. Not having the version string
 means that we might skew with slf4j-api updates. See http://slf4j.org/faq.html, version check mechanism section.
  */
+
+/**
+ * @deprecated use {@link org.forgerock.openam.slf4j.OpenAMServiceProvider}
+ */
+@Deprecated
 public class StaticLoggerBinder implements LoggerFactoryBinder {
     private static final StaticLoggerBinder SINGLETON = new StaticLoggerBinder();
     public static final StaticLoggerBinder getSingleton() {

openam-slf4j/src/main/resources/META-INF/services/org.slf4j.spi.SLF4JServiceProvider

@@ -0,0 +1 @@
+org.forgerock.openam.slf4j.OpenAMServiceProvider

openam-slf4j/src/test/java/org/forgerock/openam/slf4j/TestLogger.java

@@ -0,0 +1,17 @@
+package org.forgerock.openam.slf4j;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.testng.annotations.Test;
+
+public class TestLogger {
+
+    @Test
+    public void testLogger() {
+        Logger logger = LoggerFactory.getLogger(TestLogger.class);
+        logger.info("test");
+        logger.warn("test2");
+        logger.error("test3", new Exception("test exception"));
+    }
+
+}

openam-slf4j/src/test/resources/debugconfig.properties

@@ -0,0 +1,18 @@
+#
+# The contents of this file are subject to the terms of the Common Development and
+# Distribution License (the License). You may not use this file except in compliance with the
+# License.
+#
+# You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the
+# specific language governing permission and limitations under the License.
+#
+# When distributing Covered Software, include this CDDL Header Notice in each file and include
+# the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL
+# Header, with the fields enclosed by brackets [] replaced by your own identifying
+# information: "Portions copyright [year] [name of copyright owner]".
+#
+# Copyright 2015 ForgeRock AS.
+#
+org.forgerock.openam.debug.prefix=
+org.forgerock.openam.debug.suffix=-MM.dd.yyyy-HH.mm
+org.forgerock.openam.debug.rotation=

openam-slf4j/src/test/resources/debugfiles.properties

@@ -0,0 +1,20 @@
+#
+# The contents of this file are subject to the terms of the Common Development and
+# Distribution License (the License). You may not use this file except in compliance with the
+# License.
+#
+# You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the
+# specific language governing permission and limitations under the License.
+#
+# When distributing Covered Software, include this CDDL Header Notice in each file and include
+# the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL
+# Header, with the fields enclosed by brackets [] replaced by your own identifying
+# information: "Portions copyright [year] [name of copyright owner]".
+#
+# Copyright 2015-2016 ForgeRock AS.
+#
+debugTest1MergeToDebugMerge=debugMerge
+debugTest2MergeToDebugMerge=debugMerge
+debugTest3MergeToDebugMerge=debugMerge
+
+org.forgerock.test.*=wildcardTest