[jena] branch main updated: Add support for alternative java to more commands

[rv...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rvesse pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/jena.git


The following commit(s) were added to refs/heads/main by this push:
     new 081fcab9cc Add support for alternative java to more commands
     new dc85547245 Merge pull request #1322 from GovDataOfficial/support-alternative-java-for-cmds
081fcab9cc is described below

commit 081fcab9cc81a70e3243d896fb74efa99e707fd7
Author: seitenbau-govdata <go...@seitenbau.com>
AuthorDate: Wed May 18 14:25:08 2022 +0200

    Add support for alternative java to more commands
---
 apache-jena/bin/jena        | 23 +++++++++++++++++++++--
 apache-jena/bin/xload-data  | 21 ++++++++++++++++++++-
 apache-jena/bin/xload-index | 21 ++++++++++++++++++++-
 3 files changed, 61 insertions(+), 4 deletions(-)

diff --git a/apache-jena/bin/jena b/apache-jena/bin/jena
index 3b30fd1356..7dda195fa0 100755
--- a/apache-jena/bin/jena
+++ b/apache-jena/bin/jena
@@ -63,6 +63,25 @@ if [ -L "${JENA_HOME}" ]; then
   export JENA_HOME
 fi
 
+if [ -z "$JAVA" ]
+then
+    if [ -z "$JAVA_HOME" ]
+    then
+	JAVA="$(which java)"
+    else
+        JAVA="$JAVA_HOME/bin/java"
+    fi
+fi
+
+if [ -z "$JAVA" ]
+then
+    (
+	echo "Cannot find a Java JDK."
+	echo "Please set either set JAVA or JAVA_HOME and put java (>=Java 11) in your PATH."
+    ) 1>&2
+  exit 1
+fi
+
 # ---- Setup
 # JVM_ARGS : don't set here but it can be set in the environment.
 # Expand JENA_HOME but literal *
@@ -89,7 +108,7 @@ fi
 ## ---- Determine the command.
 case "$#" in
     0)
-	V="$(java -cp "$JENA_CP" jena.version)"
+	V="$("$JAVA" -cp "$JENA_CP" jena.version)"
 	echo "Jena version : $V"
 	echo "Jena home    : $JENA_HOME"
 	exit
@@ -98,4 +117,4 @@ case "$#" in
     *) CMD="$1" ; shift ;;
 esac
 
-java $JVM_ARGS $LOGGING -cp "$JENA_CP" "$CMD" "$@" 
+"$JAVA" $JVM_ARGS $LOGGING -cp "$JENA_CP" "$CMD" "$@"
diff --git a/apache-jena/bin/xload-data b/apache-jena/bin/xload-data
index 85c39ad473..e3e27fe536 100755
--- a/apache-jena/bin/xload-data
+++ b/apache-jena/bin/xload-data
@@ -63,6 +63,25 @@ if [ -L "${JENA_HOME}" ]; then
   echo "Resolved symbolic links for JENA_HOME to $JENA_HOME"
 fi
 
+if [ -z "$JAVA" ]
+then
+    if [ -z "$JAVA_HOME" ]
+    then
+	JAVA="$(which java)"
+    else
+        JAVA="$JAVA_HOME/bin/java"
+    fi
+fi
+
+if [ -z "$JAVA" ]
+then
+    (
+	echo "Cannot find a Java JDK."
+	echo "Please set either set JAVA or JAVA_HOME and put java (>=Java 11) in your PATH."
+    ) 1>&2
+  exit 1
+fi
+
 if [ -e "${LOADER_SCRIPTS}/xload-common" ]; then
   # Can source common functions
   source "${LOADER_SCRIPTS}/xload-common"
@@ -283,7 +302,7 @@ DATA_QUADS="$LOC/data-quads.tmp"
 debug "Triples text files is $DATA_TRIPLES"
 debug "Quads text file is $DATA_QUADS"
 
-java $JVM_ARGS -cp "$JENA_CP" "$PKG".CmdNodeTableBuilder \
+"$JAVA" $JVM_ARGS -cp "$JENA_CP" "$PKG".CmdNodeTableBuilder \
     "--loc=$LOC" "--triples=$DATA_TRIPLES" "--quads=$DATA_QUADS" -- "${FILES[@]}"
 
 info "Data Load Phase Completed"
diff --git a/apache-jena/bin/xload-index b/apache-jena/bin/xload-index
index 4b61996c75..be1df4d2de 100755
--- a/apache-jena/bin/xload-index
+++ b/apache-jena/bin/xload-index
@@ -63,6 +63,25 @@ if [ -L "${JENA_HOME}" ]; then
   echo "Resolved symbolic links for JENA_HOME to $JENA_HOME"
 fi
 
+if [ -z "$JAVA" ]
+then
+    if [ -z "$JAVA_HOME" ]
+    then
+	JAVA="$(which java)"
+    else
+        JAVA="$JAVA_HOME/bin/java"
+    fi
+fi
+
+if [ -z "$JAVA" ]
+then
+    (
+	echo "Cannot find a Java JDK."
+	echo "Please set either set JAVA or JAVA_HOME and put java (>=Java 11) in your PATH."
+    ) 1>&2
+  exit 1
+fi
+
 if [ -e "${LOADER_SCRIPTS}/xload-common" ]; then
   # Can source common functions
   source "${LOADER_SCRIPTS}/xload-common"
@@ -365,7 +384,7 @@ generate_index()
     info "Build $IDX"
     rm -f "$LOC/$IDX.dat"
     rm -f "$LOC/$IDX.idn"
-    java $JVM_ARGS -cp "$JENA_CP" "$PKG".CmdIndexBuild "$LOC" "$IDX" "$WORK"
+    "$JAVA" $JVM_ARGS -cp "$JENA_CP" "$PKG".CmdIndexBuild "$LOC" "$IDX" "$WORK"
     info "Build $IDX Completed"
 
     # Remove work file unless keeping