Fix ordering of pathfinder, add logging, add configure script

Author: Josh-Matsuoka

modules/jlink/artifacts/opt/jboss/container/java/jlink/generatejdkdeps.sh

@@ -1,6 +1,7 @@
 #!/bin/bash
 
 function generatejdkdeps() {
+  echo "Generating JDK deps"
   $JAVA_HOME/bin/java --list-modules > java-modules.txt
   < java-modules.txt sed "s/\\@.*//" > modules.txt
   grep -Fx -f stripped-deps.txt modules.txt | tr '\n' ',' | tr -d "[:space:]" > module-deps.txt

modules/jlink/artifacts/opt/jboss/container/java/jlink/mkdeps.sh

@@ -10,13 +10,15 @@ function generate_deps() {
   if [[ -v JAVA_LIB_DIR ]]; then
       # copy dependencies found in libs to dependencies
       find $JAVA_LIB_DIR -type f -name '*.jar' -print0 | xargs -r0 cp -vt dependencies
+      echo "Working with: "
+      echo $JAVA_APP_JAR
+      echo $JAVA_LIB_DIR
       # generate the dependency list
       $JAVA_HOME/bin/jdeps --multi-release $JAVA_VERSION -R -s \
         --module-path dependencies \
         "$JAVA_APP_JAR" \
         "$JAVA_LIB_DIR"/**/*.jar \
         > deps.txt
-      cat deps.txt
   else 
     $JAVA_HOME/bin/jdeps --multi-release $JAVA_VERSION -R -s \
       --module-path dependencies \

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

@@ -26,14 +26,16 @@ load_env() {
   # Configuration stuff is read from this file
   local run_env_sh="run-env.sh"
 
-  # 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"
-  fi
   # 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

modules/s2i/bash/artifacts/usr/local/s2i/assemble

@@ -11,12 +11,14 @@ source "${JBOSS_CONTAINER_JAVA_S2I_MODULE}/s2i-core-hooks"
 # inject our overridden maven_s2i_*() functions
 source "${JBOSS_CONTAINER_JAVA_S2I_MODULE}/maven-s2i-overrides"
 
-# run the pathfinder scripts to define JAVA_APP_JAR and JAVA_LIB_DIR
-source "${JBOSS_CONTAINER_UTIL_PATHFINDER_MODULE}/pathfinder.sh"
-
 # invoke the build
 maven_s2i_build
 
+# run the pathfinder scripts to define JAVA_APP_JAR and JAVA_LIB_DIR
+source "${JBOSS_CONTAINER_UTIL_PATHFINDER_MODULE}/pathfinder.sh"
+echo "Setting up java app and lib variables"
+setup_java_app_and_lib
+
 # include our jlink scripts
 source "${JBOSS_CONTAINER_JAVA_JLINK_MODULE}/mkdeps.sh"
 echo "Invoking mkdeps"

modules/s2i/core/artifacts/opt/jboss/container/s2i/core/s2i-core

@@ -82,7 +82,6 @@ function s2i_core_copy_data() {
 # copy deployment (binary) files
 # $1 - the base directory to which $S2I_SOURCE_DEPLOYMENTS_DIR is appended
 function s2i_core_copy_deployments() {
-  echo "Copying deployments"
   if [ -d "${1}/${S2I_SOURCE_DEPLOYMENTS_DIR}" ]; then
     if [ -z "${S2I_TARGET_DEPLOYMENTS_DIR}" ]; then
       log_warning "Unable to copy deployment files.  No target directory specified for S2I_TARGET_DEPLOYMENTS_DIR"

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

@@ -1,4 +1,11 @@
-
+# Error is indicated with a prefix in the return value
+check_error() {
+  local msg=$1
+  if echo ${msg} | grep -q "^ERROR:"; then
+    log_error ${msg}
+    exit 1
+  fi
+}
 
 # detect Quarkus fast-jar package type (OPENJDK-631)
 is_quarkus_fast_jar() {
@@ -59,6 +66,14 @@ 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}"
+  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

modules/util/pathfinder/configure.sh

@@ -0,0 +1,14 @@
+#!/bin/sh
+# Configure module
+set -e
+
+SCRIPT_DIR=$(dirname $0)
+ARTIFACTS_DIR=${SCRIPT_DIR}/artifacts
+
+chown -R default:root $SCRIPT_DIR
+chmod -R ug+rwX $SCRIPT_DIR
+chmod ug+x ${ARTIFACTS_DIR}/opt/jboss/container/util/pathfinder/*
+
+pushd ${ARTIFACTS_DIR}
+cp -pr * /
+popd

modules/util/pathfinder/module.yaml

@@ -7,9 +7,9 @@ description: ^
    as well as library directories"
 
 envs: 
-- name: JBOSS_CONTAINER_JAVA_S2I_MODULE
+- name: JBOSS_CONTAINER_UTIL_PATHFINDER_MODULE
   value: /opt/jboss/container/util/pathfinder
-  
+
 - name: JAVA_APP_DIR
   description: ^
     The directory where the application resides. All paths in your application
@@ -28,4 +28,7 @@ envs:
     Directory holding the Java jar files as well an optional `classpath` file
     which holds the classpath. Either as a single line classpath (colon
     separated) or with jar files listed line-by-line. If not set
-    **JAVA_LIB_DIR** is the same as **JAVA_APP_DIR**.
+    **JAVA_LIB_DIR** is the same as **JAVA_APP_DIR**.
+
+execute:
+- script: configure.sh