From be8e6795f12d0d061c1cbcb1708b6ba9ce079494 Mon Sep 17 00:00:00 2001
From: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Date: Tue, 23 Feb 2021 11:22:26 -0600
Subject: [PATCH] Issue #5996 - cleanup logback-access.mod

+ Moved to /jetty-home/ to align with other logging type modules
+ Correct dependencies

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
---
 .../main/resources}/modules/logback-access.mod  | 14 ++++----------
 .../etc}/jetty-logback-access.xml               |  0
 .../modules/logback-access/logback-access.xml   | 17 -----------------
 3 files changed, 4 insertions(+), 27 deletions(-)
 rename {jetty-server/src/main/config => jetty-home/src/main/resources}/modules/logback-access.mod (58%)
 rename {jetty-server/src/main/config/modules/logback-access => jetty-home/src/main/resources/modules/logging/logback-access/etc}/jetty-logback-access.xml (100%)
 delete mode 100644 jetty-server/src/main/config/modules/logback-access/logback-access.xml

diff --git a/jetty-server/src/main/config/modules/logback-access.mod b/jetty-home/src/main/resources/modules/logback-access.mod
similarity index 58%
rename from jetty-server/src/main/config/modules/logback-access.mod
rename to jetty-home/src/main/resources/modules/logback-access.mod
index 3f0e5aa066eb..ceb2b214643c 100644
--- a/jetty-server/src/main/config/modules/logback-access.mod
+++ b/jetty-home/src/main/resources/modules/logback-access.mod
@@ -1,28 +1,22 @@
 # DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
 
 [description]
-Enables logback request log.
+Enables logback access request log.
 
 [tags]
 requestlog
-logging
-logback
 
-[depend]
+[depends]
+logging-logback
 server
-logback-impl
 resources
 
-[provide]
-requestlog-impl
-
 [xml]
 etc/jetty-logback-access.xml
 
 [files]
 logs/
-basehome:modules/logback-access/jetty-logback-access.xml|etc/jetty-logback-access.xml
-basehome:modules/logback-access/logback-access.xml|resources/logback-access.xml
+basehome:modules/logging/logback-access
 maven://ch.qos.logback/logback-access/${logback.version}|lib/logback/logback-access-${logback.version}.jar
 
 [lib]
diff --git a/jetty-server/src/main/config/modules/logback-access/jetty-logback-access.xml b/jetty-home/src/main/resources/modules/logging/logback-access/etc/jetty-logback-access.xml
similarity index 100%
rename from jetty-server/src/main/config/modules/logback-access/jetty-logback-access.xml
rename to jetty-home/src/main/resources/modules/logging/logback-access/etc/jetty-logback-access.xml
diff --git a/jetty-server/src/main/config/modules/logback-access/logback-access.xml b/jetty-server/src/main/config/modules/logback-access/logback-access.xml
deleted file mode 100644
index 72e73b2e6d8c..000000000000
--- a/jetty-server/src/main/config/modules/logback-access/logback-access.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<configuration>
-  <!-- always a good activate OnConsoleStatusListener -->
-  <statusListener class="ch.qos.logback.core.status.OnConsoleStatusListener" />  
-
-  <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <file>logs/access.log</file>
-    <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-      <fileNamePattern>logs/access.%d{yyyy-MM-dd}.log.zip</fileNamePattern>
-    </rollingPolicy>
-    <encoder>
-      <pattern>combined</pattern>
-    </encoder>
-  </appender>
- 
-  <appender-ref ref="FILE" />
-</configuration>
-