From 1753b744746699fd00922b6e5834659de44f6d76 Mon Sep 17 00:00:00 2001
From: "Endi S. Dewata" <edewata@redhat.com>
Date: Thu, 29 Aug 2024 14:01:19 -0500
Subject: [PATCH] Reorganize Tomcat 9.0 files

---
 .github/workflows/tomcat-tests.yml                   |  6 ++++++
 tomcat-9.0/pom.xml                                   | 12 ++++++++++++
 .../org/dogtagpki/jss/tomcat/Http11NioProtocol.java  |  0
 .../java/org/dogtagpki/jss/tomcat/JSSListener.java   |  0
 .../org/dogtagpki/jss/tomcat/JSSNioEndpoint.java     |  0
 .../dogtagpki/jss/tomcat/JSSSecureNioChannel.java    |  0
 tomcat/pom.xml                                       | 12 ------------
 7 files changed, 18 insertions(+), 12 deletions(-)
 rename {tomcat => tomcat-9.0}/src/main/java/org/dogtagpki/jss/tomcat/Http11NioProtocol.java (100%)
 rename {tomcat => tomcat-9.0}/src/main/java/org/dogtagpki/jss/tomcat/JSSListener.java (100%)
 rename {tomcat => tomcat-9.0}/src/main/java/org/dogtagpki/jss/tomcat/JSSNioEndpoint.java (100%)
 rename {tomcat => tomcat-9.0}/src/main/java/org/dogtagpki/jss/tomcat/JSSSecureNioChannel.java (100%)

diff --git a/.github/workflows/tomcat-tests.yml b/.github/workflows/tomcat-tests.yml
index 45c400996..1d113fadd 100644
--- a/.github/workflows/tomcat-tests.yml
+++ b/.github/workflows/tomcat-tests.yml
@@ -121,6 +121,7 @@ jobs:
               --keyAlias sslserver \
               --keystoreType pkcs11 \
               --keystoreProvider Mozilla-JSS
+          docker exec server cat /etc/pki/pki-tomcat/server.xml
 
       - name: Start Tomcat
         run: |
@@ -206,6 +207,11 @@ jobs:
         run: |
           docker exec server pki-server remove -v
 
+      - name: Check PKI server systemd journal
+        if: always()
+        run: |
+          docker exec server journalctl -x --no-pager -u pki-tomcatd@pki-tomcat.service
+
       - name: Gather artifacts from server container
         if: always()
         run: |
diff --git a/tomcat-9.0/pom.xml b/tomcat-9.0/pom.xml
index 70c19f182..f0afa889c 100644
--- a/tomcat-9.0/pom.xml
+++ b/tomcat-9.0/pom.xml
@@ -16,6 +16,18 @@
 
     <dependencies>
 
+        <dependency>
+            <groupId>org.apache.tomcat</groupId>
+            <artifactId>tomcat-catalina</artifactId>
+            <version>9.0.83</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tomcat</groupId>
+            <artifactId>tomcat-coyote</artifactId>
+            <version>9.0.62</version>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.tomcat</groupId>
             <artifactId>tomcat-juli</artifactId>
diff --git a/tomcat/src/main/java/org/dogtagpki/jss/tomcat/Http11NioProtocol.java b/tomcat-9.0/src/main/java/org/dogtagpki/jss/tomcat/Http11NioProtocol.java
similarity index 100%
rename from tomcat/src/main/java/org/dogtagpki/jss/tomcat/Http11NioProtocol.java
rename to tomcat-9.0/src/main/java/org/dogtagpki/jss/tomcat/Http11NioProtocol.java
diff --git a/tomcat/src/main/java/org/dogtagpki/jss/tomcat/JSSListener.java b/tomcat-9.0/src/main/java/org/dogtagpki/jss/tomcat/JSSListener.java
similarity index 100%
rename from tomcat/src/main/java/org/dogtagpki/jss/tomcat/JSSListener.java
rename to tomcat-9.0/src/main/java/org/dogtagpki/jss/tomcat/JSSListener.java
diff --git a/tomcat/src/main/java/org/dogtagpki/jss/tomcat/JSSNioEndpoint.java b/tomcat-9.0/src/main/java/org/dogtagpki/jss/tomcat/JSSNioEndpoint.java
similarity index 100%
rename from tomcat/src/main/java/org/dogtagpki/jss/tomcat/JSSNioEndpoint.java
rename to tomcat-9.0/src/main/java/org/dogtagpki/jss/tomcat/JSSNioEndpoint.java
diff --git a/tomcat/src/main/java/org/dogtagpki/jss/tomcat/JSSSecureNioChannel.java b/tomcat-9.0/src/main/java/org/dogtagpki/jss/tomcat/JSSSecureNioChannel.java
similarity index 100%
rename from tomcat/src/main/java/org/dogtagpki/jss/tomcat/JSSSecureNioChannel.java
rename to tomcat-9.0/src/main/java/org/dogtagpki/jss/tomcat/JSSSecureNioChannel.java
diff --git a/tomcat/pom.xml b/tomcat/pom.xml
index f4935827f..071db9ad0 100644
--- a/tomcat/pom.xml
+++ b/tomcat/pom.xml
@@ -16,18 +16,6 @@
 
     <dependencies>
 
-        <dependency>
-            <groupId>org.apache.tomcat</groupId>
-            <artifactId>tomcat-catalina</artifactId>
-            <version>9.0.83</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tomcat</groupId>
-            <artifactId>tomcat-coyote</artifactId>
-            <version>9.0.62</version>
-        </dependency>
-
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>jss-base</artifactId>