jena git commit: Added FUSEKI_CLASSES to the script. When FUSEKI_CLASSES is defined run command switches from -jar to -cp form. Fixes JENA-983

[cl...@apache.org]

Repository: jena
Updated Branches:
  refs/heads/master f15a92bb6 -> 255416a86


Added FUSEKI_CLASSES to the script.
When FUSEKI_CLASSES is defined run command switches from -jar to -cp form.
Fixes JENA-983


Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/255416a8
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/255416a8
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/255416a8

Branch: refs/heads/master
Commit: 255416a86681132aea6d6db024d88dbc4e10274e
Parents: f15a92b
Author: Claude Warren <cl...@apache.org>
Authored: Sat Jul 4 16:00:30 2015 +0100
Committer: Claude Warren <cl...@apache.org>
Committed: Sat Jul 4 16:00:30 2015 +0100

----------------------------------------------------------------------
 jena-fuseki2/apache-jena-fuseki/fuseki | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/255416a8/jena-fuseki2/apache-jena-fuseki/fuseki
----------------------------------------------------------------------
diff --git a/jena-fuseki2/apache-jena-fuseki/fuseki b/jena-fuseki2/apache-jena-fuseki/fuseki
index 09c4b6c..62c2f16 100755
--- a/jena-fuseki2/apache-jena-fuseki/fuseki
+++ b/jena-fuseki2/apache-jena-fuseki/fuseki
@@ -52,7 +52,11 @@
 #
 # FUSEKI_START
 #   Path to the jar file. Defaults to $FUSEKI_HOME/fuseki-server.jar 
-
+#
+# FUSEKI_CLASSES
+#   Path to extra jars to add to the class path.  Defaults to none
+#   Should be of the form path/class.jar:path/class2.jar
+#
 # FUSEKI_CONF
 #   The Fuseki configuration file, usually in RDF Turtle notation.
 #
@@ -283,10 +287,14 @@ fi
 
 # Run command
 
-RUN_ARGS=(${JAVA_OPTIONS[@]} -jar "$FUSEKI_START" "${FUSEKI_ADDITIONAL_ARGS[@]}" $FUSEKI_ARGS)
+if [ -z "$FUSEKI_CLASSES" ]
+then
+  RUN_ARGS=(${JAVA_OPTIONS[@]} -jar "$FUSEKI_START" "${FUSEKI_ADDITIONAL_ARGS[@]}" $FUSEKI_ARGS)
+else
+  RUN_ARGS=(${JAVA_OPTIONS[@]} -cp "$FUSEKI_START:$FUSEKI_CLASSES" org.apache.jena.fuseki.cmd.FusekiCmd "${FUSEKI_ADDITIONAL_ARGS[@]}" $FUSEKI_ARGS)
+fi
 RUN_CMD=("$JAVA" "${RUN_ARGS[@]}")
 
-
 #####################################################
 # Comment these out after you're happy with what
 # the script is doing.
@@ -299,6 +307,7 @@ then
   log_daemon_msg "FUSEKI_PID     =  $FUSEKI_PID"
   log_daemon_msg "FUSEKI_ARGS    =  $FUSEKI_ARGS"
   log_daemon_msg "FUSEKI_START   =  $FUSEKI_START"
+  log_daemon_msg "FUSEKI_CLASSES =  $FUSEKI_CLASSES"
   log_daemon_msg "CONFIGS        =  ${CONFIGS[*]}"
   log_daemon_msg "JAVA           =  $JAVA"
   log_daemon_msg "JAVA_OPTIONS   =  ${JAVA_OPTIONS[*]}"