ongoing work on jigsaw modularization

qos-ch · Dec 2, 2017 · e59b6d6 · e59b6d6
1 parent 0e25744
commit e59b6d6
Show file tree

Hide file tree

Showing 21 changed files with 69 additions and 303 deletions.
diff --git a/logback-classic/pom.xml b/logback-classic/pom.xml
@@ -108,10 +108,16 @@
     </dependency>
     <dependency>
       <groupId>org.codehaus.groovy</groupId>
-      <artifactId>groovy</artifactId>
+      <artifactId>groovy-all</artifactId>
       <scope>compile</scope>
-      <!--<optional>true</optional>-->
+      <optional>true</optional>
     </dependency>
+<!--     <dependency>
+      <groupId>org.codehaus.groovy</groupId>
+      <artifactId>groovy-test</artifactId>
+      <scope>test</scope>
+    </dependency>
+-->
     <dependency>
       <groupId>ch.qos.logback</groupId>
       <artifactId>logback-core</artifactId>
@@ -235,6 +241,7 @@
         </dependencies>
 
         <executions>
+          <!--  
           <execution>
             <id>ant-osgi-test</id>
             <phase>package</phase>
@@ -250,7 +257,7 @@
               <goal>run</goal>
             </goals>
           </execution>
-
+			-->
           <execution>
             <id>ant-integration-test</id>
             <phase>package</phase>

diff --git a/...ssic/provider/LogbackServiceProvider.java → ...k/classic/spi/LogbackServiceProvider.java b/...ssic/provider/LogbackServiceProvider.java → ...k/classic/spi/LogbackServiceProvider.java
@@ -1,4 +1,4 @@
-package ch.qos.logback.classic.provider;
+package ch.qos.logback.classic.spi;
 
 import org.slf4j.ILoggerFactory;
 import org.slf4j.IMarkerFactory;
@@ -27,29 +27,35 @@ public class LogbackServiceProvider implements SLF4JServiceProvider {
     // to avoid constant folding by the compiler, this field must *not* be final
     public static String REQUESTED_API_VERSION = "1.8.99"; // !final
 
-    private LoggerContext loggerFactory;
+    private LoggerContext defaultLoggerContext;
     private IMarkerFactory markerFactory;
     private MDCAdapter mdcAdapter;
-
+    private final ContextSelectorStaticBinder contextSelectorBinder = ContextSelectorStaticBinder.getSingleton();
+    private static Object KEY = new Object();
+    private boolean initialized = false;
+
     @Override
     public void initialize() {
-        loggerFactory = new LoggerContext();
-        initializeLoggerContext(loggerFactory);
+        defaultLoggerContext = new LoggerContext();
+        defaultLoggerContext.setName(CoreConstants.DEFAULT_CONTEXT_NAME);
+        initializeLoggerContext();
         markerFactory = new BasicMarkerFactory();
         mdcAdapter = new LogbackMDCAdapter();
     }
 
-    private void initializeLoggerContext(LoggerContext loggerFactory) {
+    private void initializeLoggerContext() {
         try {
             try {
-                new ContextInitializer(loggerFactory).autoConfig();
+                new ContextInitializer(defaultLoggerContext).autoConfig();
             } catch (JoranException je) {
                 Util.report("Failed to auto configure default logger context", je);
             }
             // logback-292
-            if (!StatusUtil.contextHasStatusListener(loggerFactory)) {
-                StatusPrinter.printInCaseOfErrorsOrWarnings(loggerFactory);
+            if (!StatusUtil.contextHasStatusListener(defaultLoggerContext)) {
+                StatusPrinter.printInCaseOfErrorsOrWarnings(defaultLoggerContext);
             }
+            contextSelectorBinder.init(defaultLoggerContext, KEY);
+            initialized = true;
         } catch (Exception t) { // see LOGBACK-1159
             Util.report("Failed to instantiate [" + LoggerContext.class.getName() + "]", t);
         }
@@ -58,7 +64,14 @@ private void initializeLoggerContext(LoggerContext loggerFactory) {
     @Override
 
     public ILoggerFactory getLoggerFactory() {
-        return loggerFactory;
+        if (!initialized) {
+            return defaultLoggerContext;
+        }
+
+        if (contextSelectorBinder.getContextSelector() == null) {
+            throw new IllegalStateException("contextSelector cannot be null. See also " + NULL_CS_URL);
+        }
+        return contextSelectorBinder.getContextSelector().getLoggerContext();
     }
 
     @Override

diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/spi/PackagingDataCalculator.java b/logback-classic/src/main/java/ch/qos/logback/classic/spi/PackagingDataCalculator.java
@@ -17,7 +17,7 @@
 import java.security.CodeSource;
 import java.util.HashMap;
 
-import sun.reflect.Reflection;
+//import sun.reflect.Reflection;
 
 // import java.security.AccessControlException; import java.security.AccessController;import java.security.PrivilegedAction;
 /**
@@ -42,8 +42,8 @@ public class PackagingDataCalculator {
         // sun.reflect.Reflection class. However, this class will *not compile*
         // on JDKs lacking sun.reflect.Reflection.
         try {
-            Reflection.getCallerClass(2);
-            GET_CALLER_CLASS_METHOD_AVAILABLE = true;
+            //Reflection.getCallerClass(2);
+            //GET_CALLER_CLASS_METHOD_AVAILABLE = true;
         } catch (NoClassDefFoundError e) {
         } catch (NoSuchMethodError e) {
         } catch (UnsupportedOperationException e) {
@@ -70,9 +70,9 @@ void populateFrames(StackTraceElementProxy[] stepArray) {
         // in the initial part of this method we populate package information for
         // common stack frames
         final Throwable t = new Throwable("local stack reference");
-        final StackTraceElement[] localteSTEArray = t.getStackTrace();
-        final int commonFrames = STEUtil.findNumberOfCommonFrames(localteSTEArray, stepArray);
-        final int localFirstCommon = localteSTEArray.length - commonFrames;
+        final StackTraceElement[] localSTEArray = t.getStackTrace();
+        final int commonFrames = STEUtil.findNumberOfCommonFrames(localSTEArray, stepArray);
+        final int localFirstCommon = localSTEArray.length - commonFrames;
         final int stepFirstCommon = stepArray.length - commonFrames;
 
         ClassLoader lastExactClassLoader = null;
@@ -82,7 +82,7 @@ void populateFrames(StackTraceElementProxy[] stepArray) {
         for (int i = 0; i < commonFrames; i++) {
             Class callerClass = null;
             if (GET_CALLER_CLASS_METHOD_AVAILABLE) {
-                callerClass = Reflection.getCallerClass(localFirstCommon + i - missfireCount + 1);
+                //callerClass = Reflection.getCallerClass(localFirstCommon + i - missfireCount + 1);
             }
             StackTraceElementProxy step = stepArray[stepFirstCommon + i];
             String stepClassname = step.ste.getClassName();

diff --git a/...ck-classic/src/main/java/module-info.java → ...k-classic/src/main/java/module-info.Xjava b/...ck-classic/src/main/java/module-info.java → ...k-classic/src/main/java/module-info.Xjava
@@ -5,8 +5,10 @@
     requires static java.management;
 
 
+
     requires ch.qos.logback.core;
+    requires static groovy;
 
-    provides org.slf4j.spi.SLF4JServiceProvider with ch.qos.logback.classic.provider.LogbackServiceProvider;
+    provides org.slf4j.spi.SLF4JServiceProvider with ch.qos.logback.classic.spi.LogbackServiceProvider;
 
 }
diff --git a/logback-classic/src/main/java/org/slf4j/impl/StaticLoggerBinder.java b/logback-classic/src/main/java/org/slf4j/impl/StaticLoggerBinder.java
diff --git a/logback-classic/src/main/java/org/slf4j/impl/StaticMDCBinder.java b/logback-classic/src/main/java/org/slf4j/impl/StaticMDCBinder.java
diff --git a/logback-classic/src/main/java/org/slf4j/impl/StaticMarkerBinder.java b/logback-classic/src/main/java/org/slf4j/impl/StaticMarkerBinder.java
diff --git a/logback-classic/src/main/resources/META-INF/services/org.slf4j.spi.SLF4JServiceProvider b/logback-classic/src/main/resources/META-INF/services/org.slf4j.spi.SLF4JServiceProvider
@@ -0,0 +1 @@
+ch.qos.logback.classic.spi.LogbackServiceProvider
diff --git a/logback-classic/src/test/groovy/ch/qos/logback/classic/gaffer/GafferConfiguratorTest.groovy b/logback-classic/src/test/groovy/ch/qos/logback/classic/gaffer/GafferConfiguratorTest.groovy
@@ -172,6 +172,7 @@ class GafferConfiguratorTest {
 
     @Test
     void appenderRefShouldWork() {
+        context.putProperty("p", "HELLO");
         File file = new File(ClassicTestConstants.GAFFER_INPUT_PREFIX + "asyncAppender.groovy")
         configurator.run file.text
 
@@ -183,6 +184,7 @@ class GafferConfiguratorTest {
 
     @Test
     void appenderRefWithNonAppenderAttachable() {
+        context.putProperty("p", "HELLO");
         String message = shouldFail(IllegalArgumentException) {
             File file = new File(ClassicTestConstants.GAFFER_INPUT_PREFIX + "appenderRefWithNonAppenderAttachable.groovy")
             configurator.run file.text