Tidy up integration of run-java/pathfinder modules

Changes were made to run-java.sh in one branch of a merge that needed
to be promoted up to the new pathfinder mdouel from the other branch
of a merge.

Signed-off-by: Jonathan Dowland <[email protected]>

Author: jmtd

modules/run/artifacts/opt/jboss/container/java/run/run-java.sh

@@ -3,15 +3,15 @@
 # Fail on a single failed command
 set -eo pipefail
 
+# define default values for the location of sub-scripts. This is
+# necessary when the run script is used from an environment which
+# lacks the definitions, such as a ubi-micro-based image.
 export JBOSS_CONTAINER_UTIL_LOGGING_MODULE="${JBOSS_CONTAINER_UTIL_LOGGING_MODULE-/opt/jboss/container/util/logging}"
 export JBOSS_CONTAINER_JAVA_RUN_MODULE="${JBOSS_CONTAINER_JAVA_RUN_MODULE-/opt/jboss/container/java/run}"
-
-# Default the application dir to the S2I deployment dir
-if [ -z "$JAVA_APP_DIR" ]
-  then JAVA_APP_DIR=/deployments
-fi
+export JBOSS_CONTAINER_UTIL_PATHFINDER_MODULE="${JBOSS_CONTAINER_UTIL_PATHFINDER_MODULE-/opt/jboss/container/util/pathfinder}"
 
 source "$JBOSS_CONTAINER_UTIL_LOGGING_MODULE/logging.sh"
+source "$JBOSS_CONTAINER_UTIL_PATHFINDER_MODULE/pathfinder.sh"
 
 # ==========================================================
 # Generic run script for running arbitrary Java applications
@@ -30,22 +30,6 @@ check_error() {
   fi
 }
 
-load_env() {
-  # Configuration stuff is read from this file
-  local run_env_sh="run-env.sh"
-  
-  # Load default default config
-  if [ -f "${JBOSS_CONTAINER_JAVA_RUN_MODULE}/${run_env_sh}" ]; then
-    source "${JBOSS_CONTAINER_JAVA_RUN_MODULE}/${run_env_sh}"
-  fi
-
-  # Load JAVA_APP_JAR and JAVA_LIB_DIR
-  if [ -f "${JBOSS_CONTAINER_UTIL_PATHFINDER_MODULE}/pathfinder.sh" ]; then
-    source "$JBOSS_CONTAINER_UTIL_PATHFINDER_MODULE/pathfinder.sh"
-    setup_java_app_and_lib
-  fi
-}
-
 # Combine all java options
 get_java_options() {
   local jvm_opts
@@ -128,7 +112,8 @@ get_classpath() {
 # Start JVM
 startup() {
   # Initialize environment
-  load_env
+  # populates JAVA_APP_JAR and JAVA_LIB_DIR and possibly JAVA_MAIN_CLASS
+  setup_java_app_and_lib
 
   local args
   cd ${JAVA_APP_DIR}

modules/util/pathfinder/artifacts/opt/jboss/container/util/pathfinder/pathfinder.sh

@@ -66,25 +66,17 @@ get_jar_file() {
 }
 
 setup_java_app_and_lib() {
-  # Configuration stuff is read from this file
-  local run_env_sh="run-env.sh"
-  
-  # Load default default config
-  if [ -f "${JBOSS_CONTAINER_JAVA_RUN_MODULE}/${run_env_sh}" ]; then
-    source "${JBOSS_CONTAINER_JAVA_RUN_MODULE}/${run_env_sh}"
+  # Default the application dir to the S2I deployment dir
+  if [ -z "$JAVA_APP_DIR" ]
+    then JAVA_APP_DIR=/deployments
   fi
 
-  # Check also $JAVA_APP_DIR. Overrides other defaults
-  # It's valid to set the app dir in the default script
-  if [ -z "${JAVA_APP_DIR}" ]; then
-    # XXX: is this correct?  This is defaulted above to /deployments.  Should we
-    # define a default to the old /opt/java-run?
-    JAVA_APP_DIR="${JBOSS_CONTAINER_JAVA_RUN_MODULE}"
-  else
-    if [ -f "${JAVA_APP_DIR}/${run_env_sh}" ]; then
-      source "${JAVA_APP_DIR}/${run_env_sh}"
-    fi
+  # application-source provided shell script that may set environment
+  # variables
+  if [ -f "${JAVA_APP_DIR}/run-env.sh" ]; then
+    source "${JAVA_APP_DIR}/run-env.sh"
   fi
+
   export JAVA_APP_DIR
 
   # JAVA_LIB_DIR defaults to JAVA_APP_DIR
@@ -101,4 +93,4 @@ setup_java_app_and_lib() {
   else
     export JAVA_MAIN_CLASS
   fi
-}
+}