From c5205ff3fe5b11434f73f3763d0cbdf8ac430c5d Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Wed, 14 Dec 2022 21:20:59 +0100 Subject: [PATCH] [Project] Updated to slf4j 2.x and logback 1.4.x --- .../src/main/resources/archetype-resources/pom.xml | 4 ++-- .../src/main/java/plc/web/web/StartupListener.java | 10 ++-------- .../src/main/java/server/web/web/StartupListener.java | 10 ++-------- .../src/main/resources/archetype-resources/pom.xml | 4 ++-- .../src/main/resources/archetype-resources/pom.xml | 4 ++-- .../src/main/java/web/StartupListener.java | 10 ++-------- 6 files changed, 12 insertions(+), 30 deletions(-) diff --git a/strolch.mvn.archetype.main/src/main/resources/archetype-resources/pom.xml b/strolch.mvn.archetype.main/src/main/resources/archetype-resources/pom.xml index 5f8d298..915fd7f 100644 --- a/strolch.mvn.archetype.main/src/main/resources/archetype-resources/pom.xml +++ b/strolch.mvn.archetype.main/src/main/resources/archetype-resources/pom.xml @@ -27,8 +27,8 @@ ${jdk.version} - 1.7.30 - 1.2.9 + 2.0.5 + 1.4.5 2.8.9 1.8.5 diff --git a/strolch.mvn.archetype.plc/src/main/resources/archetype-resources/__rootArtifactId__-plc-web/src/main/java/plc/web/web/StartupListener.java b/strolch.mvn.archetype.plc/src/main/resources/archetype-resources/__rootArtifactId__-plc-web/src/main/java/plc/web/web/StartupListener.java index fae927b..eb16526 100644 --- a/strolch.mvn.archetype.plc/src/main/resources/archetype-resources/__rootArtifactId__-plc-web/src/main/java/plc/web/web/StartupListener.java +++ b/strolch.mvn.archetype.plc/src/main/resources/archetype-resources/__rootArtifactId__-plc-web/src/main/java/plc/web/web/StartupListener.java @@ -8,8 +8,7 @@ import javax.servlet.annotation.WebListener; import java.io.File; import java.io.InputStream; -import ch.qos.logback.classic.LoggerContext; -import ch.qos.logback.classic.util.ContextInitializer; +import li.strolch.agent.api.LoggingLoader; import li.strolch.agent.api.StrolchAgent; import li.strolch.agent.api.StrolchBootstrapper; import li.strolch.exception.StrolchException; @@ -86,12 +85,7 @@ public class StartupListener implements ServletContextListener { @Override public void contextDestroyed(ServletContextEvent sce) { - try { - new ContextInitializer((LoggerContext) StaticLoggerBinder.getSingleton().getLoggerFactory()).autoConfig(); - } catch (Exception e) { - System.err.println("Failed to reconfigure logging..."); - e.printStackTrace(System.err); - } + LoggingLoader.reloadLoggingConfiguration(); if (this.agent != null) { logger.info("Destroying " + APP_NAME + "..."); diff --git a/strolch.mvn.archetype.plc/src/main/resources/archetype-resources/__rootArtifactId__-web/src/main/java/server/web/web/StartupListener.java b/strolch.mvn.archetype.plc/src/main/resources/archetype-resources/__rootArtifactId__-web/src/main/java/server/web/web/StartupListener.java index a0d4e6e..b791028 100644 --- a/strolch.mvn.archetype.plc/src/main/resources/archetype-resources/__rootArtifactId__-web/src/main/java/server/web/web/StartupListener.java +++ b/strolch.mvn.archetype.plc/src/main/resources/archetype-resources/__rootArtifactId__-web/src/main/java/server/web/web/StartupListener.java @@ -5,8 +5,7 @@ import javax.servlet.ServletContextListener; import javax.servlet.annotation.WebListener; import java.io.InputStream; -import ch.qos.logback.classic.LoggerContext; -import ch.qos.logback.classic.util.ContextInitializer; +import li.strolch.agent.api.LoggingLoader; import li.strolch.agent.api.StrolchAgent; import li.strolch.agent.api.StrolchBootstrapper; import li.strolch.utils.helper.StringHelper; @@ -45,12 +44,7 @@ public class StartupListener implements ServletContextListener { @Override public void contextDestroyed(ServletContextEvent sce) { - try { - new ContextInitializer((LoggerContext) StaticLoggerBinder.getSingleton().getLoggerFactory()).autoConfig(); - } catch (Exception e) { - System.err.println("Failed to reconfigure logging..."); - e.printStackTrace(System.err); - } + LoggingLoader.reloadLoggingConfiguration(); if (this.agent != null) { logger.info("Destroying " + APP_NAME + "..."); diff --git a/strolch.mvn.archetype.plc/src/main/resources/archetype-resources/pom.xml b/strolch.mvn.archetype.plc/src/main/resources/archetype-resources/pom.xml index 2777b49..d8f3290 100644 --- a/strolch.mvn.archetype.plc/src/main/resources/archetype-resources/pom.xml +++ b/strolch.mvn.archetype.plc/src/main/resources/archetype-resources/pom.xml @@ -27,8 +27,8 @@ ${jdk.version} - 1.7.30 - 1.2.9 + 2.0.5 + 1.4.5 2.34 2.8.9 5.0.0 diff --git a/strolch.mvn.archetype.webapp/src/main/resources/archetype-resources/pom.xml b/strolch.mvn.archetype.webapp/src/main/resources/archetype-resources/pom.xml index 6c2bc0b..9b38756 100644 --- a/strolch.mvn.archetype.webapp/src/main/resources/archetype-resources/pom.xml +++ b/strolch.mvn.archetype.webapp/src/main/resources/archetype-resources/pom.xml @@ -28,8 +28,8 @@ ${jdk.version} - 1.7.30 - 1.2.9 + 2.0.5 + 1.4.5 2.34 2.8.9 5.0.0 diff --git a/strolch.mvn.archetype.webapp/src/main/resources/archetype-resources/src/main/java/web/StartupListener.java b/strolch.mvn.archetype.webapp/src/main/resources/archetype-resources/src/main/java/web/StartupListener.java index c4ed741..884947e 100644 --- a/strolch.mvn.archetype.webapp/src/main/resources/archetype-resources/src/main/java/web/StartupListener.java +++ b/strolch.mvn.archetype.webapp/src/main/resources/archetype-resources/src/main/java/web/StartupListener.java @@ -5,8 +5,7 @@ import javax.servlet.ServletContextListener; import javax.servlet.annotation.WebListener; import java.io.InputStream; -import ch.qos.logback.classic.LoggerContext; -import ch.qos.logback.classic.util.ContextInitializer; +import li.strolch.agent.api.LoggingLoader; import li.strolch.agent.api.StrolchAgent; import li.strolch.agent.api.StrolchBootstrapper; import li.strolch.utils.helper.StringHelper; @@ -45,12 +44,7 @@ public class StartupListener implements ServletContextListener { @Override public void contextDestroyed(ServletContextEvent sce) { - try { - new ContextInitializer((LoggerContext) StaticLoggerBinder.getSingleton().getLoggerFactory()).autoConfig(); - } catch (Exception e) { - System.err.println("Failed to reconfigure logging..."); - e.printStackTrace(System.err); - } + LoggingLoader.reloadLoggingConfiguration(); if (this.agent != null) { logger.info("Destroying " + APP_NAME + "...");