Reorganize Tomcat 9.0 files

dogtagpki · Aug 30, 2024 · 1753b74 · 1753b74
1 parent 848846d
commit 1753b74
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 12 deletions.
diff --git 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
@@ -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/...gtagpki/jss/tomcat/Http11NioProtocol.java → ...gtagpki/jss/tomcat/Http11NioProtocol.java b/...gtagpki/jss/tomcat/Http11NioProtocol.java → ...gtagpki/jss/tomcat/Http11NioProtocol.java
diff --git a/...org/dogtagpki/jss/tomcat/JSSListener.java → ...org/dogtagpki/jss/tomcat/JSSListener.java b/...org/dogtagpki/jss/tomcat/JSSListener.java → ...org/dogtagpki/jss/tomcat/JSSListener.java
diff --git a/.../dogtagpki/jss/tomcat/JSSNioEndpoint.java → .../dogtagpki/jss/tomcat/JSSNioEndpoint.java b/.../dogtagpki/jss/tomcat/JSSNioEndpoint.java → .../dogtagpki/jss/tomcat/JSSNioEndpoint.java
diff --git a/...agpki/jss/tomcat/JSSSecureNioChannel.java → ...agpki/jss/tomcat/JSSSecureNioChannel.java b/...agpki/jss/tomcat/JSSSecureNioChannel.java → ...agpki/jss/tomcat/JSSSecureNioChannel.java
diff --git 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>