From 12942fc38ef9502805578fc1873c85bac3674bfe Mon Sep 17 00:00:00 2001
From: Brian Long <brian@inteligr8.com>
Date: Tue, 16 Mar 2021 19:59:52 -0400
Subject: [PATCH] more fixes

---
 docker-entrypoint.sh     | 8 ++++----
 hotswap-agent.properties | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index 6f1720f..e3052b9 100644
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -1,9 +1,9 @@
 #!/bin/sh
 . /usr/local/bin/java-dcevm-hotswap-setenv.sh
 
-JAVA_CP="/var/lib/jvm/dev/classes:/var/lib/jvm/dev/classes-extra1:/var/lib/jvm/dev/classes-extra2:/var/lib/jvm/dev/classes-extra3:/var/lib/jvm/dev/classes-extra4:/var/lib/jvm/dev/classes-extra5:/var/lib/jvm/dev/classes-extra6:/var/lib/jvm/dev/classes-extra7"
+JAVA_CP="/var/lib/jvm/lib:/var/lib/jvm/lib/*"
+JAVA_CP="${JAVA_CP}:/var/lib/jvm/dev/classes:/var/lib/jvm/dev/classes-extra1:/var/lib/jvm/dev/classes-extra2:/var/lib/jvm/dev/classes-extra3:/var/lib/jvm/dev/classes-extra4:/var/lib/jvm/dev/classes-extra5:/var/lib/jvm/dev/classes-extra6:/var/lib/jvm/dev/classes-extra7"
 JAVA_CP="${JAVA_CP}:/var/lib/jvm/dev/lib/*:/var/lib/jvm/dev/lib-extra1/*:/var/lib/jvm/dev/lib-extra2/*:/var/lib/jvm/dev/lib-extra3/*:/var/lib/jvm/dev/lib-extra4/*:/var/lib/jvm/dev/lib-extra5/*:/var/lib/jvm/dev/lib-extra6/*:/var/lib/jvm/dev/lib-extra7/*"
-EXEC_JAVA_OPTS="${JAVA_OPTS} --classpath ${JAVA_CP}"
-
-exec "/usr/local/lib/jvm/java-openjdk-dcevm/bin/java ${EXEC_JAVA_OPTS} ${JAVA_CLASS}"
+EXEC_JAVA_OPTS="${JAVA_OPTS} -classpath ${JAVA_CP}"
 
+exec ${JAVA_HOME}/bin/java ${EXEC_JAVA_OPTS} ${JAVA_CLASS}
diff --git a/hotswap-agent.properties b/hotswap-agent.properties
index 2dde0ea..a9c342d 100644
--- a/hotswap-agent.properties
+++ b/hotswap-agent.properties
@@ -7,7 +7,7 @@
 # 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=/tmp/java/classpath
+extraClasspath=/var/lib/jvm/dev/classes
 
 # Watch for changes in a directory (resources only). If not set, changes of resources won't be observed.
 #
@@ -19,14 +19,14 @@ extraClasspath=/tmp/java/classpath
 # 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=/tmp/java/resources
+watchResources=/var/lib/jvm/dev/classes
 
 # 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=/var/java/web
+webappDir=
 
 
 # Comma separated list of disabled plugins