This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-log.git
commit f03ee525409da86053c31f944246728d238fe129 Merge: 1652447 97fbbbe Author: Robert Munteanu <[email protected]> AuthorDate: Wed Apr 2 10:11:58 2025 +0200 Merge pull request #18 from enapps-enorman/issue/SLING-11906 SLING-11906 Migrate to slf4j 2.x .sling-module.json | 5 + bnd.bnd | 39 +- pom.xml | 407 ++--- src/main/appended-resources/META-INF/LICENSE | 25 - src/main/appended-resources/META-INF/NOTICE | 3 - .../sling/commons/log/logback/ConfigProvider.java | 9 +- .../sling/commons/log/logback/OsgiAction.java | 105 +- .../commons/log/logback/OsgiAppenderRefAction.java | 55 +- .../commons/log/logback/internal/Activator.java | 128 +- ...gbackResetListener.java => AppenderOrigin.java} | 16 +- .../log/logback/internal/AppenderTracker.java | 229 ++- .../internal/ConfigResetRequestHandler.java | 21 +- .../log/logback/internal/ConfigSourceTracker.java | 135 +- .../log/logback/internal/FilterTracker.java | 256 ++- .../log/logback/internal/FilteringListener.java | 30 +- .../internal/LevelChangePropagatorChecker.java | 76 + .../commons/log/logback/internal/LogConfig.java | 40 +- .../log/logback/internal/LogConfigManager.java | 1740 ++++++++++++++---- .../commons/log/logback/internal/LogConstants.java | 212 +++ .../commons/log/logback/internal/LogWriter.java | 96 +- .../log/logback/internal/LogbackManager.java | 821 --------- .../log/logback/internal/LogbackResetListener.java | 24 +- .../log/logback/internal/MaskingMessageUtil.java | 82 +- .../internal/OsgiAppenderRefInternalAction.java | 93 - .../logback/internal/OsgiIntegrationListener.java | 101 + .../log/logback/internal/OsgiInternalAction.java | 179 -- .../log/logback/internal/RootLoggerListener.java | 46 + .../internal/SLF4JServiceProviderTracker.java | 127 ++ .../internal/SlingConfigurationPrinter.java | 149 +- .../log/logback/internal/SlingLogPanel.java | 242 +-- .../log/logback/internal/StringConfigProvider.java | 38 + .../sling/commons/log/logback/internal/Tailer.java | 14 +- .../log/logback/internal/TurboFilterTracker.java | 113 +- .../internal/config/ConfigAdminSupport.java | 53 +- .../internal/config/ConfigurationException.java | 50 +- .../config/ConfigurationServiceFactory.java | 62 +- .../internal/config/GlobalConfigurator.java | 20 +- .../logback/internal/config/LogConfigurator.java | 18 +- .../config/LogWriterManagedServiceFactory.java | 5 +- .../config/LoggerManagedServiceFactory.java | 47 +- .../joran/AppenderRefModelHandlerWrapper.java | 83 + .../internal/joran/JoranConfiguratorWrapper.java | 80 + .../internal/joran/ModelHandlerWrapperFactory.java | 69 + .../internal/joran/OsgiAppenderRefModel.java | 107 ++ .../joran/OsgiAppenderRefModelHandler.java | 75 + .../log/logback/internal/joran/OsgiModel.java | 39 + .../logback/internal/joran/OsgiModelHandler.java | 61 + .../stacktrace/OSGiAwareExceptionHandling.java | 22 +- .../internal/stacktrace/PackageInfoCollector.java | 58 +- .../internal/util/LoggerSpecificEncoder.java | 63 +- .../logback/internal/util/SlingContextUtil.java | 21 +- .../internal/util/SlingRollingFileAppender.java | 26 +- .../logback/internal/util/SlingStatusPrinter.java | 40 +- .../commons/log/logback/internal/util/Util.java | 130 +- .../commons/log/logback/internal/util/XmlUtil.java | 49 +- .../sling/commons/log/logback/package-info.java | 4 +- .../log/logback/spi/DefaultConfigurator.java | 68 + .../commons/log/logback/webconsole/LogPanel.java | 36 + .../log/logback/webconsole/LoggerConfig.java | 51 +- .../log/logback/webconsole/TailerOptions.java | 31 + .../log/logback/webconsole/package-info.java | 4 +- .../ch.qos.logback.classic.spi.Configurator | 16 + src/main/resources/logback-empty.xml | 5 - src/test/java/SimpleOrigin.java | 30 + .../sling/commons/log/helpers/LogCapture.java | 91 + .../sling/commons/log/helpers/ReflectionTools.java | 98 + .../sling/commons/log/logback/OsgiActionTest.java | 259 +++ .../log/logback/OsgiAppenderRefActionTest.java | 79 + .../logback/integration/ITAppenderServices.java | 21 +- .../logback/integration/ITConfigAdminSupport.java | 84 +- .../log/logback/integration/ITConfigFragments.java | 14 +- .../log/logback/integration/ITConfigPrinter.java | 39 +- .../ITConfigRaceCondition_SLING_7239.java | 13 +- .../log/logback/integration/ITDefaultConfig.java | 3 +- .../log/logback/integration/ITFilterSupport.java | 17 +- .../log/logback/integration/ITJULIntegration.java | 5 +- .../log/logback/integration/ITPackagingData.java | 63 +- .../log/logback/integration/LogTestBase.java | 44 +- .../logback/integration/PackagingDataTestUtil.java | 18 +- .../integration/bundle/PackageDataActivator.java | 2 +- .../log/logback/internal/ActivatorTest.java | 76 + .../log/logback/internal/AppenderTrackerTest.java | 254 +++ .../log/logback/internal/BaseTryLoggingTest.java | 65 + .../internal/ConfigResetRequestHandlerTest.java | 65 + .../logback/internal/ConfigSourceTrackerTest.java | 179 ++ .../log/logback/internal/FilterTrackerTest.java | 413 +++++ .../logback/internal/FilteringListenerTest.java | 88 +- .../internal/LevelChangePropagatorCheckerTest.java | 91 + .../log/logback/internal/LogConfigManagerTest.java | 1925 ++++++++++++++++++++ .../log/logback/internal/LogConfigTest.java | 259 +++ .../log/logback/internal/LogWriterTest.java | 307 ++++ .../logback/internal/LogbackResetListenerTest.java | 52 + .../logback/internal/LoggerStateContextTest.java | 169 ++ .../MaskingEnsureExceptionHandlingTest.java | 86 + ...MaskingExtendedThrowableProxyConverterTest.java | 43 + .../logback/internal/MaskingMessageUtilTest.java | 66 + .../internal/MaskingPatternLayoutEncoderTest.java | 45 + ...gRootCauseFirstThrowableProxyConverterTest.java | 43 + .../internal/MaskingThrowableProxyTest.java | 171 ++ .../internal/OsgiIntegrationListenerTest.java | 108 ++ .../logback/internal/RootLoggerListenerTest.java | 85 + .../internal/SLF4JServiceProviderTrackerTest.java | 188 ++ .../internal/SlingConfigurationPrinterTest.java | 439 +++++ .../log/logback/internal/SlingLogPanelTest.java | 784 ++++++++ .../logback/internal/StringConfigProviderTest.java | 41 + .../commons/log/logback/internal/TailerTest.java | 263 +++ .../log/logback/internal/TestLogConfig.java | 100 - .../log/logback/internal/TestLogWriter.java | 108 -- .../commons/log/logback/internal/TestTailer.java | 124 -- .../internal/TryApacheCommonsLoggingTest.java | 43 + .../log/logback/internal/TryJulLoggingTest.java | 65 + .../log/logback/internal/TryLog4jLoggingTest.java | 42 + .../logback/internal/TryLogbackLoggingTest.java | 43 + .../logback/internal/TurboFilterTrackerTest.java | 164 ++ .../internal/config/ConfigAdminSupportTest.java | 90 + .../config/ConfigurationExceptionTest.java | 68 + .../config/ConfigurationServiceFactoryTest.java | 101 + .../internal/config/GlobalConfiguratorTest.java | 150 ++ .../internal/config/LogConfiguratorTest.java | 65 + .../config/LogWriterManagedServiceFactoryTest.java | 179 ++ .../config/LoggerManagedServiceFactoryTest.java | 278 +++ .../config/TestLoggerManagedServiceFactory.java | 74 - .../joran/AppenderRefModelHandlerWrapperTest.java | 130 ++ .../joran/JoranConfiguratorWrapperTest.java | 87 + .../joran/ModelHandlerWrapperFactoryTest.java | 63 + .../joran/OsgiAppenderRefModelHandlerTest.java | 169 ++ .../internal/joran/OsgiAppenderRefModelTest.java | 113 ++ .../internal/joran/OsgiModelHandlerTest.java | 93 + .../log/logback/internal/joran/OsgiModelTest.java | 41 + .../logback/internal/mock/MockLoggerFactory.java | 33 + .../internal/mock/MockSLF4JServiceProvider.java | 59 + .../stacktrace/OSGiAwareConverterTest.java | 83 + .../stacktrace/OSGiAwareExceptionHandlingTest.java | 78 + .../stacktrace/PackageInfoCollectorTest.java | 145 +- .../util/AbstractPatternLayoutWrapper.java | 13 +- .../internal/util/LoggerSpecificEncoderTest.java | 206 ++- .../internal/util/SlingContextUtilTest.java | 42 + .../util/SlingRollingFileAppenderTest.java | 62 + .../internal/util/SlingStatusPrinterTest.java | 102 ++ .../log/logback/internal/util/TestUtils.java | 174 ++ .../log/logback/internal/util/UtilTest.java | 59 + .../log/logback/internal/util/XmlUtilTest.java | 103 ++ .../internal/webconsole/LoggerConfigTest.java | 85 + .../internal/webconsole/TailerOptionsTest.java | 65 + .../log/logback/spi/DefaultConfiguratorTest.java | 66 + src/test/resources/exam.properties | 21 - src/test/resources/logback-invalid.txt | 21 + src/test/resources/logback-invalid.xml | 22 + src/test/resources/logback-test.xml | 1 - src/test/resources/logback-test2.xml | 31 + .../resources/test-osg-appender-ref-config.xml | 4 - 151 files changed, 14688 insertions(+), 3411 deletions(-)
