From 82b3c68d212956049a211188005d48182029b15c Mon Sep 17 00:00:00 2001
From: Brian Long <brian@inteligr8.com>
Date: Wed, 2 Jun 2021 14:33:31 -0400
Subject: [PATCH] not using hotswap plugins; passthru

---
 Dockerfile               | 1 -
 docker-entrypoint.sh     | 1 -
 hotswap-agent.properties | 2 +-
 setenv-bootstrap.sh      | 2 --
 4 files changed, 1 insertion(+), 5 deletions(-)
 delete mode 100644 setenv-bootstrap.sh

diff --git a/Dockerfile b/Dockerfile
index 921b149..1453cde 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -26,7 +26,6 @@ RUN cd /var/lib/tomcat/dev && \
         mkdir web web-extra1 web-extra2 web-extra3 web-extra4 web-extra5 web-extra6 web-extra7
 
 # Add our Docker container initialization script
-ADD setenv-bootstrap.sh /usr/local/bin/${project.artifactId}-setenv-bootstrap.sh
 ADD setenv.sh /usr/local/bin/${project.artifactId}-setenv.sh
 COPY docker-entrypoint.sh /usr/local/bin
 RUN chmod 755 /usr/local/bin/docker-entrypoint.sh
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index 92a5b25..0642437 100644
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -1,5 +1,4 @@
 #!/bin/sh
-. /usr/local/bin/tomcat-rad-setenv-bootstrap.sh
 . /usr/local/bin/java-dcevm-hotswap-setenv.sh
 . /usr/local/bin/tomcat-rad-setenv.sh
 
diff --git a/hotswap-agent.properties b/hotswap-agent.properties
index 3ebcf0e..ec7193e 100644
--- a/hotswap-agent.properties
+++ b/hotswap-agent.properties
@@ -52,7 +52,7 @@ webappDir=/var/lib/tomcat/dev/web
 
 # Comma separated list of disabled plugins
 # Use plugin name - e.g. Hibernate, Spring, ZK, Hotswapper, AnonymousClassPatch, Tomcat, Logback ....
-disabledPlugins=${hotswap.disabledPlugins}
+disabledPlugins=${hotswap.disablePlugins}
 
 # Watch for changed class files on watchResources path and reload class definition in the running application.
 #
diff --git a/setenv-bootstrap.sh b/setenv-bootstrap.sh
deleted file mode 100644
index 1d09c94..0000000
--- a/setenv-bootstrap.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-DISABLE_HOTSWAP_PLUGINS=Hibernate