diff --git a/Dockerfile b/Dockerfile index 13af0df..a333775 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,7 +22,9 @@ RUN cd /usr/local/share/tomcat && \ # Add directories for dynamic injection points RUN cd /var/lib/tomcat/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 diff --git a/README.md b/README.md index 2d7d893..ca717b6 100644 --- a/README.md +++ b/README.md @@ -5,31 +5,39 @@ This project creates a Docker image that has uses the [Java Hotswap Docker Image 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 | -| ------------------------------------ |:---------:|:------------:| -| `/var/lib/tomcat/dev/classes` | Classpath | Yes | -| `/var/lib/tomcat/dev/classes-extra1` | Classpath | Yes | -| `/var/lib/tomcat/dev/classes-extra2` | Classpath | Yes | -| `/var/lib/tomcat/dev/classes-extra3` | Classpath | Yes | -| `/var/lib/tomcat/dev/classes-extra4` | Classpath | Yes | -| `/var/lib/tomcat/dev/classes-extra5` | Classpath | Yes | -| `/var/lib/tomcat/dev/classes-extra6` | Classpath | Yes | -| `/var/lib/tomcat/dev/classes-extra7` | Classpath | Yes | -| `/var/lib/tomcat/dev/lib` | JARs | No | -| `/var/lib/tomcat/dev/lib-extra1` | JARs | No | -| `/var/lib/tomcat/dev/lib-extra2` | JARs | No | -| `/var/lib/tomcat/dev/lib-extra3` | JARs | No | -| `/var/lib/tomcat/dev/lib-extra4` | JARs | No | -| `/var/lib/tomcat/dev/lib-extra5` | JARs | No | -| `/var/lib/tomcat/dev/lib-extra6` | JARs | No | -| `/var/lib/tomcat/dev/lib-extra7` | JARs | No | -| `/var/lib/tomcat/dev/web` | Web | Yes | -| `/var/lib/tomcat/dev/web-extra1` | Web | Yes | -| `/var/lib/tomcat/dev/web-extra2` | Web | Yes | -| `/var/lib/tomcat/dev/web-extra3` | Web | Yes | -| `/var/lib/tomcat/dev/web-extra4` | Web | Yes | -| `/var/lib/tomcat/dev/web-extra5` | Web | Yes | -| `/var/lib/tomcat/dev/web-extra6` | Web | Yes | -| `/var/lib/tomcat/dev/web-extra7` | Web | Yes | +| 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. diff --git a/hotswap-agent.properties b/hotswap-agent.properties index ec7193e..b5c925c 100644 --- a/hotswap-agent.properties +++ b/hotswap-agent.properties @@ -14,7 +14,11 @@ extraClasspath=/var/lib/tomcat/dev/classes; \ /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/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. # @@ -33,7 +37,11 @@ watchResources=/var/lib/tomcat/dev/classes; \ /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/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. # diff --git a/pom.xml b/pom.xml index 606b2b4..7017a9c 100644 --- a/pom.xml +++ b/pom.xml @@ -3,20 +3,20 @@ 4.0.0 com.inteligr8 tomcat-rad - 9-2.0 + 9-2.1 Apache Tomcat for Rapid Application Development pom - 1.4.1-jbr-17.0.8 + 1.4.1-jbr-17.0.10 tomcat-rad - 9.0.80 + 9.0.86 9 https://apache.osuosl.org/tomcat diff --git a/tomcat-context.xml b/tomcat-context.xml index 99c4354..3458bea 100644 --- a/tomcat-context.xml +++ b/tomcat-context.xml @@ -40,6 +40,10 @@ + + + + @@ -49,6 +53,10 @@ + + + +