Skip to content

Commit

Permalink
revert Configurator interface from logback-core to logback-classic
Browse files Browse the repository at this point in the history
Signed-off-by: Ceki Gulcu <ceki@qos.ch>
  • Loading branch information
ceki committed Aug 9, 2023
1 parent c2abb72 commit 48a7676
Show file tree
Hide file tree
Showing 10 changed files with 10 additions and 12 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
package ch.qos.logback.classic;

import ch.qos.logback.classic.layout.TTLLLayout;
import ch.qos.logback.core.spi.Configurator;
import ch.qos.logback.classic.spi.Configurator;
import ch.qos.logback.classic.spi.ConfiguratorRank;
import ch.qos.logback.classic.spi.ILoggingEvent;
import ch.qos.logback.core.ConsoleAppender;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
import ch.qos.logback.core.model.ModelUtil;
import ch.qos.logback.core.model.processor.DefaultProcessor;
import ch.qos.logback.core.model.processor.ModelInterpretationContext;
import ch.qos.logback.core.spi.Configurator;
import ch.qos.logback.classic.spi.Configurator;
import ch.qos.logback.core.spi.ContextAwareBase;
import ch.qos.logback.core.status.InfoStatus;
import ch.qos.logback.core.status.StatusManager;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* under the terms of the GNU Lesser General Public License version 2.1
* as published by the Free Software Foundation.
*/
package ch.qos.logback.core.spi;
package ch.qos.logback.classic.spi;

import ch.qos.logback.core.Context;
import ch.qos.logback.core.spi.ContextAware;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,9 @@
*/
package ch.qos.logback.classic.util;

import ch.qos.logback.classic.BasicConfigurator;
import ch.qos.logback.classic.ClassicConstants;
import ch.qos.logback.classic.LoggerContext;
import ch.qos.logback.core.spi.Configurator;
import ch.qos.logback.classic.spi.Configurator;
import ch.qos.logback.classic.spi.ConfiguratorRank;
import ch.qos.logback.core.CoreConstants;
import ch.qos.logback.core.LogbackException;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import ch.qos.logback.core.Context;
import ch.qos.logback.core.LogbackException;
import ch.qos.logback.core.joran.spi.JoranException;
import ch.qos.logback.core.spi.Configurator;
import ch.qos.logback.classic.spi.Configurator;
import ch.qos.logback.core.spi.ContextAwareBase;
import ch.qos.logback.core.status.InfoStatus;
import ch.qos.logback.core.status.StatusManager;
Expand Down
3 changes: 2 additions & 1 deletion logback-classic/src/main/java/module-info.java
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import ch.qos.logback.classic.spi.Configurator;

module ch.qos.logback.classic {
// requires static means optional
Expand All @@ -17,7 +18,7 @@
requires org.slf4j;

requires ch.qos.logback.core;
uses ch.qos.logback.core.spi.Configurator;
uses Configurator;
provides org.slf4j.spi.SLF4JServiceProvider with ch.qos.logback.classic.spi.LogbackServiceProvider;

exports ch.qos.logback.classic;
Expand Down
2 changes: 1 addition & 1 deletion logback-classic/src/test/input/fqcn.txt
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ ch.qos.logback.classic.sift.JNDIBasedContextDiscriminator
ch.qos.logback.classic.sift.MDCBasedDiscriminator
ch.qos.logback.classic.spi.CallerData
ch.qos.logback.classic.spi.ClassPackagingData
ch.qos.logback.core.spi.Configurator
ch.qos.logback.classic.spi.Configurator
ch.qos.logback.classic.spi.EventArgUtil
ch.qos.logback.classic.spi.ILoggingEvent
ch.qos.logback.classic.spi.IThrowableProxy
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@

public class ContextInitializerTest {

static final String PATH_TO_META_INF_CONF_SERVICE = "META-INF/services/ch.qos.logback.core.spi.Configurator";
static final String PATH_TO_META_INF_CONF_SERVICE = "META-INF/services/ch.qos.logback.classic.spi.Configurator";
static final String FAKE_META_INF_SERVICES = "FAKE_META_INF_SERVICES_ch_qos_logback_classic_spi_Configurator";
LoggerContext loggerContext = new LoggerContext();
Logger root = loggerContext.getLogger(Logger.ROOT_LOGGER_NAME);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
*/
package ch.qos.logback.classic.util;

import ch.qos.logback.core.spi.Configurator;
import ch.qos.logback.classic.spi.Configurator;
import ch.qos.logback.classic.spi.ConfiguratorRank;
import ch.qos.logback.core.Context;
import ch.qos.logback.core.spi.ContextAwareBase;
Expand Down

This file was deleted.

0 comments on commit 48a7676

Please sign in to comment.