[java-idp-jetty-base] 02/02: Use Logback for logging

[Tom Zeller]

This is an automated email from the git hooks/post-receive script.

tzeller pushed a commit to branch 10
in repository java-idp-jetty-base.

View the commit online:
http://git.shibboleth.net/view/?p=java-idp-jetty-base.git;a=commit;h=ebf1e4cd57024f58086e74f4af38b0da161bf820

commit ebf1e4cd57024f58086e74f4af38b0da161bf820
Author: Tom Zeller <tzeller at dragonacea.biz>
AuthorDate: Tue Feb 8 09:24:10 2022 -0600

    Use Logback for logging
    
    The logging-logback module needs to be loaded first.
---
 pom.xml                                            | 29 ++++++++++++++++++++++
 .../jetty-base/resources/jetty-logging.properties  | 10 --------
 .../jetty-base/start.d/console-capture.ini         | 16 ------------
 src/main/resources/jetty-base/start.d/idp.ini      |  1 +
 4 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/pom.xml b/pom.xml
index a916b46..b854127 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,6 +19,7 @@
     <properties>
         <jetty94-dta-ssl.version>1.0.0</jetty94-dta-ssl.version>
         <assemblyDirectory>${project.build.directory}/idp-jetty-base</assemblyDirectory>
+        <logback.version>1.3.0-alpha13</logback.version>
     </properties>
 
     <repositories>
@@ -130,6 +131,34 @@
                             </artifactItems>
                         </configuration>
                     </execution>
+                    <!-- Copy Logback logging dependencies to jetty-base/lib/logging directory. -->
+                    <execution>
+                        <id>copy-jetty-logging-logback</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>copy</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>ch.qos.logback</groupId>
+                                    <artifactId>logback-classic</artifactId>
+                                    <version>${logback.version}</version>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>ch.qos.logback</groupId>
+                                    <artifactId>logback-core</artifactId>
+                                    <version>${logback.version}</version>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>ch.qos.logback</groupId>
+                                    <artifactId>logback-access</artifactId>
+                                    <version>${logback.version}</version>
+                                </artifactItem>
+                            </artifactItems>
+                            <outputDirectory>${assemblyDirectory}/jetty-base/lib/logging/</outputDirectory>
+                        </configuration>
+                    </execution>
                 </executions>
             </plugin>
             <!-- Assemble the artifacts. -->
diff --git a/src/main/resources/jetty-base/resources/jetty-logging.properties b/src/main/resources/jetty-base/resources/jetty-logging.properties
deleted file mode 100644
index fba9189..0000000
--- a/src/main/resources/jetty-base/resources/jetty-logging.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-## Set logging levels from: ALL, TRACE, DEBUG, INFO, WARN, ERROR, OFF
-org.eclipse.jetty.LEVEL=INFO
-## Configure a level for an arbitrary logger tree
-#com.example.LEVEL=INFO
-## Configure a level for specific logger
-#com.example.MyComponent.LEVEL=INFO
-## Configure JMX Context Name
-# org.eclipse.jetty.logging.jmx.context=JettyServer
-## Hide stacks traces in an arbitrary logger tree
-#com.example.STACKS=false
diff --git a/src/main/resources/jetty-base/start.d/console-capture.ini b/src/main/resources/jetty-base/start.d/console-capture.ini
deleted file mode 100644
index 26d8755..0000000
--- a/src/main/resources/jetty-base/start.d/console-capture.ini
+++ /dev/null
@@ -1,16 +0,0 @@
-# --------------------------------------- 
-# Module: console-capture
-# --------------------------------------- 
---module=console-capture
-
-## Logging directory (relative to $JETTY_BASE).
-# jetty.console-capture.dir=./logs
-
-## Whether to append to existing file.
-# jetty.console-capture.append=true
-
-## How many days to retain old log files.
-# jetty.console-capture.retainDays=90
-
-## Timezone ID of the log timestamps, as specified by java.time.ZoneId.
-# jetty.console-capture.timezone=GMT
\ No newline at end of file
diff --git a/src/main/resources/jetty-base/start.d/idp.ini b/src/main/resources/jetty-base/start.d/idp.ini
index babd6c1..f559329 100644
--- a/src/main/resources/jetty-base/start.d/idp.ini
+++ b/src/main/resources/jetty-base/start.d/idp.ini
@@ -2,6 +2,7 @@
 # Module: idp
 # Shibboleth IdP
 # --------------------------------------- 
+--module=logging-logback
 --module=idp
 
 ## Keystore file path (relative to $jetty.base)

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.