adding http scan capability, had to move tests

Signed-off-by: Ceki Gulcu <ceki@qos.ch>
qos-ch · Oct 7, 2024 · a496a04 · a496a04
1 parent 67c24f6
commit a496a04
Show file tree

Hide file tree

Showing 57 changed files with 937 additions and 709 deletions.
diff --git a/logback-classic-blackbox/pom.xml b/logback-classic-blackbox/pom.xml
@@ -22,9 +22,24 @@
             <artifactId>logback-classic</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-server</artifactId>
+            <version>${jetty.version}</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.eclipse.jetty.ee10</groupId>
+            <artifactId>jetty-ee10-servlet</artifactId>
+            <version>${jetty.version}</version>
+        </dependency>
+
+
         <dependency>
             <groupId>jakarta.servlet</groupId>
             <artifactId>jakarta.servlet-api</artifactId>
+            <version>6.0.0</version>
         </dependency>
 
         <dependency>
@@ -66,6 +81,7 @@
                 </exclusion>
             </exclusions>
         </dependency>
+
     </dependencies>
 
     <build>

diff --git a/...est/input/joran/roct/inclusion/inner0.xml → ...kboxInput/joran/roct/inclusion/inner0.xml b/...est/input/joran/roct/inclusion/inner0.xml → ...kboxInput/joran/roct/inclusion/inner0.xml
diff --git a/...ut/joran/roct/inclusion/topByResource.xml → ...ut/joran/roct/inclusion/topByResource.xml b/...ut/joran/roct/inclusion/topByResource.xml → ...ut/joran/roct/inclusion/topByResource.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE x>
 
 
-<configuration scan="true" scanPeriod="5 milliseconds">
+<configuration debug="true" scan="true" scanPeriod="5 milliseconds">
   <include resource="asResource/inner1.xml"/>
 </configuration> 
 
diff --git a/.../input/joran/roct/inclusion/topLevel0.xml → ...xInput/joran/roct/inclusion/topLevel0.xml b/.../input/joran/roct/inclusion/topLevel0.xml → ...xInput/joran/roct/inclusion/topLevel0.xml
@@ -3,7 +3,7 @@
 
 <configuration scan="true" scanPeriod="5 milliseconds">
 
-  <include file="src/test/input/joran/roct/inclusion/inner0.xml"/>
+  <include file="src/test/blackboxInput/joran/roct/inclusion/inner0.xml"/>
 
 </configuration> 
-
+
diff --git a/...ssic/src/test/input/joran/roct/scan 1.xml → .../test/blackboxInput/joran/roct/scan 1.xml b/...ssic/src/test/input/joran/roct/scan 1.xml → .../test/blackboxInput/joran/roct/scan 1.xml
diff --git a/...est/input/joran/roct/scan_logback_474.xml → ...kboxInput/joran/roct/scan_logback_474.xml b/...est/input/joran/roct/scan_logback_474.xml → ...kboxInput/joran/roct/scan_logback_474.xml
@@ -1,7 +1,7 @@
 
 <configuration scan="true" scanPeriod="25 millisecond">
 
-  <appender name="default" class="ch.qos.logback.classic.RecursivelyLoggingAppender474">
+  <appender name="default" class="ch.qos.logback.classic.blackbox.joran.RecursivelyLoggingAppender474">
   </appender>
 
   <logger name="Ignore" level="ERROR" additivity="false"/>
@@ -11,4 +11,4 @@
   </root> 
 
 </configuration> 
-
+
diff --git a/.../input/joran/roct/scan_period_default.xml → ...xInput/joran/roct/scan_period_default.xml b/.../input/joran/roct/scan_period_default.xml → ...xInput/joran/roct/scan_period_default.xml
diff --git a/...c/issue/lbclassic135/LoggingRunnable.java → ...x/issue/lbclassic135/LoggingRunnable.java b/...c/issue/lbclassic135/LoggingRunnable.java → ...x/issue/lbclassic135/LoggingRunnable.java
@@ -1,6 +1,6 @@
-/**
+/*
  * Logback: the reliable, generic, fast and flexible logging framework.
- * Copyright (C) 1999-2015, QOS.ch. All rights reserved.
+ * Copyright (C) 1999-2024, QOS.ch. All rights reserved.
  *
  * This program and the accompanying materials are dual-licensed under
  * either the terms of the Eclipse Public License v1.0 as published by
@@ -11,10 +11,10 @@
  * under the terms of the GNU Lesser General Public License version 2.1
  * as published by the Free Software Foundation.
  */
-package ch.qos.logback.classic.issue.lbclassic135;
+package ch.qos.logback.classic.blackbox.issue.lbclassic135;
 
 import org.slf4j.Logger;
-import ch.qos.logback.core.contention.RunnableWithCounterAndDone;
+import ch.qos.logback.core.testUtil.RunnableWithCounterAndDone;
 
 public class LoggingRunnable extends RunnableWithCounterAndDone {
 

diff --git a/...lbclassic135/LoggingToFileThroughput.java → ...lbclassic135/LoggingToFileThroughput.java b/...lbclassic135/LoggingToFileThroughput.java → ...lbclassic135/LoggingToFileThroughput.java
@@ -1,6 +1,6 @@
-/**
+/*
  * Logback: the reliable, generic, fast and flexible logging framework.
- * Copyright (C) 1999-2015, QOS.ch. All rights reserved.
+ * Copyright (C) 1999-2024, QOS.ch. All rights reserved.
  *
  * This program and the accompanying materials are dual-licensed under
  * either the terms of the Eclipse Public License v1.0 as published by
@@ -11,15 +11,15 @@
  * under the terms of the GNU Lesser General Public License version 2.1
  * as published by the Free Software Foundation.
  */
-package ch.qos.logback.classic.issue.lbclassic135;
+package ch.qos.logback.classic.blackbox.issue.lbclassic135;
 
 import ch.qos.logback.classic.Logger;
 import ch.qos.logback.classic.LoggerContext;
 import ch.qos.logback.classic.encoder.PatternLayoutEncoder;
 import ch.qos.logback.classic.spi.ILoggingEvent;
 import ch.qos.logback.core.FileAppender;
-import ch.qos.logback.core.contention.RunnableWithCounterAndDone;
-import ch.qos.logback.core.contention.ThreadedThroughputCalculator;
+import ch.qos.logback.core.testUtil.RunnableWithCounterAndDone;
+//import ch.qos.logback.core.contention.ThreadedThroughputCalculator;
 
 /**
  * Short sample code testing the throughput of a fair lock.
@@ -33,20 +33,20 @@ public class LoggingToFileThroughput {
 
     public static void main(String args[]) throws InterruptedException {
 
-        ThreadedThroughputCalculator tp = new ThreadedThroughputCalculator(OVERALL_DURATION_IN_MILLIS);
-        tp.printEnvironmentInfo("lbclassic135  LoggingToFileThrouhput");
-
-        LoggerContext lc = new LoggerContext();
-        Logger logger = buildLoggerContext(lc);
-
-        for (int i = 0; i < 2; i++) {
-            tp.execute(buildArray(logger));
-        }
-
-        RunnableWithCounterAndDone[] runnnableArray = buildArray(logger);
-        tp.execute(runnnableArray);
-        tp.printThroughput(runnnableArray, "File:   ");
-        lc.stop();
+//        ThreadedThroughputCalculator tp = new ThreadedThroughputCalculator(OVERALL_DURATION_IN_MILLIS);
+//        tp.printEnvironmentInfo("lbclassic135  LoggingToFileThrouhput");
+//
+//        LoggerContext lc = new LoggerContext();
+//        Logger logger = buildLoggerContext(lc);
+//
+//        for (int i = 0; i < 2; i++) {
+//            tp.execute(buildArray(logger));
+//        }
+//
+//        RunnableWithCounterAndDone[] runnnableArray = buildArray(logger);
+//        tp.execute(runnnableArray);
+//        tp.printThroughput(runnnableArray, "File:   ");
+//        lc.stop();
     }
 
     static Logger buildLoggerContext(LoggerContext lc) {

diff --git a/...classic/joran/ChangeDetectedListener.java → ...lackbox/joran/ChangeDetectedListener.java b/...classic/joran/ChangeDetectedListener.java → ...lackbox/joran/ChangeDetectedListener.java
@@ -1,6 +1,6 @@
 /*
  * Logback: the reliable, generic, fast and flexible logging framework.
- * Copyright (C) 1999-2022, QOS.ch. All rights reserved.
+ * Copyright (C) 1999-2024, QOS.ch. All rights reserved.
  *
  * This program and the accompanying materials are dual-licensed under
  * either the terms of the Eclipse Public License v1.0 as published by
@@ -12,8 +12,9 @@
  * as published by the Free Software Foundation.
  */
 
-package ch.qos.logback.classic.joran;
+package ch.qos.logback.classic.blackbox.joran;
 
+import ch.qos.logback.classic.joran.ReconfigureOnChangeTask;
 import ch.qos.logback.core.spi.ConfigurationEvent;
 import ch.qos.logback.core.spi.ConfigurationEventListener;
 
@@ -33,7 +34,7 @@ class ChangeDetectedListener  implements ConfigurationEventListener {
     public void listen(ConfigurationEvent configurationEvent) {
         switch (configurationEvent.getEventType()) {
         case CHANGE_DETECTED:
-            System.out.println(this.toString() + "#listen Change detected " + configurationEvent +" count="+countDownLatch.getCount());
+            //System.out.println(this.toString() + "#listen Change detected " + configurationEvent +" count="+countDownLatch.getCount());
 
             countDownLatch.countDown();
             Object data = configurationEvent.getData();

diff --git a/...rationEndedSuccessfullyEventListener.java → ...rationEndedSuccessfullyEventListener.java b/...rationEndedSuccessfullyEventListener.java → ...rationEndedSuccessfullyEventListener.java
@@ -12,7 +12,7 @@
  * as published by the Free Software Foundation.
  */
 
-package ch.qos.logback.classic.joran;
+package ch.qos.logback.classic.blackbox.joran;
 
 import ch.qos.logback.core.spi.ConfigurationEvent;
 import ch.qos.logback.core.spi.ConfigurationEventListener;
@@ -31,7 +31,7 @@ class PartialConfigurationEndedSuccessfullyEventListener implements Configuratio
     public void listen(ConfigurationEvent configurationEvent) {
         switch (configurationEvent.getEventType()) {
         case PARTIAL_CONFIGURATION_ENDED_SUCCESSFULLY:
-            System.out.println(this.toString() + "#listen PARTIAL_CONFIGURATION_ENDED_SUCCESSFULLY detected " + configurationEvent +" count="+countDownLatch.getCount());
+            //System.out.println(this.toString() + "#listen PARTIAL_CONFIGURATION_ENDED_SUCCESSFULLY detected " + configurationEvent +" count="+countDownLatch.getCount());
 
             countDownLatch.countDown();
             break;

diff --git a/...ic/joran/ReconfigurationDoneListener.java → ...ox/joran/ReconfigurationDoneListener.java b/...ic/joran/ReconfigurationDoneListener.java → ...ox/joran/ReconfigurationDoneListener.java
@@ -1,6 +1,6 @@
 /*
  * Logback: the reliable, generic, fast and flexible logging framework.
- * Copyright (C) 1999-2022, QOS.ch. All rights reserved.
+ * Copyright (C) 1999-2024, QOS.ch. All rights reserved.
  *
  * This program and the accompanying materials are dual-licensed under
  * either the terms of the Eclipse Public License v1.0 as published by
@@ -12,8 +12,9 @@
  * as published by the Free Software Foundation.
  */
 
-package ch.qos.logback.classic.joran;
+package ch.qos.logback.classic.blackbox.joran;
 
+import ch.qos.logback.classic.joran.ReconfigureOnChangeTask;
 import ch.qos.logback.core.spi.ConfigurationEvent;
 import ch.qos.logback.core.spi.ConfigurationEventListener;
 

diff --git a/...ionTaskRegisteredConfigEventListener.java → ...ionTaskRegisteredConfigEventListener.java b/...ionTaskRegisteredConfigEventListener.java → ...ionTaskRegisteredConfigEventListener.java
@@ -1,6 +1,6 @@
 /*
  * Logback: the reliable, generic, fast and flexible logging framework.
- * Copyright (C) 1999-2022, QOS.ch. All rights reserved.
+ * Copyright (C) 1999-2024, QOS.ch. All rights reserved.
  *
  * This program and the accompanying materials are dual-licensed under
  * either the terms of the Eclipse Public License v1.0 as published by
@@ -12,8 +12,9 @@
  * as published by the Free Software Foundation.
  */
 
-package ch.qos.logback.classic.joran;
+package ch.qos.logback.classic.blackbox.joran;
 
+import ch.qos.logback.classic.joran.ReconfigureOnChangeTask;
 import ch.qos.logback.core.spi.ConfigurationEvent;
 import ch.qos.logback.core.spi.ConfigurationEventListener;
 

diff --git a/...joran/ReconfigureOnChangeTaskHarness.java → ...joran/ReconfigureOnChangeTaskHarness.java b/...joran/ReconfigureOnChangeTaskHarness.java → ...joran/ReconfigureOnChangeTaskHarness.java
@@ -1,6 +1,6 @@
 /*
  * Logback: the reliable, generic, fast and flexible logging framework.
- * Copyright (C) 1999-2022, QOS.ch. All rights reserved.
+ * Copyright (C) 1999-2024, QOS.ch. All rights reserved.
  *
  * This program and the accompanying materials are dual-licensed under
  * either the terms of the Eclipse Public License v1.0 as published by
@@ -12,10 +12,10 @@
  * as published by the Free Software Foundation.
  */
 
-package ch.qos.logback.classic.joran;
+package ch.qos.logback.classic.blackbox.joran;
 
 import ch.qos.logback.classic.LoggerContext;
-import ch.qos.logback.core.contention.AbstractMultiThreadedHarness;
+import ch.qos.logback.core.testUtil.AbstractMultiThreadedHarness;
 import ch.qos.logback.core.status.InfoStatus;
 
 import java.util.concurrent.CountDownLatch;