upgraded tomcat to v10

Dockerfile

@@ -1,32 +1,53 @@
 
-FROM ubuntu:${ubuntu.version}
+FROM docker.inteligr8.com/inteligr8/jdk-hotswap:${jdk-hotswap.version}
-
-RUN apt update
-RUN apt -y install openjdk-${java.majorVersion}-jdk
-RUN apt -y install tomcat${tomcat.majorVersion}
 
+# Configure the Apache Tomcat Catalina script
 ENV JAVA_MEMORY_INIT=128m
 ENV JAVA_MEMORY_MAX=512m
-ENV JAVA_HOME="/usr/lib/jvm/java-${java.majorVersion}-openjdk-amd64"
+ENV CATALINA_HOME="/usr/local/share/tomcat"
-ENV CATALINA_HOME="/usr/share/tomcat${tomcat.majorVersion}"
+ENV CATALINA_BASE="/var/lib/tomcat"
-ENV CATALINA_BASE="/var/lib/tomcat${tomcat.majorVersion}"
 ENV CATALINA_OPTS=
 
-ADD docker-entrypoint.sh /usr/local/bin
+# Download & Install Apache Tomcat
+RUN mkdir -p /usr/local/share && \
+        curl -L ${tomcat.mirror.baseUrl}/tomcat-${tomcat.majorVersion}/v${tomcat.version}/bin/apache-tomcat-${tomcat.version}.tar.gz -o /usr/local/share/apache-tomcat.tar.gz && \
+        cd /usr/local/share && tar xzvf apache-tomcat.tar.gz && mv apache-tomcat-${tomcat.version} tomcat && rm apache-tomcat.tar.gz
 
-# This will give us dynamic injection points into the running webapps
+# Split Catalina Home & Base
-COPY tomcat-context.xml /etc/tomcat${tomcat.majorVersion}/context.xml
+RUN cd /usr/local/share/tomcat && \
+        mv webapps webapps.ignore && \
+        mkdir -p /var/lib/tomcat/webapps /var/lib/tomcat/lib /var/lib/tomcat/dev && \
+        mv conf work temp logs /var/lib/tomcat
 
-# We need to create all possible mapped directories
+# Add directories for dynamic injection points
-RUN cd /var/lib/tomcat${tomcat.majorVersion} && \
+RUN cd /var/lib/tomcat/dev && \
-	rm -rf webapps/ROOT* && \
-        mkdir dev && cd dev && \
         mkdir classes classes-extra1 classes-extra2 classes-extra3 classes-extra4 classes-extra5 classes-extra6 classes-extra7 && \
+        mkdir post-rsrc post-rsrc-extra1 post-rsrc-extra2 post-rsrc-extra3 && \
         mkdir lib lib-extra1 lib-extra2 lib-extra3 lib-extra4 lib-extra5 lib-extra6 lib-extra7 && \
+        mkdir post-lib post-lib-extra1 post-lib-extra2 post-lib-extra3 && \
         mkdir web web-extra1 web-extra2 web-extra3 web-extra4 web-extra5 web-extra6 web-extra7
 
+# Add our Docker container initialization script
+ADD maven/target/setenv.sh /usr/local/bin/${namespace.prefix}-setenv.sh
+COPY maven/target/docker-entrypoint.sh /usr/local/bin
+RUN chmod 755 /usr/local/bin/docker-entrypoint.sh
+
+# Add our Apache Tomcat configuration
+#   This gives us dynamic injection points into the running webapps
+COPY maven/target/tomcat-context.xml /var/lib/tomcat/conf/context.xml
+ADD maven/target/hotswap-agent.properties /var/lib/tomcat/lib
+
+# Listening for HTTP (not HTTPS) traffic
 EXPOSE 8080
+
+# Listening for Java debugger traffic
 EXPOSE 8000
 
+# Running as ROOT user for now
+#USER tomcat
+
+# Execute the Docker container initialization script
 ENTRYPOINT [ "/usr/local/bin/docker-entrypoint.sh" ]
-CMD [ "/usr/share/tomcat${tomcat.majorVersion}/bin/catalina.sh", "run" ]
+
+# Start the Apache Tomcat web container using the Catalina script
+CMD [ "/usr/local/share/tomcat/bin/catalina.sh", "run" ]

README.md

@@ -0,0 +1,43 @@
+
+# Apache Tomcat Application Container Image with Hot-Reloading
+
+This project creates a Docker image that has uses the [Java Hotswap Docker Image](/inteligr8/jdk-hotswap-docker) to support hot-reloading for the enablement of rapid application development.  As a Docker image, containers can be started to facilitate development without requiring complicated installations on developer workstations.
+
+It is expected that containers are configured in Maven using the Fabric8 or Spotify Docker plugins.  These configurations should expose the 8080 (HTTP) and 8000 (debugger) ports and any other port that the application may open.  Most importantly, it should mount/bind the source code to the following possible paths.
+
+| Directory                              | Type      | Hot-Reloaded | When |
+| -------------------------------------- |:---------:|:------------:|:----:|
+| `/var/lib/tomcat/dev/classes`          | Classpath | Yes          | Before WAR |
+| `/var/lib/tomcat/dev/classes-extra1`   | Classpath | Yes          | Before WAR |
+| `/var/lib/tomcat/dev/classes-extra2`   | Classpath | Yes          | Before WAR |
+| `/var/lib/tomcat/dev/classes-extra3`   | Classpath | Yes          | Before WAR |
+| `/var/lib/tomcat/dev/classes-extra4`   | Classpath | Yes          | Before WAR |
+| `/var/lib/tomcat/dev/classes-extra5`   | Classpath | Yes          | Before WAR |
+| `/var/lib/tomcat/dev/classes-extra6`   | Classpath | Yes          | Before WAR |
+| `/var/lib/tomcat/dev/classes-extra7`   | Classpath | Yes          | Before WAR |
+| `/var/lib/tomcat/dev/post-rsrc`        | Classpath | Yes          | After WAR  |
+| `/var/lib/tomcat/dev/post-rsrc-extra1` | Classpath | Yes          | After WAR  |
+| `/var/lib/tomcat/dev/post-rsrc-extra2` | Classpath | Yes          | After WAR  |
+| `/var/lib/tomcat/dev/post-rsrc-extra3` | Classpath | Yes          | After WAR  |
+| `/var/lib/tomcat/dev/lib`              | JARs      | No           | Before WAR |
+| `/var/lib/tomcat/dev/lib-extra1`       | JARs      | No           | Before WAR |
+| `/var/lib/tomcat/dev/lib-extra2`       | JARs      | No           | Before WAR |
+| `/var/lib/tomcat/dev/lib-extra3`       | JARs      | No           | Before WAR |
+| `/var/lib/tomcat/dev/lib-extra4`       | JARs      | No           | Before WAR |
+| `/var/lib/tomcat/dev/lib-extra5`       | JARs      | No           | Before WAR |
+| `/var/lib/tomcat/dev/lib-extra6`       | JARs      | No           | Before WAR |
+| `/var/lib/tomcat/dev/lib-extra7`       | JARs      | No           | Before WAR |
+| `/var/lib/tomcat/dev/post-lib`         | JARs      | No           | After WAR |
+| `/var/lib/tomcat/dev/post-lib-extra1`  | JARs      | No           | After WAR |
+| `/var/lib/tomcat/dev/post-lib-extra2`  | JARs      | No           | After WAR |
+| `/var/lib/tomcat/dev/post-lib-extra3`  | JARs      | No           | After WAR |
+| `/var/lib/tomcat/dev/web`              | Web       | Yes          | Before WAR |
+| `/var/lib/tomcat/dev/web-extra1`       | Web       | No           | Before WAR |
+| `/var/lib/tomcat/dev/web-extra2`       | Web       | NO           | Before WAR |
+| `/var/lib/tomcat/dev/web-extra3`       | Web       | NO           | Before WAR |
+| `/var/lib/tomcat/dev/web-extra4`       | Web       | No           | Before WAR |
+| `/var/lib/tomcat/dev/web-extra5`       | Web       | No           | Before WAR |
+| `/var/lib/tomcat/dev/web-extra6`       | Web       | No           | Before WAR |
+| `/var/lib/tomcat/dev/web-extra7`       | Web       | No           | Before WAR |
+
+You may include your own `hotswap-agent.properties` in any of the `classes` folders.  The one loaded by default is usually sufficient.  It most notably disables the Hotswap Agent Hibernate plugin.

docker-entrypoint.sh

@@ -1,4 +1,5 @@
-#!/bin/bash
+#!/bin/sh
-CATALINA_OPTS="-Xms${JAVA_MEMORY_INIT} -Xmx${JAVA_MEMORY_MAX} -agentlib:jdwp=transport=dt_socket,address=8000,server=y,suspend=n $CATALINA_OPTS"
+. /usr/local/bin/jdk-hotswap-setenv.sh
+. /usr/local/bin/${namespace.prefix}-setenv.sh
 
 exec "$@"

hotswap-agent.properties

@@ -7,7 +7,18 @@
 # This may be useful for example in multi module maven project to load class changes from upstream project
 # classes. Set extraClasspath to upstream project compiler output and .class file will have precedence to
 # classes from built JAR file.
-extraClasspath=/var/lib/tomcat9/dev/classes
+extraClasspath=/var/lib/tomcat/dev/classes; \
+/var/lib/tomcat/dev/classes-extra1; \
+/var/lib/tomcat/dev/classes-extra2; \
+/var/lib/tomcat/dev/classes-extra3; \
+/var/lib/tomcat/dev/classes-extra4; \
+/var/lib/tomcat/dev/classes-extra5; \
+/var/lib/tomcat/dev/classes-extra6; \
+/var/lib/tomcat/dev/classes-extra7; \
+/var/lib/tomcat/dev/post-rsrc; \
+/var/lib/tomcat/dev/post-rsrc-extra1; \
+/var/lib/tomcat/dev/post-rsrc-extra2; \
+/var/lib/tomcat/dev/post-rsrc-extra3
 
 # Watch for changes in a directory (resources only). If not set, changes of resources won't be observed.
 #
@@ -19,19 +30,37 @@ extraClasspath=/var/lib/tomcat9/dev/classes
 # replacements of resources in a building step (maven filtering resource option).
 # This setting will leave i.e. src/target/classes as default source for resources, but after the resource is modified
 # in src/main/resources, the new changed resource is served instead.
-watchResources=
+watchResources=/var/lib/tomcat/dev/classes; \
+/var/lib/tomcat/dev/classes-extra1; \
+/var/lib/tomcat/dev/classes-extra2; \
+/var/lib/tomcat/dev/classes-extra3; \
+/var/lib/tomcat/dev/classes-extra4; \
+/var/lib/tomcat/dev/classes-extra5; \
+/var/lib/tomcat/dev/classes-extra6; \
+/var/lib/tomcat/dev/classes-extra7; \
+/var/lib/tomcat/dev/post-rsrc; \
+/var/lib/tomcat/dev/post-rsrc-extra1; \
+/var/lib/tomcat/dev/post-rsrc-extra2; \
+/var/lib/tomcat/dev/post-rsrc-extra3
 
 # Load static web resources from different directory.
 #
 # This setting is dependent on application server plugin(Jetty, Tomcat, ...).
 # Jboss and Glassfish are not yet supported.
 # Use this setting to set to serve resources from source directory directly (e.g. src/main/webapp).
-webappDir=
+webappDir=/var/lib/tomcat/dev/web
+#/var/lib/tomcat/dev/web-extra1; \
+#/var/lib/tomcat/dev/web-extra2; \
+#/var/lib/tomcat/dev/web-extra3; \
+#/var/lib/tomcat/dev/web-extra4; \
+#/var/lib/tomcat/dev/web-extra5; \
+#/var/lib/tomcat/dev/web-extra6; \
+#/var/lib/tomcat/dev/web-extra7
 
 
 # Comma separated list of disabled plugins
 # Use plugin name - e.g. Hibernate, Spring, ZK, Hotswapper, AnonymousClassPatch, Tomcat, Logback ....
-disabledPlugins=
+disabledPlugins=${hotswap.disablePlugins}
 
 # Watch for changed class files on watchResources path and reload class definition in the running application.
 #
@@ -54,7 +83,7 @@ autoHotswap=true
 #
 # You need to specify JPDA port at startup
 # <pre>java -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8000</pre>
-# autoHotswap.port=8000
+autoHotswap.port=8000
 
 # Enables debugging in OsgiEquinox
 # osgiEquinox.debugMode=true

pom.xml

@@ -3,25 +3,63 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.inteligr8</groupId>
     <artifactId>tomcat-rad</artifactId>
-    <version>9-1.1</version>
+    <version>10-2.1</version>
     <name>Apache Tomcat for Rapid Application Development</name>
     <packaging>pom</packaging>
 
     <properties>
-        <ubuntu.version>20.04</ubuntu.version>
+        <!-- The release version of the Java Hotswap Docker image -->
-        <java.majorVersion>11</java.majorVersion>
+        <!-- See: https://bitbucket.org/inteligr8/jdk-hotswap-docker -->
-        <tomcat.majorVersion>9</tomcat.majorVersion>
+        <jdk-hotswap.version>1.4.1-jbr-17.0.11</jdk-hotswap.version>
+
+        <namespace.prefix>tomcat-rad</namespace.prefix>
+
+        <!-- The version of Apache Tomcat to serve as the basis of this Docker image -->
+        <!-- See: https://tomcat.apache.org/download-90.cgi -->
+        <tomcat.version>10.1.28</tomcat.version>
+        <tomcat.majorVersion>10</tomcat.majorVersion>
+        <tomcat.mirror.baseUrl>https://apache.osuosl.org/tomcat</tomcat.mirror.baseUrl>
+
+        <!-- The Docker image meta-data for pushing the build -->
         <image.name>inteligr8/${project.artifactId}</image.name>
         <image.tag>${project.version}</image.tag>
         <image.registry>docker.inteligr8.com</image.registry>
     </properties>
 
     <build>
+        <resources>
+            <resource>
+                <directory>.</directory>
+                <includes>
+                    <include>*.sh</include>
+                    <include>*.properties</include>
+                    <include>*.xml</include>
+                </includes>
+                <filtering>true</filtering>
+                <targetPath>${project.build.directory}</targetPath>
+            </resource>
+        </resources>
         <plugins>
             <plugin>
-                <groupId>io.fabric8</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
-                <artifactId>fabric8-maven-plugin</artifactId>
+                <version>3.3.1</version>
-                <version>4.4.0</version>
+                <executions>
+                    <execution>
+                        <id>copy-resources</id>
+                        <phase>process-resources</phase>
+                        <goals><goal>resources</goal></goals>
+                        <configuration>
+                            <encoding>utf-8</encoding>
+                            <propertiesEncoding>utf-8</propertiesEncoding>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <!-- This plugin build and pushes the Docker image -->
+            <plugin>
+                <groupId>org.eclipse.jkube</groupId>
+                <artifactId>kubernetes-maven-plugin</artifactId>
+                <version>1.16.2</version>
                 <configuration>
                     <images>
                         <image>
@@ -30,13 +68,17 @@
                         </image>
                     </images>
                     <contextDir>${basedir}</contextDir>
+                    <buildStrategy>docker</buildStrategy>
+                    <verbose>true</verbose>
                 </configuration>
                 <executions>
+                    <!-- This execution builds the Docker image -->
                     <execution>
                         <id>docker-build</id>
                         <phase>package</phase>
                         <goals><goal>build</goal></goals>
                     </execution>
+                    <!-- This execution pushes the built Docker image to the configured Docker Registry -->
                     <execution>
                         <id>docker-push</id>
                         <phase>deploy</phase>
@@ -44,8 +86,10 @@
                     </execution>
                 </executions>
             </plugin>
+            <!-- This plugin prevents the project from deploying to the Maven Repository, as it is pointless -->
             <plugin>
             	<artifactId>maven-deploy-plugin</artifactId>
+                <version>3.1.2</version>
             	<configuration>
             		<skip>true</skip>
             	</configuration>
@@ -55,10 +99,9 @@
 
     <profiles>
         <profile>
-            <id>use-local-docker</id>
+            <id>no-docker</id>
             <properties>
-                <fabric8.build.jib>false</fabric8.build.jib>
+                <fabric8.build.jib>true</fabric8.build.jib>
-                <fabric8.build.strategy>docker</fabric8.build.strategy>
             </properties>
         </profile>
     </profiles>

setenv.sh

@@ -0,0 +1,3 @@
+#!/bin/sh
+CATALINA_OPTS="${JAVA_OPTS} ${CATALINA_OPTS}"
+JAVA_OPTS=""

tomcat-context.xml

@@ -16,7 +16,7 @@
   limitations under the License.
 -->
 <!-- The contents of this file will be loaded for each web application -->
-<Context reloadable="true">
+<Context reloadable="false">
 
     <!-- Default set of monitored resources. If one of these changes, the    -->
     <!-- web application will be reloaded.                                   -->
@@ -32,31 +32,39 @@
 
     <Resources cachingAllowed="false">
         <!-- Injection points for classpath -->
-        <PreResources base="/var/lib/tomcat9/dev/classes" className="org.apache.catalina.webresources.DirResourceSet" webAppMount="/WEB-INF/classes" />
+        <PreResources base="/var/lib/tomcat/dev/classes" className="org.apache.catalina.webresources.DirResourceSet" webAppMount="/WEB-INF/classes" />
-        <PreResources base="/var/lib/tomcat9/dev/classes-extra1" className="org.apache.catalina.webresources.DirResourceSet" webAppMount="/WEB-INF/classes" />
+        <PreResources base="/var/lib/tomcat/dev/classes-extra1" className="org.apache.catalina.webresources.DirResourceSet" webAppMount="/WEB-INF/classes" />
-        <PreResources base="/var/lib/tomcat9/dev/classes-extra2" className="org.apache.catalina.webresources.DirResourceSet" webAppMount="/WEB-INF/classes" />
+        <PreResources base="/var/lib/tomcat/dev/classes-extra2" className="org.apache.catalina.webresources.DirResourceSet" webAppMount="/WEB-INF/classes" />
-        <PreResources base="/var/lib/tomcat9/dev/classes-extra3" className="org.apache.catalina.webresources.DirResourceSet" webAppMount="/WEB-INF/classes" />
+        <PreResources base="/var/lib/tomcat/dev/classes-extra3" className="org.apache.catalina.webresources.DirResourceSet" webAppMount="/WEB-INF/classes" />
-        <PreResources base="/var/lib/tomcat9/dev/classes-extra4" className="org.apache.catalina.webresources.DirResourceSet" webAppMount="/WEB-INF/classes" />
+        <PreResources base="/var/lib/tomcat/dev/classes-extra4" className="org.apache.catalina.webresources.DirResourceSet" webAppMount="/WEB-INF/classes" />
-        <PreResources base="/var/lib/tomcat9/dev/classes-extra5" className="org.apache.catalina.webresources.DirResourceSet" webAppMount="/WEB-INF/classes" />
+        <PreResources base="/var/lib/tomcat/dev/classes-extra5" className="org.apache.catalina.webresources.DirResourceSet" webAppMount="/WEB-INF/classes" />
-        <PreResources base="/var/lib/tomcat9/dev/classes-extra6" className="org.apache.catalina.webresources.DirResourceSet" webAppMount="/WEB-INF/classes" />
+        <PreResources base="/var/lib/tomcat/dev/classes-extra6" className="org.apache.catalina.webresources.DirResourceSet" webAppMount="/WEB-INF/classes" />
-        <PreResources base="/var/lib/tomcat9/dev/classes-extra7" className="org.apache.catalina.webresources.DirResourceSet" webAppMount="/WEB-INF/classes" />
+        <PreResources base="/var/lib/tomcat/dev/classes-extra7" className="org.apache.catalina.webresources.DirResourceSet" webAppMount="/WEB-INF/classes" />
+        <PostResources base="/var/lib/tomcat/dev/post-rsrc" className="org.apache.catalina.webresources.DirResourceSet" webAppMount="/WEB-INF/classes" />
+        <PostResources base="/var/lib/tomcat/dev/post-rsrc-extra1" className="org.apache.catalina.webresources.DirResourceSet" webAppMount="/WEB-INF/classes" />
+        <PostResources base="/var/lib/tomcat/dev/post-rsrc-extra2" className="org.apache.catalina.webresources.DirResourceSet" webAppMount="/WEB-INF/classes" />
+        <PostResources base="/var/lib/tomcat/dev/post-rsrc-extra3" className="org.apache.catalina.webresources.DirResourceSet" webAppMount="/WEB-INF/classes" />
         <!-- Injection point for JARs -->
-        <PreResources base="/var/lib/tomcat9/dev/lib" className="org.apache.catalina.webresources.DirResourceSet" webAppMount="/WEB-INF/lib" />
+        <PreResources base="/var/lib/tomcat/dev/lib" className="org.apache.catalina.webresources.DirResourceSet" webAppMount="/WEB-INF/lib" />
-        <PreResources base="/var/lib/tomcat9/dev/lib-extra1" className="org.apache.catalina.webresources.DirResourceSet" webAppMount="/WEB-INF/lib" />
+        <PreResources base="/var/lib/tomcat/dev/lib-extra1" className="org.apache.catalina.webresources.DirResourceSet" webAppMount="/WEB-INF/lib" />
-        <PreResources base="/var/lib/tomcat9/dev/lib-extra2" className="org.apache.catalina.webresources.DirResourceSet" webAppMount="/WEB-INF/lib" />
+        <PreResources base="/var/lib/tomcat/dev/lib-extra2" className="org.apache.catalina.webresources.DirResourceSet" webAppMount="/WEB-INF/lib" />
-        <PreResources base="/var/lib/tomcat9/dev/lib-extra3" className="org.apache.catalina.webresources.DirResourceSet" webAppMount="/WEB-INF/lib" />
+        <PreResources base="/var/lib/tomcat/dev/lib-extra3" className="org.apache.catalina.webresources.DirResourceSet" webAppMount="/WEB-INF/lib" />
-        <PreResources base="/var/lib/tomcat9/dev/lib-extra4" className="org.apache.catalina.webresources.DirResourceSet" webAppMount="/WEB-INF/lib" />
+        <PreResources base="/var/lib/tomcat/dev/lib-extra4" className="org.apache.catalina.webresources.DirResourceSet" webAppMount="/WEB-INF/lib" />
-        <PreResources base="/var/lib/tomcat9/dev/lib-extra5" className="org.apache.catalina.webresources.DirResourceSet" webAppMount="/WEB-INF/lib" />
+        <PreResources base="/var/lib/tomcat/dev/lib-extra5" className="org.apache.catalina.webresources.DirResourceSet" webAppMount="/WEB-INF/lib" />
-        <PreResources base="/var/lib/tomcat9/dev/lib-extra6" className="org.apache.catalina.webresources.DirResourceSet" webAppMount="/WEB-INF/lib" />
+        <PreResources base="/var/lib/tomcat/dev/lib-extra6" className="org.apache.catalina.webresources.DirResourceSet" webAppMount="/WEB-INF/lib" />
-        <PreResources base="/var/lib/tomcat9/dev/lib-extra7" className="org.apache.catalina.webresources.DirResourceSet" webAppMount="/WEB-INF/lib" />
+        <PreResources base="/var/lib/tomcat/dev/lib-extra7" className="org.apache.catalina.webresources.DirResourceSet" webAppMount="/WEB-INF/lib" />
+        <PostResources base="/var/lib/tomcat/dev/post-lib" className="org.apache.catalina.webresources.DirResourceSet" webAppMount="/WEB-INF/lib" />
+        <PostResources base="/var/lib/tomcat/dev/post-lib-extra1" className="org.apache.catalina.webresources.DirResourceSet" webAppMount="/WEB-INF/lib" />
+        <PostResources base="/var/lib/tomcat/dev/post-lib-extra2" className="org.apache.catalina.webresources.DirResourceSet" webAppMount="/WEB-INF/lib" />
+        <PostResources base="/var/lib/tomcat/dev/post-lib-extra3" className="org.apache.catalina.webresources.DirResourceSet" webAppMount="/WEB-INF/lib" />
         <!-- Injection points for web -->
-        <PreResources base="/var/lib/tomcat9/dev/web" className="org.apache.catalina.webresources.DirResourceSet" webAppMount="/" />
+        <PreResources base="/var/lib/tomcat/dev/web" className="org.apache.catalina.webresources.DirResourceSet" webAppMount="/" />
-        <PreResources base="/var/lib/tomcat9/dev/web-extra1" className="org.apache.catalina.webresources.DirResourceSet" webAppMount="/" />
+        <PreResources base="/var/lib/tomcat/dev/web-extra1" className="org.apache.catalina.webresources.DirResourceSet" webAppMount="/" />
-        <PreResources base="/var/lib/tomcat9/dev/web-extra2" className="org.apache.catalina.webresources.DirResourceSet" webAppMount="/" />
+        <PreResources base="/var/lib/tomcat/dev/web-extra2" className="org.apache.catalina.webresources.DirResourceSet" webAppMount="/" />
-        <PreResources base="/var/lib/tomcat9/dev/web-extra3" className="org.apache.catalina.webresources.DirResourceSet" webAppMount="/" />
+        <PreResources base="/var/lib/tomcat/dev/web-extra3" className="org.apache.catalina.webresources.DirResourceSet" webAppMount="/" />
-        <PreResources base="/var/lib/tomcat9/dev/web-extra4" className="org.apache.catalina.webresources.DirResourceSet" webAppMount="/" />
+        <PreResources base="/var/lib/tomcat/dev/web-extra4" className="org.apache.catalina.webresources.DirResourceSet" webAppMount="/" />
-        <PreResources base="/var/lib/tomcat9/dev/web-extra5" className="org.apache.catalina.webresources.DirResourceSet" webAppMount="/" />
+        <PreResources base="/var/lib/tomcat/dev/web-extra5" className="org.apache.catalina.webresources.DirResourceSet" webAppMount="/" />
-        <PreResources base="/var/lib/tomcat9/dev/web-extra6" className="org.apache.catalina.webresources.DirResourceSet" webAppMount="/" />
+        <PreResources base="/var/lib/tomcat/dev/web-extra6" className="org.apache.catalina.webresources.DirResourceSet" webAppMount="/" />
-        <PreResources base="/var/lib/tomcat9/dev/web-extra7" className="org.apache.catalina.webresources.DirResourceSet" webAppMount="/" />
+        <PreResources base="/var/lib/tomcat/dev/web-extra7" className="org.apache.catalina.webresources.DirResourceSet" webAppMount="/" />
     </Resources>
 </Context>

tomcat-server.xml

@@ -1,171 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<!-- Note:  A "Server" is not itself a "Container", so you may not
-     define subcomponents such as "Valves" at this level.
-     Documentation at /docs/config/server.html
- -->
-<Server port="-1" shutdown="SHUTDOWN">
-  <Listener className="org.apache.catalina.startup.VersionLoggerListener" />
-  <!-- Security listener. Documentation at /docs/config/listeners.html
-  <Listener className="org.apache.catalina.security.SecurityListener" />
-  -->
-  <!--APR library loader. Documentation at /docs/apr.html -->
-  <Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" />
-  <!-- Prevent memory leaks due to use of particular java/javax APIs-->
-  <Listener className="org.apache.catalina.core.JreMemoryLeakPreventionListener" />
-  <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" />
-  <Listener className="org.apache.catalina.core.ThreadLocalLeakPreventionListener" />
-
-  <!-- Global JNDI resources
-       Documentation at /docs/jndi-resources-howto.html
-  -->
-  <GlobalNamingResources>
-    <!-- Editable user database that can also be used by
-         UserDatabaseRealm to authenticate users
-    -->
-    <Resource name="UserDatabase" auth="Container"
-              type="org.apache.catalina.UserDatabase"
-              description="User database that can be updated and saved"
-              factory="org.apache.catalina.users.MemoryUserDatabaseFactory"
-              pathname="conf/tomcat-users.xml" />
-  </GlobalNamingResources>
-
-  <!-- A "Service" is a collection of one or more "Connectors" that share
-       a single "Container" Note:  A "Service" is not itself a "Container",
-       so you may not define subcomponents such as "Valves" at this level.
-       Documentation at /docs/config/service.html
-   -->
-  <Service name="Catalina">
-
-    <!--The connectors can use a shared executor, you can define one or more named thread pools-->
-    <!--
-    <Executor name="tomcatThreadPool" namePrefix="catalina-exec-"
-        maxThreads="150" minSpareThreads="4"/>
-    -->
-
-
-    <!-- A "Connector" represents an endpoint by which requests are received
-         and responses are returned. Documentation at :
-         Java HTTP Connector: /docs/config/http.html
-         Java AJP  Connector: /docs/config/ajp.html
-         APR (HTTP/AJP) Connector: /docs/apr.html
-         Define a non-SSL/TLS HTTP/1.1 Connector on port 8080
-    -->
-    <Connector port="8080" protocol="HTTP/1.1"
-               connectionTimeout="20000"
-               redirectPort="8443" />
-    <!-- A "Connector" using the shared thread pool-->
-    <!--
-    <Connector executor="tomcatThreadPool"
-               port="8080" protocol="HTTP/1.1"
-               connectionTimeout="20000"
-               redirectPort="8443" />
-    -->
-    <!-- Define an SSL/TLS HTTP/1.1 Connector on port 8443
-         This connector uses the NIO implementation. The default
-         SSLImplementation will depend on the presence of the APR/native
-         library and the useOpenSSL attribute of the
-         AprLifecycleListener.
-         Either JSSE or OpenSSL style configuration may be used regardless of
-         the SSLImplementation selected. JSSE style configuration is used below.
-    -->
-    <!--
-    <Connector port="8443" protocol="org.apache.coyote.http11.Http11NioProtocol"
-               maxThreads="150" SSLEnabled="true">
-        <SSLHostConfig>
-            <Certificate certificateKeystoreFile="conf/localhost-rsa.jks"
-                         type="RSA" />
-        </SSLHostConfig>
-    </Connector>
-    -->
-    <!-- Define an SSL/TLS HTTP/1.1 Connector on port 8443 with HTTP/2
-         This connector uses the APR/native implementation which always uses
-         OpenSSL for TLS.
-         Either JSSE or OpenSSL style configuration may be used. OpenSSL style
-         configuration is used below.
-    -->
-    <!--
-    <Connector port="8443" protocol="org.apache.coyote.http11.Http11AprProtocol"
-               maxThreads="150" SSLEnabled="true" >
-        <UpgradeProtocol className="org.apache.coyote.http2.Http2Protocol" />
-        <SSLHostConfig>
-            <Certificate certificateKeyFile="conf/localhost-rsa-key.pem"
-                         certificateFile="conf/localhost-rsa-cert.pem"
-                         certificateChainFile="conf/localhost-rsa-chain.pem"
-                         type="RSA" />
-        </SSLHostConfig>
-    </Connector>
-    -->
-
-    <!-- Define an AJP 1.3 Connector on port 8009 -->
-    <!--
-    <Connector protocol="AJP/1.3"
-               address="::1"
-               port="8009"
-               redirectPort="8443" />
-    -->
-
-    <!-- An Engine represents the entry point (within Catalina) that processes
-         every request.  The Engine implementation for Tomcat stand alone
-         analyzes the HTTP headers included with the request, and passes them
-         on to the appropriate Host (virtual host).
-         Documentation at /docs/config/engine.html -->
-
-    <!-- You should set jvmRoute to support load-balancing via AJP ie :
-    <Engine name="Catalina" defaultHost="localhost" jvmRoute="jvm1">
-    -->
-    <Engine name="Catalina" defaultHost="localhost">
-
-      <!--For clustering, please take a look at documentation at:
-          /docs/cluster-howto.html  (simple how to)
-          /docs/config/cluster.html (reference documentation) -->
-      <!--
-      <Cluster className="org.apache.catalina.ha.tcp.SimpleTcpCluster"/>
-      -->
-
-      <!-- Use the LockOutRealm to prevent attempts to guess user passwords
-           via a brute-force attack -->
-      <Realm className="org.apache.catalina.realm.LockOutRealm">
-        <!-- This Realm uses the UserDatabase configured in the global JNDI
-             resources under the key "UserDatabase".  Any edits
-             that are performed against this UserDatabase are immediately
-             available for use by the Realm.  -->
-        <Realm className="org.apache.catalina.realm.UserDatabaseRealm"
-               resourceName="UserDatabase"/>
-      </Realm>
-
-      <Host name="localhost"  appBase="webapps"
-            unpackWARs="true" autoDeploy="true">
-
-        <!-- SingleSignOn valve, share authentication between web applications
-             Documentation at: /docs/config/valve.html -->
-        <!--
-        <Valve className="org.apache.catalina.authenticator.SingleSignOn" />
-        -->
-
-        <!-- Access log processes all example.
-             Documentation at: /docs/config/valve.html
-             Note: The pattern used is equivalent to using pattern="common" -->
-        <Valve className="org.apache.catalina.valves.AccessLogValve" directory="logs"
-               prefix="localhost_access_log" suffix=".txt"
-               pattern="%h %l %u %t &quot;%r&quot; %s %b" />
-
-      </Host>
-    </Engine>
-  </Service>
-</Server>