Reorganize Tomcat 9.0 files

dogtagpki · Aug 30, 2024 · f3c1ec9 · f3c1ec9
1 parent d1f8c50
commit f3c1ec9
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 18 deletions.
diff --git a/base/tomcat-9.0/pom.xml b/base/tomcat-9.0/pom.xml
@@ -16,12 +16,36 @@
 
     <dependencies>
 
+        <dependency>
+            <groupId>org.apache.tomcat</groupId>
+            <artifactId>tomcat-catalina</artifactId>
+            <version>9.0.62</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tomcat</groupId>
+            <artifactId>tomcat-servlet-api</artifactId>
+            <version>9.0.62</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tomcat</groupId>
+            <artifactId>tomcat-jaspic-api</artifactId>
+            <version>9.0.62</version>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.tomcat</groupId>
             <artifactId>tomcat-util-scan</artifactId>
             <version>9.0.62</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.dogtagpki.jss</groupId>
+            <artifactId>jss-tomcat-9.0</artifactId>
+            <version>[5.5.0-SNAPSHOT,)</version>
+        </dependency>
+
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>pki-tomcat</artifactId>

diff --git a/.../cms/tomcat/AbstractPKIAuthenticator.java → .../cms/tomcat/AbstractPKIAuthenticator.java b/.../cms/tomcat/AbstractPKIAuthenticator.java → .../cms/tomcat/AbstractPKIAuthenticator.java
diff --git a/...s/tomcat/ExternalAuthenticationValve.java → ...s/tomcat/ExternalAuthenticationValve.java b/...s/tomcat/ExternalAuthenticationValve.java → ...s/tomcat/ExternalAuthenticationValve.java
diff --git a/...etscape/cms/tomcat/ExternalPrincipal.java → ...etscape/cms/tomcat/ExternalPrincipal.java b/...etscape/cms/tomcat/ExternalPrincipal.java → ...etscape/cms/tomcat/ExternalPrincipal.java
diff --git a/.../com/netscape/cms/tomcat/PKIListener.java → .../com/netscape/cms/tomcat/PKIListener.java b/.../com/netscape/cms/tomcat/PKIListener.java → .../com/netscape/cms/tomcat/PKIListener.java
diff --git a/base/tomcat/pom.xml b/base/tomcat/pom.xml
@@ -16,24 +16,6 @@
 
     <dependencies>
 
-        <dependency>
-            <groupId>org.apache.tomcat</groupId>
-            <artifactId>tomcat-catalina</artifactId>
-            <version>9.0.62</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tomcat</groupId>
-            <artifactId>tomcat-servlet-api</artifactId>
-            <version>9.0.62</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tomcat</groupId>
-            <artifactId>tomcat-jaspic-api</artifactId>
-            <version>9.0.62</version>
-        </dependency>
-
         <dependency>
             <groupId>org.dogtagpki.jss</groupId>
             <artifactId>jss-tomcat</artifactId>