sunspot_solr 2.2.2 → 2.2.3

data/solr/bin/solr

@@ -50,9 +50,9 @@ verbose=false
 THIS_OS=`uname -s`
 
 if hash jar 2>/dev/null ; then      # hash returns true if jar is on the path
-  UNPACK_WAR_CMD="$(command -v jar) xf"
+  UNPACK_WAR_CMD=("$(command -v jar)" xf)
 elif hash unzip 2>/dev/null ; then  # hash returns true if unzip is on the path
-  UNPACK_WAR_CMD="$(command -v unzip) -q"
+  UNPACK_WAR_CMD=("$(command -v unzip)" -q)
 else
   echo -e "This script requires extracting a WAR file with either the jar or unzip utility, please install these utilities or contact your administrator for assistance."
   exit 1
@@ -81,7 +81,7 @@ done
 
 SOLR_TIP=`dirname "$SOLR_SCRIPT"`/..
 SOLR_TIP=`cd "$SOLR_TIP"; pwd`
-DEFAULT_SERVER_DIR=$SOLR_TIP/server
+DEFAULT_SERVER_DIR="$SOLR_TIP/server"
 
 # If an include wasn't specified in the environment, then search for one...
 if [ -z "$SOLR_INCLUDE" ]; then
@@ -102,11 +102,11 @@ elif [ -r "$SOLR_INCLUDE" ]; then
 fi
 
 if [ -z "$SOLR_PID_DIR" ]; then
-  SOLR_PID_DIR=$SOLR_TIP/bin
+  SOLR_PID_DIR="$SOLR_TIP/bin"
 fi
 
 if [ -n "$SOLR_JAVA_HOME" ]; then
-  JAVA=$SOLR_JAVA_HOME/bin/java
+  JAVA="$SOLR_JAVA_HOME/bin/java"
 elif [ -n "$JAVA_HOME" ]; then
   for java in "$JAVA_HOME"/bin/amd64/java "$JAVA_HOME"/bin/java; do
     if [ -x "$java" ]; then
@@ -126,26 +126,55 @@ else
 fi
 
 # test that Java exists and is executable on this server
-$JAVA -version >/dev/null 2>&1 || {
+"$JAVA" -version >/dev/null 2>&1 || {
   echo >&2 "Java not found, or an error was encountered when running java."
-  echo >&2 "A working Java 8 is required to run Solr!"
-  echo >&2 "Please install Java 8 or fix JAVA_HOME before running this script."
+  echo >&2 "A working Java 7 or later is required to run Solr!"
+  echo >&2 "Please install Java or fix JAVA_HOME before running this script."
   echo >&2 "Command that we tried: '${JAVA} -version'"
   echo >&2 "Active Path:"
   echo >&2 "${PATH}"
   exit 1
 }
 
-# URL scheme for contacting Solr
+# Select HTTP OR HTTPS related configurations
 SOLR_URL_SCHEME=http
-if [ -n "$SOLR_SSL_OPTS" ]; then
+SOLR_JETTY_CONFIG=()
+SOLR_SSL_OPTS=""
+if [ -n "$SOLR_SSL_KEY_STORE" ]; then
+  SOLR_JETTY_CONFIG+=("--module=https")
   SOLR_URL_SCHEME=https
+  SOLR_SSL_OPTS=" -Dsolr.jetty.keystore=$SOLR_SSL_KEY_STORE \
+    -Dsolr.jetty.keystore.password=$SOLR_SSL_KEY_STORE_PASSWORD \
+    -Dsolr.jetty.truststore=$SOLR_SSL_TRUST_STORE \
+    -Dsolr.jetty.truststore.password=$SOLR_SSL_TRUST_STORE_PASSWORD \
+    -Dsolr.jetty.ssl.needClientAuth=$SOLR_SSL_NEED_CLIENT_AUTH \
+    -Dsolr.jetty.ssl.wantClientAuth=$SOLR_SSL_WANT_CLIENT_AUTH"
+  if [ -n "$SOLR_SSL_CLIENT_KEY_STORE" ]; then
+    SOLR_SSL_OPTS+=" -Djavax.net.ssl.keyStore=$SOLR_SSL_CLIENT_KEY_STORE \
+      -Djavax.net.ssl.keyStorePassword=$SOLR_SSL_CLIENT_KEY_STORE_PASSWORD \
+      -Djavax.net.ssl.trustStore=$SOLR_SSL_CLIENT_TRUST_STORE \
+      -Djavax.net.ssl.trustStorePassword=$SOLR_SSL_CLIENT_TRUST_STORE_PASSWORD"
+  else
+    SOLR_SSL_OPTS+=" -Djavax.net.ssl.keyStore=$SOLR_SSL_KEY_STORE \
+      -Djavax.net.ssl.keyStorePassword=$SOLR_SSL_KEY_STORE_PASSWORD \
+      -Djavax.net.ssl.trustStore=$SOLR_SSL_TRUST_STORE \
+      -Djavax.net.ssl.trustStorePassword=$SOLR_SSL_TRUST_STORE_PASSWORD"
+  fi
+else
+  SOLR_JETTY_CONFIG+=("--module=http")
+fi
+
+# Authentication options
+if [ "$SOLR_AUTHENTICATION_CLIENT_CONFIGURER" != "" ]; then
+  AUTHC_CLIENT_CONFIGURER_ARG="-Dsolr.authentication.httpclient.configurer=$SOLR_AUTHENTICATION_CLIENT_CONFIGURER"
 fi
+AUTHC_OPTS="$AUTHC_CLIENT_CONFIGURER_ARG $SOLR_AUTHENTICATION_OPTS"
 
-# Which Jetty config file to use - leave blank to use the default: etc/jetty.xml
-SOLR_JETTY_CONFIG=
-if [ -n "$SOLR_SSL_OPTS" ]; then
-  SOLR_JETTY_CONFIG=$SOLR_TIP/server/etc/jetty-https-ssl.xml
+# Set the SOLR_TOOL_HOST variable for use when connecting to a running Solr instance
+if [ "$SOLR_HOST" != "" ]; then
+  SOLR_TOOL_HOST="$SOLR_HOST"
+else
+  SOLR_TOOL_HOST="localhost"
 fi
 
 function print_usage() {
@@ -200,9 +229,9 @@ function print_usage() {
     echo "  -s <dir>      Sets the solr.solr.home system property; Solr will create core directories under"
     echo "                  this directory. This allows you to run multiple Solr instances on the same host"
     echo "                  while reusing the same server directory set using the -d parameter. If set, the"
-    echo "                  specified directory should contain a solr.xml file. The default value is server/solr."
+    echo "                  specified directory should contain a solr.xml file, unless solr.xml exists in ZooKeeper."
     echo "                  This parameter is ignored when running examples (-e), as the solr.solr.home depends"
-    echo "                  on which example is run."
+    echo "                  on which example is run. The default value is server/solr."
     echo ""
     echo "  -e <example>  Name of the example to run; available examples:"
     echo "      cloud:         SolrCloud example"
@@ -341,7 +370,7 @@ function spinner() {
   local pid=$1
   local delay=0.5
   local spinstr='|/-\'
-  while [ "$(ps aux | awk '{print $2}' | grep $pid)" ]; do
+  while [ "$(ps aux | awk '{print $2}' | grep -w $pid)" ]; do
       local temp=${spinstr#?}
       printf " [%c]  " "$spinstr"
       local spinstr=$temp${spinstr%"$temp"}
@@ -355,8 +384,8 @@ function spinner() {
 function solr_pid_by_port() {
   THE_PORT="$1"
   if [ -e "$SOLR_PID_DIR/solr-$THE_PORT.pid" ]; then
-    PID=`cat $SOLR_PID_DIR/solr-$THE_PORT.pid`
-    CHECK_PID=`ps auxww | awk '{print $2}' | grep $PID | sort -r | tr -d ' '`
+    PID=`cat "$SOLR_PID_DIR/solr-$THE_PORT.pid"`
+    CHECK_PID=`ps auxww | awk '{print $2}' | grep -w $PID | sort -r | tr -d ' '`
     if [ "$CHECK_PID" != "" ]; then
       local solrPID=$PID
     fi
@@ -367,7 +396,7 @@ function solr_pid_by_port() {
 # extract the value of the -Djetty.port parameter from a running Solr process 
 function jetty_port() {
   SOLR_PID="$1"
-  SOLR_PROC=`ps auxww | grep $SOLR_PID | grep start.jar | grep jetty.port`      
+  SOLR_PROC=`ps auxww | grep -w $SOLR_PID | grep start\.jar | grep jetty.port`
   IFS=' ' read -a proc_args <<< "$SOLR_PROC"
   for arg in "${proc_args[@]}"
     do
@@ -383,15 +412,11 @@ function jetty_port() {
 # run a Solr command-line tool using the SolrCLI class; 
 # useful for doing cross-platform work from the command-line using Java
 function run_tool() {
-  
-  # Extract the solr.war if it hasn't been done already (so we can access the SolrCLI class)
-  if [[ -e $DEFAULT_SERVER_DIR/webapps/solr.war && ! -d "$DEFAULT_SERVER_DIR/solr-webapp/webapp" ]]; then
-    (mkdir -p $DEFAULT_SERVER_DIR/solr-webapp/webapp && cd $DEFAULT_SERVER_DIR/solr-webapp/webapp && $UNPACK_WAR_CMD $DEFAULT_SERVER_DIR/webapps/solr.war)    
-  fi
-  
-  "$JAVA" $SOLR_SSL_OPTS -Dsolr.install.dir=$SOLR_TIP -Dlog4j.configuration=file:$DEFAULT_SERVER_DIR/resources/log4j.properties \
+
+  "$JAVA" $SOLR_SSL_OPTS $AUTHC_OPTS -Dsolr.install.dir="$SOLR_TIP" \
+    -Dlog4j.configuration="file:$DEFAULT_SERVER_DIR/scripts/cloud-scripts/log4j.properties" \
     -classpath "$DEFAULT_SERVER_DIR/solr-webapp/webapp/WEB-INF/lib/*:$DEFAULT_SERVER_DIR/lib/ext/*" \
-    org.apache.solr.util.SolrCLI $*
+    org.apache.solr.util.SolrCLI "$@"
 
   return $?
 } # end run_tool function
@@ -399,16 +424,16 @@ function run_tool() {
 # get information about any Solr nodes running on this host
 function get_info() {
   # first, see if Solr is running
-  numSolrs=`find $SOLR_PID_DIR -name "solr-*.pid" -type f | wc -l | tr -d ' '`
+  numSolrs=`find "$SOLR_PID_DIR" -name "solr-*.pid" -type f | wc -l | tr -d ' '`
   if [ "$numSolrs" != "0" ]; then
     echo -e "\nFound $numSolrs Solr nodes: "
-    for PIDF in `find $SOLR_PID_DIR -name "solr-*.pid" -type f`
+    find "$SOLR_PID_DIR" -name "solr-*.pid" -type f | while read PIDF
       do
-        ID=`cat $PIDF`
+        ID=`cat "$PIDF"`
         port=`jetty_port "$ID"`
         if [ "$port" != "" ]; then
           echo -e "\nSolr process $ID running on port $port"
-          run_tool status -solr $SOLR_URL_SCHEME://localhost:$port/solr
+          run_tool status -solr "$SOLR_URL_SCHEME://$SOLR_TOOL_HOST:$port/solr"
           echo ""
         else
           echo -e "\nSolr process $ID from $PIDF not found."
@@ -416,16 +441,16 @@ function get_info() {
     done
   else
     # no pid files but check using ps just to be sure
-    numSolrs=`ps auxww | grep start.jar | grep solr.solr.home | grep -v grep | wc -l | sed -e 's/^[ \t]*//'`
+    numSolrs=`ps auxww | grep start\.jar | grep solr.solr.home | grep -v grep | wc -l | sed -e 's/^[ \t]*//'`
     if [ "$numSolrs" != "0" ]; then
       echo -e "\nFound $numSolrs Solr nodes: "
-      for ID in `ps auxww | grep start.jar | grep solr.solr.home | grep -v grep | awk '{print $2}' | sort -r`
+      for ID in `ps auxww | grep start\.jar | grep solr.solr.home | grep -v grep | awk '{print $2}' | sort -r`
         do
           port=`jetty_port "$ID"`
           if [ "$port" != "" ]; then
             echo ""
             echo "Solr process $ID running on port $port"
-            run_tool status -solr $SOLR_URL_SCHEME://localhost:$port/solr
+            run_tool status -solr "$SOLR_URL_SCHEME://$SOLR_TOOL_HOST:$port/solr"
             echo ""
           fi
       done
@@ -448,25 +473,25 @@ function stop_solr() {
 
   if [ "$SOLR_PID" != "" ]; then
     echo -e "Sending stop command to Solr running on port $SOLR_PORT ... waiting 5 seconds to allow Jetty process $SOLR_PID to stop gracefully."
-    $JAVA $SOLR_SSL_OPTS -jar $DIR/start.jar $SOLR_JETTY_CONFIG STOP.PORT=$STOP_PORT STOP.KEY=$STOP_KEY --stop || true
+    "$JAVA" $SOLR_SSL_OPTS $AUTHC_OPTS -jar "$DIR/start.jar" "STOP.PORT=$STOP_PORT" "STOP.KEY=$STOP_KEY" --stop || true
     (sleep 5) &
     spinner $!
-    rm -f $SOLR_PID_DIR/solr-$SOLR_PORT.pid
+    rm -f "$SOLR_PID_DIR/solr-$SOLR_PORT.pid"
   else
     echo -e "No Solr nodes found to stop."
     exit 0
   fi
 
-  CHECK_PID=`ps auxww | awk '{print $2}' | grep $SOLR_PID | sort -r | tr -d ' '`
+  CHECK_PID=`ps auxww | awk '{print $2}' | grep -w $SOLR_PID | sort -r | tr -d ' '`
   if [ "$CHECK_PID" != "" ]; then
     echo -e "Solr process $SOLR_PID is still running; forcefully killing it now."
     kill -9 $SOLR_PID
     echo "Killed process $SOLR_PID"
-    rm -f $SOLR_PID_DIR/solr-$SOLR_PORT.pid
+    rm -f "$SOLR_PID_DIR/solr-$SOLR_PORT.pid"
     sleep 1
   fi
 
-  CHECK_PID=`ps auxww | awk '{print $2}' | grep $SOLR_PID | sort -r | tr -d ' '`
+  CHECK_PID=`ps auxww | awk '{print $2}' | grep -w $SOLR_PID | sort -r | tr -d ' '`
   if [ "$CHECK_PID" != "" ]; then
     echo "ERROR: Failed to kill previous Solr Java process $SOLR_PID ... script fails."
     exit 1
@@ -492,7 +517,7 @@ if [ $# -gt 0 ]; then
   if [[ $1 == -* ]]; then
     SCRIPT_CMD="start"
   else
-    SCRIPT_CMD=$1
+    SCRIPT_CMD="$1"
     shift
   fi
 else
@@ -513,13 +538,13 @@ if [ "$SCRIPT_CMD" == "healthcheck" ]; then
 
   if [ $# -gt 0 ]; then
     while true; do  
-      case $1 in
+      case "$1" in
           -c|-collection)
               if [[ -z "$2" || "${2:0:1}" == "-" ]]; then
                 print_usage "$SCRIPT_CMD" "Collection name is required when using the $1 option!"
                 exit 1
               fi
-              HEALTHCHECK_COLLECTION=$2
+              HEALTHCHECK_COLLECTION="$2"
               shift 2
           ;;
           -z|-zkhost)          
@@ -560,7 +585,7 @@ if [ "$SCRIPT_CMD" == "healthcheck" ]; then
     exit 1  
   fi
     
-  run_tool healthcheck -zkHost $ZK_HOST -collection $HEALTHCHECK_COLLECTION
+  run_tool healthcheck -zkHost "$ZK_HOST" -collection "$HEALTHCHECK_COLLECTION"
     
   exit $?
 fi
@@ -573,13 +598,13 @@ if [[ "$SCRIPT_CMD" == "create" || "$SCRIPT_CMD" == "create_core" || "$SCRIPT_CM
 
   if [ $# -gt 0 ]; then
     while true; do
-      case $1 in
+      case "$1" in
           -c|-core|-collection)
               if [[ -z "$2" || "${2:0:1}" == "-" ]]; then
                 print_usage "$SCRIPT_CMD" "name is required when using the $1 option!"
                 exit 1
               fi
-              CREATE_NAME=$2
+              CREATE_NAME="$2"
               shift 2
           ;;
           -n|-confname)
@@ -643,7 +668,7 @@ if [[ "$SCRIPT_CMD" == "create" || "$SCRIPT_CMD" == "create_core" || "$SCRIPT_CM
   fi
 
   if [ -z "$CREATE_CONFDIR" ]; then
-    CREATE_CONFDIR=data_driven_schema_configs
+    CREATE_CONFDIR='data_driven_schema_configs'
   fi
 
   # validate the confdir arg
@@ -660,11 +685,11 @@ if [[ "$SCRIPT_CMD" == "create" || "$SCRIPT_CMD" == "create_core" || "$SCRIPT_CM
 
   # If not defined, use the collection name for the name of the configuration in ZooKeeper
   if [ -z "$CREATE_CONFNAME" ]; then
-    CREATE_CONFNAME=$CREATE_NAME
+    CREATE_CONFNAME="$CREATE_NAME"
   fi
 
   if [ -z "$CREATE_PORT" ]; then
-    for ID in `ps auxww | grep java | grep start.jar | awk '{print $2}' | sort -r`
+    for ID in `ps auxww | grep java | grep start\.jar | awk '{print $2}' | sort -r`
       do
         port=`jetty_port "$ID"`
         if [ "$port" != "" ]; then
@@ -680,14 +705,14 @@ if [[ "$SCRIPT_CMD" == "create" || "$SCRIPT_CMD" == "create_core" || "$SCRIPT_CM
   fi
 
   if [ "$SCRIPT_CMD" == "create_core" ]; then
-    run_tool create_core -name $CREATE_NAME -solrUrl $SOLR_URL_SCHEME://localhost:$CREATE_PORT/solr \
-      -confdir $CREATE_CONFDIR -configsetsDir $SOLR_TIP/server/solr/configsets
+    run_tool create_core -name "$CREATE_NAME" -solrUrl "$SOLR_URL_SCHEME://$SOLR_TOOL_HOST:$CREATE_PORT/solr" \
+      -confdir "$CREATE_CONFDIR" -configsetsDir "$SOLR_TIP/server/solr/configsets"
     exit $?
   else
-    run_tool $SCRIPT_CMD -name $CREATE_NAME -shards $CREATE_NUM_SHARDS -replicationFactor $CREATE_REPFACT \
-      -confname $CREATE_CONFNAME -confdir $CREATE_CONFDIR \
-      -configsetsDir $SOLR_TIP/server/solr/configsets \
-      -solrUrl $SOLR_URL_SCHEME://localhost:$CREATE_PORT/solr
+    run_tool "$SCRIPT_CMD" -name "$CREATE_NAME" -solrUrl "$SOLR_URL_SCHEME://$SOLR_TOOL_HOST:$CREATE_PORT/solr" \
+      -shards "$CREATE_NUM_SHARDS" -replicationFactor "$CREATE_REPFACT" \
+      -confname "$CREATE_CONFNAME" -confdir "$CREATE_CONFDIR" \
+      -configsetsDir "$SOLR_TIP/server/solr/configsets"
     exit $?
   fi
 fi
@@ -697,13 +722,13 @@ if [[ "$SCRIPT_CMD" == "delete" ]]; then
 
   if [ $# -gt 0 ]; then
     while true; do
-      case $1 in
+      case "$1" in
           -c|-core|-collection)
               if [[ -z "$2" || "${2:0:1}" == "-" ]]; then
                 print_usage "$SCRIPT_CMD" "name is required when using the $1 option!"
                 exit 1
               fi
-              DELETE_NAME=$2
+              DELETE_NAME="$2"
               shift 2
           ;;
           -p|-port)
@@ -754,7 +779,7 @@ if [[ "$SCRIPT_CMD" == "delete" ]]; then
   fi
 
   if [ -z "$DELETE_PORT" ]; then
-    for ID in `ps auxww | grep java | grep start.jar | awk '{print $2}' | sort -r`
+    for ID in `ps auxww | grep java | grep start\.jar | awk '{print $2}' | sort -r`
       do
         port=`jetty_port "$ID"`
         if [ "$port" != "" ]; then
@@ -769,8 +794,8 @@ if [[ "$SCRIPT_CMD" == "delete" ]]; then
     exit 1
   fi
 
-  run_tool delete -name $DELETE_NAME -deleteConfig $DELETE_CONFIG \
-    -solrUrl $SOLR_URL_SCHEME://localhost:$DELETE_PORT/solr
+  run_tool delete -name "$DELETE_NAME" -deleteConfig "$DELETE_CONFIG" \
+    -solrUrl "$SOLR_URL_SCHEME://$SOLR_TOOL_HOST:$DELETE_PORT/solr"
   exit $?
 fi
 
@@ -783,12 +808,15 @@ fi
 # Run in foreground (default is to run in the background)
 FG="false"
 noprompt=false
+SOLR_OPTS=($SOLR_OPTS)
+PASS_TO_RUN_EXAMPLE=
 
 if [ $# -gt 0 ]; then
   while true; do  
-    case $1 in
+    case "$1" in
         -c|-cloud)
             SOLR_MODE="solrcloud"
+            PASS_TO_RUN_EXAMPLE+=" -c"
             shift
         ;;
         -d|-dir)
@@ -798,17 +826,17 @@ if [ $# -gt 0 ]; then
             fi
 
             if [[ "$2" == "." || "$2" == "./" || "$2" == ".." || "$2" == "../" ]]; then
-              SOLR_SERVER_DIR=`pwd`/$2
+              SOLR_SERVER_DIR="$(pwd)/$2"
             else
               # see if the arg value is relative to the tip vs full path
-              if [[ $2 != /* ]] && [[ -d "$SOLR_TIP/$2" ]]; then
+              if [[ "$2" != /* ]] && [[ -d "$SOLR_TIP/$2" ]]; then
                 SOLR_SERVER_DIR="$SOLR_TIP/$2"
               else
                 SOLR_SERVER_DIR="$2"
               fi
             fi
             # resolve it to an absolute path
-            SOLR_SERVER_DIR=`cd "$SOLR_SERVER_DIR"; pwd`
+            SOLR_SERVER_DIR="$(cd "$SOLR_SERVER_DIR"; pwd)"
             shift 2
         ;;
         -s|-solr.home)
@@ -838,6 +866,7 @@ if [ $# -gt 0 ]; then
               exit 1
             fi
             SOLR_HOST="$2"
+            PASS_TO_RUN_EXAMPLE+=" -h $SOLR_HOST"
             shift 2
         ;;
         -m|-memory)
@@ -846,6 +875,7 @@ if [ $# -gt 0 ]; then
               exit 1
             fi
             SOLR_HEAP="$2"
+            PASS_TO_RUN_EXAMPLE+=" -m $SOLR_HEAP"
             shift 2
         ;;
         -p|-port)
@@ -854,6 +884,7 @@ if [ $# -gt 0 ]; then
               exit 1
             fi
             SOLR_PORT="$2"
+            PASS_TO_RUN_EXAMPLE+=" -p $SOLR_PORT"
             shift 2
         ;;
         -z|-zkhost)
@@ -863,10 +894,12 @@ if [ $# -gt 0 ]; then
             fi
             ZK_HOST="$2"
             SOLR_MODE="solrcloud"
+            PASS_TO_RUN_EXAMPLE+=" -z $ZK_HOST"
             shift 2
         ;;
         -a|-addlopts)
             ADDITIONAL_CMD_OPTS="$2"
+            PASS_TO_RUN_EXAMPLE+=" -a \"$ADDITIONAL_CMD_OPTS\""
             shift 2
         ;;
         -k|-key)
@@ -879,10 +912,12 @@ if [ $# -gt 0 ]; then
         ;;
         -noprompt)
             noprompt=true
+            PASS_TO_RUN_EXAMPLE+=" -noprompt"
             shift
         ;;
         -V|-verbose)
             verbose=true
+            PASS_TO_RUN_EXAMPLE+=" --verbose"
             shift
         ;;
         -all)
@@ -896,7 +931,8 @@ if [ $# -gt 0 ]; then
         *)
             if [ "${1:0:2}" == "-D" ]; then
               # pass thru any opts that begin with -D (java system props)
-              SOLR_OPTS="$SOLR_OPTS $1"
+              SOLR_OPTS+=("$1")
+              PASS_TO_RUN_EXAMPLE+=" $1"
               shift
             else
               if [ "$1" != "" ]; then
@@ -911,20 +947,8 @@ if [ $# -gt 0 ]; then
   done
 fi
 
-if $verbose ; then
-  echo "Using Solr root directory: $SOLR_TIP"
-  echo "Using Java: $JAVA"
-  $JAVA -version
-fi
-
-if [ "$SOLR_HOST" != "" ]; then
-  SOLR_HOST_ARG="-Dhost=$SOLR_HOST"
-else
-  SOLR_HOST_ARG=""
-fi
-
 if [ -z "$SOLR_SERVER_DIR" ]; then
-  SOLR_SERVER_DIR=$DEFAULT_SERVER_DIR
+  SOLR_SERVER_DIR="$DEFAULT_SERVER_DIR"
 fi
 
 if [ ! -e "$SOLR_SERVER_DIR" ]; then
@@ -932,157 +956,65 @@ if [ ! -e "$SOLR_SERVER_DIR" ]; then
   exit 1
 fi
 
-CLOUD_NUM_NODES=2
-declare -a CLOUD_PORTS=('8983' '7574' '8984' '7575');
-
-# select solr.solr.home based on the desired example
-if [ "$EXAMPLE" != "" ]; then
-    case $EXAMPLE in
-        cloud)
-            #
-            # Engage in an interactive session with user to setup the SolrCloud example
-            #
-            echo -e "\nWelcome to the SolrCloud example!\n\n"
-            if $noprompt ; then
-              CLOUD_NUM_NODES=2
-              echo -e "Starting up $CLOUD_NUM_NODES Solr nodes for your example SolrCloud cluster."
-            else
-              echo -e "This interactive session will help you launch a SolrCloud cluster on your local workstation.\n"
-              read -e -p "To begin, how many Solr nodes would you like to run in your local cluster? (specify 1-4 nodes) [2] " USER_INPUT
-              while true
-              do
-                CLOUD_NUM_NODES=`echo $USER_INPUT | tr -d ' '`
-                if [ -z "$CLOUD_NUM_NODES" ]; then
-                  CLOUD_NUM_NODES=2
-                fi
-                if [[ $CLOUD_NUM_NODES > 4 || $CLOUD_NUM_NODES < 1 ]]; then
-                  read -e -p "Please provide a node count between 1 and 4 [2] " USER_INPUT
-                else
-                  break;
-                fi
-              done
-              
-              echo -e "Ok, let's start up $CLOUD_NUM_NODES Solr nodes for your example SolrCloud cluster.\n"
-              for (( s=0; s<$CLOUD_NUM_NODES; s++ ))
-              do
-                read -e -p "Please enter the port for node$[$s+1] [${CLOUD_PORTS[$s]}] " USER_INPUT
-                while true
-                do
-                  # trim whitespace out of the user input
-                  CLOUD_PORT=`echo $USER_INPUT | tr -d ' '`
-                  
-                  # handle the default selection or empty input
-                  if [ -z "$CLOUD_PORT" ]; then
-                    CLOUD_PORT=${CLOUD_PORTS[$s]}
-                  fi
-                                  
-                  # check to see if something is already bound to that port
-                  if hash lsof 2>/dev/null ; then  # hash returns true if lsof is on the path
-                    PORT_IN_USE=`lsof -Pni:$CLOUD_PORT`
-                    if [ "$PORT_IN_USE" != "" ]; then
-                      read -e -p "Oops! Looks like port $CLOUD_PORT is already being used by another process. Please choose a different port. " USER_INPUT
-                    else
-                      CLOUD_PORTS[$s]=$CLOUD_PORT
-                      echo $CLOUD_PORT
-                      break;
-                    fi
-                  else
-                    CLOUD_PORTS[$s]=$CLOUD_PORT
-                    echo $CLOUD_PORT
-                    break;
-                  fi
-                done
-              done
-            fi       
-
-            # setup a unqiue solr.solr.home directory for each node
-            CLOUD_EXAMPLE_DIR=$SOLR_TIP/example/cloud
-            if [ ! -d "$CLOUD_EXAMPLE_DIR/node1/solr" ]; then
-              echo "Creating Solr home directory $CLOUD_EXAMPLE_DIR/node1/solr"
-              mkdir -p $CLOUD_EXAMPLE_DIR/node1/solr
-              cp $DEFAULT_SERVER_DIR/solr/solr.xml $CLOUD_EXAMPLE_DIR/node1/solr/
-              cp $DEFAULT_SERVER_DIR/solr/zoo.cfg $CLOUD_EXAMPLE_DIR/node1/solr/
-            fi
+if [[ "$FG" == 'true' && "$EXAMPLE" != "" ]]; then
+  FG='false'
+  echo -e "\nWARNING: Foreground mode (-f) not supported when running examples.\n"
+fi
 
-            for (( s=1; s<$CLOUD_NUM_NODES; s++ ))
-            do
-              ndx=$[$s+1]
-              if [ ! -d "$CLOUD_EXAMPLE_DIR/node$ndx" ]; then
-                echo "Cloning Solr home directory $CLOUD_EXAMPLE_DIR/node1 into $CLOUD_EXAMPLE_DIR/node$ndx"
-                cp -r $CLOUD_EXAMPLE_DIR/node1 $CLOUD_EXAMPLE_DIR/node$ndx
-              fi
-            done
-            SOLR_MODE="solrcloud"
-            SOLR_SERVER_DIR="$SOLR_TIP/server"
-            SOLR_HOME="$CLOUD_EXAMPLE_DIR/node1/solr"
-            SOLR_PORT=${CLOUD_PORTS[0]}
-            shift
-        ;;
-        techproducts)
-            SOLR_HOME="$SOLR_TIP/example/techproducts/solr"
-            mkdir -p $SOLR_HOME
-            if [ ! -f "$SOLR_HOME/solr.xml" ]; then
-              cp $DEFAULT_SERVER_DIR/solr/solr.xml $SOLR_HOME/solr.xml
-              cp $DEFAULT_SERVER_DIR/solr/zoo.cfg $SOLR_HOME/zoo.cfg
-            fi
-            EXAMPLE_CONFIGSET=sample_techproducts_configs
-            shift
-        ;;
-        dih)
-            SOLR_HOME="$SOLR_TIP/example/example-DIH/solr"
-            shift
-        ;;
-        schemaless)
-            SOLR_HOME="$SOLR_TIP/example/schemaless/solr"
-            mkdir -p $SOLR_HOME
-            if [ ! -f "$SOLR_HOME/solr.xml" ]; then
-              cp $DEFAULT_SERVER_DIR/solr/solr.xml $SOLR_HOME/solr.xml
-              cp $DEFAULT_SERVER_DIR/solr/zoo.cfg $SOLR_HOME/zoo.cfg
-            fi
-            EXAMPLE_CONFIGSET=data_driven_schema_configs
-            shift
-        ;;
-        *)
-            print_usage "start" "Unsupported example $EXAMPLE! Please choose one of: cloud, dih, schemaless, or techproducts"
-            exit 1
-        ;;
-    esac
+#
+# If the user specified an example to run, invoke the run_example tool (Java app) and exit
+# otherwise let this script proceed to process the user request
+#
+if [ -n "$EXAMPLE" ] && [ "$SCRIPT_CMD" == "start" ]; then
+  run_tool run_example -e $EXAMPLE -d "$SOLR_SERVER_DIR" -urlScheme $SOLR_URL_SCHEME $PASS_TO_RUN_EXAMPLE
+  exit $?
 fi
 
-if [[ "$FG" == "true" && "$EXAMPLE" != "" ]]; then
-  FG="false"
-  echo -e "\nWARNING: Foreground mode (-f) not supported when running examples.\n"
+############# start/stop logic below here ################
+
+if $verbose ; then
+  echo "Using Solr root directory: $SOLR_TIP"
+  echo "Using Java: $JAVA"
+  "$JAVA" -version
+fi
+
+if [ "$SOLR_HOST" != "" ]; then
+  SOLR_HOST_ARG=("-Dhost=$SOLR_HOST")
+else
+  SOLR_HOST_ARG=()
 fi
 
 if [ -z "$STOP_KEY" ]; then
-  STOP_KEY="solrrocks"
+  STOP_KEY='solrrocks'
 fi
 
 # stop all if no port specified
 if [[ "$SCRIPT_CMD" == "stop" && -z "$SOLR_PORT" ]]; then
   if $stop_all; then
     none_stopped=true
-    for PIDF in `find $SOLR_PID_DIR -name "solr-*.pid" -type f`
+    find "$SOLR_PID_DIR" -name "solr-*.pid" -type f | while read PIDF
       do
-        NEXT_PID=`cat $PIDF`
+        NEXT_PID=`cat "$PIDF"`
         port=`jetty_port "$NEXT_PID"`
         if [ "$port" != "" ]; then
           stop_solr "$SOLR_SERVER_DIR" "$port" "$STOP_KEY" "$NEXT_PID"
           none_stopped=false
         fi
-        rm -f $PIDF
+        rm -f "$PIDF"
     done
-    if $none_stopped; then
-      echo -e "\nNo Solr nodes found to stop.\n"
-    fi
+    # TODO: none_stopped doesn't get reflected across the subshell
+    # This can be uncommented once we find a clean way out of it
+    # if $none_stopped; then
+    #   echo -e "\nNo Solr nodes found to stop.\n"
+    # fi
   else
     # not stopping all and don't have a port, but if we can find the pid file for the default port 8983, then use that
     none_stopped=true
-    numSolrs=`find $SOLR_PID_DIR -name "solr-*.pid" -type f | wc -l | tr -d ' '`
+    numSolrs=`find "$SOLR_PID_DIR" -name "solr-*.pid" -type f | wc -l | tr -d ' '`
     if [ $numSolrs -eq 1 ]; then
       # only do this if there is only 1 node running, otherwise they must provide the -p or -all
-      PID=`find $SOLR_PID_DIR -name "solr-*.pid" -type f -exec cat {} \;`
-      CHECK_PID=`ps auxww | awk '{print $2}' | grep $PID | sort -r | tr -d ' '`
+      PID="$(cat "$(find "$SOLR_PID_DIR" -name "solr-*.pid" -type f)")"
+      CHECK_PID=`ps auxww | awk '{print $2}' | grep -w $PID | sort -r | tr -d ' '`
       if [ "$CHECK_PID" != "" ]; then
         port=`jetty_port "$CHECK_PID"`
         if [ "$port" != "" ]; then
@@ -1105,7 +1037,7 @@ if [[ "$SCRIPT_CMD" == "stop" && -z "$SOLR_PORT" ]]; then
 fi
 
 if [ -z "$SOLR_PORT" ]; then
-  SOLR_PORT="8983"
+  SOLR_PORT=8983
 fi
 
 if [ -z "$STOP_PORT" ]; then
@@ -1115,10 +1047,12 @@ fi
 if [[ "$SCRIPT_CMD" == "start" ]]; then
   # see if Solr is already running
   SOLR_PID=`solr_pid_by_port "$SOLR_PORT"`
+
   if [ -z "$SOLR_PID" ]; then
     # not found using the pid file ... but use ps to ensure not found
-    SOLR_PID=`ps auxww | grep start.jar | grep $SOLR_PORT | grep -v grep | awk '{print $2}' | sort -r`
+    SOLR_PID=`ps auxww | grep start\.jar | grep -w $SOLR_PORT | grep -v grep | awk '{print $2}' | sort -r`
   fi
+
   if [ "$SOLR_PID" != "" ]; then
     echo -e "\nPort $SOLR_PORT is already being used by another process (pid: $SOLR_PID)\nPlease choose a different port using the -p option.\n"
     exit 1
@@ -1129,7 +1063,7 @@ else
   SOLR_PID=`solr_pid_by_port "$SOLR_PORT"`
   if [ -z "$SOLR_PID" ]; then
     # not found using the pid file ... but use ps to ensure not found
-    SOLR_PID=`ps auxww | grep start.jar | grep $SOLR_PORT | grep -v grep | awk '{print $2}' | sort -r`
+    SOLR_PID=`ps auxww | grep start\.jar | grep -w $SOLR_PORT | grep -v grep | awk '{print $2}' | sort -r`
   fi
   if [ "$SOLR_PID" != "" ]; then
     stop_solr "$SOLR_SERVER_DIR" "$SOLR_PORT" "$STOP_KEY" "$SOLR_PID"
@@ -1146,25 +1080,26 @@ if [ -z "$SOLR_HOME" ]; then
 else
   if [[ $SOLR_HOME != /* ]] && [[ -d "$SOLR_SERVER_DIR/$SOLR_HOME" ]]; then
     SOLR_HOME="$SOLR_SERVER_DIR/$SOLR_HOME"
-    SOLR_PID_DIR=$SOLR_HOME
+    SOLR_PID_DIR="$SOLR_HOME"
   elif [[ $SOLR_HOME != /* ]] && [[ -d "`pwd`/$SOLR_HOME" ]]; then
-    SOLR_HOME="`pwd`/$SOLR_HOME"
+    SOLR_HOME="$(pwd)/$SOLR_HOME"
   fi
 fi
 
 # This is quite hacky, but examples rely on a different log4j.properties
 # so that we can write logs for examples to $SOLR_HOME/../logs
 if [ -z "$SOLR_LOGS_DIR" ]; then
-  SOLR_LOGS_DIR=$SOLR_SERVER_DIR/logs
+  SOLR_LOGS_DIR="$SOLR_SERVER_DIR/logs"
 fi
-EXAMPLE_DIR=$SOLR_TIP/example
-if [ "${SOLR_HOME:0:${#EXAMPLE_DIR}}" = $EXAMPLE_DIR ]; then
-  LOG4J_PROPS=$EXAMPLE_DIR/resources/log4j.properties
-  SOLR_LOGS_DIR=$SOLR_HOME/../logs
+EXAMPLE_DIR="$SOLR_TIP/example"
+if [ "${SOLR_HOME:0:${#EXAMPLE_DIR}}" = "$EXAMPLE_DIR" ]; then
+  LOG4J_PROPS="$EXAMPLE_DIR/resources/log4j.properties"
+  SOLR_LOGS_DIR="$SOLR_HOME/../logs"
 fi
 
+LOG4J_CONFIG=()
 if [ -n "$LOG4J_PROPS" ]; then
-  LOG4J_CONFIG="-Dlog4j.configuration=file:$LOG4J_PROPS"
+  LOG4J_CONFIG+=("-Dlog4j.configuration=file:$LOG4J_PROPS")
 fi
 
 if [ "$SCRIPT_CMD" == "stop" ]; then
@@ -1178,87 +1113,106 @@ if [ ! -e "$SOLR_HOME" ]; then
   echo -e "\nSolr home directory $SOLR_HOME not found!\n"
   exit 1
 fi
-if [ ! -e "$SOLR_HOME/solr.xml" ]; then
-  echo -e "\nSolr home directory $SOLR_HOME must contain a solr.xml file!\n"
-  exit 1
-fi
 
 # backup the log files before starting
-if [ -f $SOLR_LOGS_DIR/solr.log ]; then
+if [ -f "$SOLR_LOGS_DIR/solr.log" ]; then
   if $verbose ; then
     echo "Backing up $SOLR_LOGS_DIR/solr.log"
   fi
-  mv $SOLR_LOGS_DIR/solr.log $SOLR_LOGS_DIR/solr_log_`date +"%Y%m%d_%H%M"`
+  mv "$SOLR_LOGS_DIR/solr.log" "$SOLR_LOGS_DIR/solr_log_$(date +"%Y%m%d_%H%M")"
 fi
 
-if [ -f $SOLR_LOGS_DIR/solr_gc.log ]; then
+if [ -f "$SOLR_LOGS_DIR/solr_gc.log" ]; then
   if $verbose ; then
     echo "Backing up $SOLR_LOGS_DIR/solr_gc.log"
   fi
-  mv $SOLR_LOGS_DIR/solr_gc.log $SOLR_LOGS_DIR/solr_gc_log_`date +"%Y%m%d_%H%M"`
+  mv "$SOLR_LOGS_DIR/solr_gc.log" "$SOLR_LOGS_DIR/solr_gc_log_$(date +"%Y%m%d_%H%M")"
+fi
+
+java_ver_out=`echo "$("$JAVA" -version 2>&1)"`
+JAVA_VERSION=`echo $java_ver_out | grep "java version" | awk '{ print substr($3, 2, length($3)-2); }'`
+JAVA_VENDOR="Oracle"
+if [ "`echo $java_ver_out | grep -i "IBM J9"`" != "" ]; then
+  JAVA_VENDOR="IBM J9"
 fi
 
 # if verbose gc logging enabled, setup the location of the log file
 if [ "$GC_LOG_OPTS" != "" ]; then
-  GC_LOG_OPTS="$GC_LOG_OPTS -Xloggc:$SOLR_LOGS_DIR/solr_gc.log"
+  gc_log_flag="-Xloggc"
+  if [ "$JAVA_VENDOR" == "IBM J9" ]; then
+    gc_log_flag="-Xverbosegclog"
+  fi
+  GC_LOG_OPTS=($GC_LOG_OPTS "$gc_log_flag:$SOLR_LOGS_DIR/solr_gc.log")
+else
+  GC_LOG_OPTS=()
+fi
+
+# If ZK_HOST is defined, the assume SolrCloud mode
+if [[ -n "$ZK_HOST" ]]; then
+  SOLR_MODE="solrcloud"
 fi
 
-if [ "$SOLR_MODE" == "solrcloud" ]; then
+if [ "$SOLR_MODE" == 'solrcloud' ]; then
   if [ -z "$ZK_CLIENT_TIMEOUT" ]; then
     ZK_CLIENT_TIMEOUT="15000"
   fi
   
-  CLOUD_MODE_OPTS="-DzkClientTimeout=$ZK_CLIENT_TIMEOUT"
+  CLOUD_MODE_OPTS=("-DzkClientTimeout=$ZK_CLIENT_TIMEOUT")
   
   if [ "$ZK_HOST" != "" ]; then
-    CLOUD_MODE_OPTS="$CLOUD_MODE_OPTS -DzkHost=$ZK_HOST"
+    CLOUD_MODE_OPTS+=("-DzkHost=$ZK_HOST")
   else
     if $verbose ; then
       echo "Configuring SolrCloud to launch an embedded ZooKeeper using -DzkRun"
     fi
 
-    CLOUD_MODE_OPTS="$CLOUD_MODE_OPTS -DzkRun"
+    CLOUD_MODE_OPTS+=('-DzkRun')
   fi
 
   # and if collection1 needs to be bootstrapped
   if [ -e "$SOLR_HOME/collection1/core.properties" ]; then
-    CLOUD_MODE_OPTS="$CLOUD_MODE_OPTS -Dbootstrap_confdir=./solr/collection1/conf -Dcollection.configName=myconf -DnumShards=1"
+    CLOUD_MODE_OPTS+=('-Dbootstrap_confdir=./solr/collection1/conf' '-Dcollection.configName=myconf' '-DnumShards=1')
   fi
     
+else
+  if [ ! -e "$SOLR_HOME/solr.xml" ]; then
+    echo -e "\nSolr home directory $SOLR_HOME must contain a solr.xml file!\n"
+    exit 1
+  fi
 fi
 
 # These are useful for attaching remote profilers like VisualVM/JConsole
 if [ "$ENABLE_REMOTE_JMX_OPTS" == "true" ]; then
 
   if [ -z "$RMI_PORT" ]; then
-    RMI_PORT=1$SOLR_PORT
+    RMI_PORT="1$SOLR_PORT"
   fi
 
-  REMOTE_JMX_OPTS="-Dcom.sun.management.jmxremote \
--Dcom.sun.management.jmxremote.local.only=false \
--Dcom.sun.management.jmxremote.ssl=false \
--Dcom.sun.management.jmxremote.authenticate=false \
--Dcom.sun.management.jmxremote.port=$RMI_PORT \
--Dcom.sun.management.jmxremote.rmi.port=$RMI_PORT"
+  REMOTE_JMX_OPTS=('-Dcom.sun.management.jmxremote' \
+    '-Dcom.sun.management.jmxremote.local.only=false' \
+    '-Dcom.sun.management.jmxremote.ssl=false' \
+    '-Dcom.sun.management.jmxremote.authenticate=false' \
+    "-Dcom.sun.management.jmxremote.port=$RMI_PORT" \
+    "-Dcom.sun.management.jmxremote.rmi.port=$RMI_PORT")
 
   # if the host is set, then set that as the rmi server hostname
   if [ "$SOLR_HOST" != "" ]; then
-    REMOTE_JMX_OPTS="$REMOTE_JMX_OPTS -Djava.rmi.server.hostname=$SOLR_HOST"
+    REMOTE_JMX_OPTS+=("-Djava.rmi.server.hostname=$SOLR_HOST")
   fi
 else
-  REMOTE_JMX_OPTS=""
+  REMOTE_JMX_OPTS=()
 fi
 
-if [ "$SOLR_HEAP" != "" ]; then
-  SOLR_JAVA_MEM="-Xms$SOLR_HEAP -Xmx$SOLR_HEAP"
-fi
-
-if [ -z "$SOLR_JAVA_MEM" ]; then
-  SOLR_JAVA_MEM="-Xms512m -Xmx512m"
+JAVA_MEM_OPTS=()
+if [ -z "$SOLR_HEAP" ] && [ -n "$SOLR_JAVA_MEM" ]; then
+  JAVA_MEM_OPTS=($SOLR_JAVA_MEM)
+else
+  SOLR_HEAP="${SOLR_HEAP:-512m}"
+  JAVA_MEM_OPTS=("-Xms$SOLR_HEAP" "-Xmx$SOLR_HEAP")
 fi
 
 if [ -z "$SOLR_TIMEZONE" ]; then
-  SOLR_TIMEZONE="UTC"
+  SOLR_TIMEZONE='UTC'
 fi
 
 # Launches Solr in foreground/background depending on parameters
@@ -1269,26 +1223,30 @@ function launch_solr() {
   
   SOLR_ADDL_ARGS="$2"
 
+  GC_TUNE=($GC_TUNE)
   # deal with Java version specific GC and other flags
-  JAVA_VERSION=`echo "$($JAVA -version 2>&1)" | grep "java version" | awk '{ print substr($3, 2, length($3)-2); }'`
   if [ "${JAVA_VERSION:0:3}" == "1.7" ]; then
     # Specific Java version hacking
-    GC_TUNE="$GC_TUNE -XX:CMSFullGCsBeforeCompaction=1 -XX:CMSTriggerPermRatio=80"
-    JAVA_MINOR_VERSION=${JAVA_VERSION:(-2)}
-    if [[ $JAVA_MINOR_VERSION -ge 40 && $JAVA_MINOR_VERSION -le 51 ]]; then
-      GC_TUNE="$GC_TUNE -XX:-UseSuperWord"
-      echo -e "\nWARNING: Java version $JAVA_VERSION has known bugs with Lucene and requires the -XX:-UseSuperWord flag. Please consider upgrading your JVM.\n"
+    GC_TUNE+=('-XX:CMSFullGCsBeforeCompaction=1' '-XX:CMSTriggerPermRatio=80')
+    if [ "$JAVA_VENDOR" != "IBM J9" ]; then
+      JAVA_MINOR_VERSION=${JAVA_VERSION:(-2)}
+      if [[ $JAVA_MINOR_VERSION -ge 40 && $JAVA_MINOR_VERSION -le 51 ]]; then
+        GC_TUNE+=('-XX:-UseSuperWord')
+        echo -e "\nWARNING: Java version $JAVA_VERSION has known bugs with Lucene and requires the -XX:-UseSuperWord flag. Please consider upgrading your JVM.\n"
+      fi
     fi
   fi
 
   # If SSL-related system props are set, add them to SOLR_OPTS
   if [ -n "$SOLR_SSL_OPTS" ]; then
-    # If using SSL and jetty.ssl.port not set explicitly, use the jetty.port
-    SSL_PORT_PROP="-Djetty.ssl.port=$SOLR_PORT"
-    if [ -n "$SOLR_SSL_PORT" ]; then
-      SSL_PORT_PROP="-Djetty.ssl.port=$SOLR_SSL_PORT"
-    fi
-    SOLR_OPTS="$SOLR_OPTS $SOLR_SSL_OPTS $SSL_PORT_PROP"
+    # If using SSL and solr.jetty.https.port not set explicitly, use the jetty.port
+    SSL_PORT_PROP="-Dsolr.jetty.https.port=$SOLR_PORT"
+    SOLR_OPTS+=($SOLR_SSL_OPTS "$SSL_PORT_PROP")
+  fi
+
+  # If authentication system props are set, add them to SOLR_OPTS
+  if [ -n "$AUTHC_OPTS" ]; then
+    SOLR_OPTS+=($AUTHC_OPTS)
   fi
 
   if $verbose ; then
@@ -1299,17 +1257,17 @@ function launch_solr() {
     echo -e "    SOLR_HOST       = $SOLR_HOST"
     echo -e "    SOLR_PORT       = $SOLR_PORT"
     echo -e "    STOP_PORT       = $STOP_PORT"
-    echo -e "    SOLR_JAVA_MEM   = $SOLR_JAVA_MEM"
-    echo -e "    GC_TUNE         = $GC_TUNE"
-    echo -e "    GC_LOG_OPTS     = $GC_LOG_OPTS"
+    echo -e "    JAVA_MEM_OPTS   = ${JAVA_MEM_OPTS[@]}"
+    echo -e "    GC_TUNE         = ${GC_TUNE[@]}"
+    echo -e "    GC_LOG_OPTS     = ${GC_LOG_OPTS[@]}"
     echo -e "    SOLR_TIMEZONE   = $SOLR_TIMEZONE"
 
     if [ "$SOLR_MODE" == "solrcloud" ]; then
-      echo -e "    CLOUD_MODE_OPTS = $CLOUD_MODE_OPTS"
+      echo -e "    CLOUD_MODE_OPTS = ${CLOUD_MODE_OPTS[@]}"
     fi
 
     if [ "$SOLR_OPTS" != "" ]; then
-      echo -e "    SOLR_OPTS        = $SOLR_OPTS"
+      echo -e "    SOLR_OPTS        = ${SOLR_OPTS[@]}"
     fi
 
     if [ "$SOLR_ADDL_ARGS" != "" ]; then
@@ -1318,214 +1276,75 @@ function launch_solr() {
 
     if [ "$ENABLE_REMOTE_JMX_OPTS" == "true" ]; then
       echo -e "    RMI_PORT        = $RMI_PORT"
-      echo -e "    REMOTE_JMX_OPTS = $REMOTE_JMX_OPTS"
+      echo -e "    REMOTE_JMX_OPTS = ${REMOTE_JMX_OPTS[@]}"
     fi
     echo -e "\n"
   fi
     
   # need to launch solr from the server dir
-  cd $SOLR_SERVER_DIR
+  cd "$SOLR_SERVER_DIR"
   
   if [ ! -e "$SOLR_SERVER_DIR/start.jar" ]; then
     echo -e "\nERROR: start.jar file not found in $SOLR_SERVER_DIR!\nPlease check your -d parameter to set the correct Solr server directory.\n"
     exit 1
   fi
 
-  SOLR_START_OPTS="-server -Xss256k $SOLR_JAVA_MEM $GC_TUNE $GC_LOG_OPTS $REMOTE_JMX_OPTS \
- $CLOUD_MODE_OPTS \
--DSTOP.PORT=$stop_port -DSTOP.KEY=$STOP_KEY \
-$SOLR_HOST_ARG -Djetty.port=$SOLR_PORT \
--Dsolr.solr.home=$SOLR_HOME \
--Dsolr.install.dir=$SOLR_TIP \
--Duser.timezone=$SOLR_TIMEZONE \
--Djava.net.preferIPv4Stack=true $LOG4J_CONFIG \
-$SOLR_OPTS"
-  
+  SOLR_START_OPTS=('-server' '-Xss256k' "${JAVA_MEM_OPTS[@]}" "${GC_TUNE[@]}" "${GC_LOG_OPTS[@]}" \
+    "${REMOTE_JMX_OPTS[@]}" "${CLOUD_MODE_OPTS[@]}" \
+    "-Djetty.port=$SOLR_PORT" "-DSTOP.PORT=$stop_port" "-DSTOP.KEY=$STOP_KEY" \
+    "${SOLR_HOST_ARG[@]}" "-Duser.timezone=$SOLR_TIMEZONE" \
+    "-Djetty.home=$SOLR_SERVER_DIR" "-Dsolr.solr.home=$SOLR_HOME" "-Dsolr.install.dir=$SOLR_TIP" \
+    "${LOG4J_CONFIG[@]}" "${SOLR_OPTS[@]}")
+
   if [ "$SOLR_MODE" == "solrcloud" ]; then
     IN_CLOUD_MODE=" in SolrCloud mode"
   fi
 
-  mkdir -p $SOLR_LOGS_DIR
+  mkdir -p "$SOLR_LOGS_DIR"
 
   if [ "$run_in_foreground" == "true" ]; then
     echo -e "\nStarting Solr$IN_CLOUD_MODE on port $SOLR_PORT from $SOLR_SERVER_DIR\n"
-    $JAVA $SOLR_START_OPTS $SOLR_ADDL_ARGS -jar start.jar $SOLR_JETTY_CONFIG
+    "$JAVA" "${SOLR_START_OPTS[@]}" $SOLR_ADDL_ARGS -jar start.jar "${SOLR_JETTY_CONFIG[@]}"
   else
     # run Solr in the background
-    nohup $JAVA $SOLR_START_OPTS $SOLR_ADDL_ARGS -XX:OnOutOfMemoryError="$SOLR_TIP/bin/oom_solr.sh $SOLR_PORT $SOLR_LOGS_DIR" -jar start.jar $SOLR_JETTY_CONFIG 1>$SOLR_LOGS_DIR/solr-$SOLR_PORT-console.log 2>&1 & echo $! > $SOLR_PID_DIR/solr-$SOLR_PORT.pid
-  
+    nohup "$JAVA" "${SOLR_START_OPTS[@]}" $SOLR_ADDL_ARGS -jar start.jar \
+	"-XX:OnOutOfMemoryError=$SOLR_TIP/bin/oom_solr.sh $SOLR_PORT $SOLR_LOGS_DIR" "${SOLR_JETTY_CONFIG[@]}" \
+	1>"$SOLR_LOGS_DIR/solr-$SOLR_PORT-console.log" 2>&1 & echo $! > "$SOLR_PID_DIR/solr-$SOLR_PORT.pid"
+
     # no lsof on cygwin though
     if hash lsof 2>/dev/null ; then  # hash returns true if lsof is on the path
-      echo -n "Waiting to see Solr listening on port $SOLR_PORT"
+      echo -n "Waiting up to 30 seconds to see Solr running on port $SOLR_PORT"
       # Launch in a subshell to show the spinner
       (loops=0
       while true
       do
-        running=`lsof -Pni:$SOLR_PORT`
+        running=`lsof -PniTCP:$SOLR_PORT -sTCP:LISTEN`
         if [ -z "$running" ]; then
           if [ $loops -lt 6 ]; then
             sleep 5
             loops=$[$loops+1]
           else
             echo -e "Still not seeing Solr listening on $SOLR_PORT after 30 seconds!"
-            tail -30 $SOLR_LOGS_DIR/solr.log
-            exit;
+            tail -30 "$SOLR_LOGS_DIR/solr.log"
+            exit # subshell!
           fi
         else
-          SOLR_PID=`ps auxww | grep start.jar | grep $SOLR_PORT | grep -v grep | awk '{print $2}' | sort -r`
+          SOLR_PID=`ps auxww | grep start\.jar | grep -w $SOLR_PORT | grep -v grep | awk '{print $2}' | sort -r`
           echo -e "\nStarted Solr server on port $SOLR_PORT (pid=$SOLR_PID). Happy searching!\n"
-          exit;
+          exit # subshell!
         fi
       done) &
       spinner $!
     else
-      SOLR_PID=`ps auxww | grep start.jar | grep $SOLR_PORT | grep -v grep | awk '{print $2}' | sort -r`
+      echo -e "NOTE: Please install lsof as this script needs it to determine if Solr is listening on port $SOLR_PORT."
+      sleep 10
+      SOLR_PID=`ps auxww | grep start\.jar | grep -w $SOLR_PORT | grep -v grep | awk '{print $2}' | sort -r`
       echo -e "\nStarted Solr server on port $SOLR_PORT (pid=$SOLR_PID). Happy searching!\n"
-      exit;
+      return;
     fi
   fi
 }
 
-if [ "$EXAMPLE" != "cloud" ]; then
-  launch_solr "$FG" "$ADDITIONAL_CMD_OPTS"
-
-  # create the core/collection for the requested example after launching Solr
-  if [[ "$EXAMPLE" == "schemaless" || "$EXAMPLE" == "techproducts" ]]; then
-
-    if [ "$EXAMPLE" == "schemaless" ]; then
-      EXAMPLE_NAME=gettingstarted
-    else
-      EXAMPLE_NAME=$EXAMPLE
-    fi
-
-    run_tool create -name $EXAMPLE_NAME -shards 1 -replicationFactor 1 \
-      -confname $EXAMPLE_NAME -confdir $EXAMPLE_CONFIGSET \
-      -configsetsDir $SOLR_TIP/server/solr/configsets -solrUrl $SOLR_URL_SCHEME://localhost:$SOLR_PORT/solr
-    if [ $? -ne 0 ]; then
-      exit 1
-    fi
-
-    if [ "$EXAMPLE" == "techproducts" ]; then
-      echo "Indexing tech product example docs from $SOLR_TIP/example/exampledocs"
-      "$JAVA" $SOLR_SSL_OPTS -Durl=$SOLR_URL_SCHEME://localhost:$SOLR_PORT/solr/$EXAMPLE/update -jar $SOLR_TIP/example/exampledocs/post.jar $SOLR_TIP/example/exampledocs/*.xml
-    fi
-
-    echo -e "\nSolr $EXAMPLE example launched successfully. Direct your Web browser to $SOLR_URL_SCHEME://localhost:$SOLR_PORT/solr to visit the Solr Admin UI\n"
-  fi
-else
-  #
-  # SolrCloud example is a bit involved so needs special handling here
-  #
-  SOLR_SERVER_DIR=$SOLR_TIP/server
-  SOLR_HOME=$SOLR_TIP/example/cloud/node1/solr
-  SOLR_PORT=${CLOUD_PORTS[0]}
-
-  if [ "$ZK_HOST" != "" ]; then
-    DASHZ="-z $ZK_HOST"
-  fi
-
-  if [ "$SOLR_HEAP" != "" ]; then
-    DASHM="-m $SOLR_HEAP"
-  fi
-
-  if [ "$ADDITIONAL_CMD_OPTS" != "" ]; then
-    DASHA="-a $ADDITIONAL_CMD_OPTS"
-  fi
-
-  echo -e "\nStarting up SolrCloud node1 on port ${CLOUD_PORTS[0]} using command:\n"
-  echo -e "solr start -cloud -s example/cloud/node1/solr -p $SOLR_PORT $DASHZ $DASHM $DASHA\n\n"
-    
-  # can't launch this node in the foreground else we can't run anymore commands
-  launch_solr "false" "$ADDITIONAL_CMD_OPTS"
-
-  # if user did not define a specific -z parameter, assume embedded in first cloud node we launched above
-  zk_host=$ZK_HOST
-  if [ -z "$zk_host" ]; then
-    zk_port=$[$SOLR_PORT+1000]
-    zk_host=localhost:$zk_port
-  fi
-
-  for (( s=1; s<$CLOUD_NUM_NODES; s++ ))
-  do
-    ndx=$[$s+1]
-    next_port=${CLOUD_PORTS[$s]}
-    echo -e "\n\nStarting node$ndx on port $next_port using command:\n"
-    echo -e "solr start -cloud -s example/cloud/node$ndx/solr -p $next_port -z $zk_host $DASHM $DASHA \n\n"
-    # call this script again with correct args for next node    
-    $SOLR_TIP/bin/solr start -cloud -s $SOLR_TIP/example/cloud/node$ndx/solr -p $next_port -z $zk_host $DASHM $DASHA
-  done
-  
-  # TODO: better (shorter) name??
-  CLOUD_COLLECTION=gettingstarted
-    
-  if $noprompt ; then
-    CLOUD_NUM_SHARDS=2
-    CLOUD_REPFACT=2
-    CLOUD_CONFIG=data_driven_schema_configs
-  else
-    echo -e "\nNow let's create a new collection for indexing documents in your $CLOUD_NUM_NODES-node cluster.\n"
-    read -e -p "Please provide a name for your new collection: [gettingstarted] " USER_INPUT
-    # trim whitespace out of the user input
-    CLOUD_COLLECTION=`echo $USER_INPUT | tr -d ' '`
-
-    # handle the default selection or empty input
-    if [ -z "$CLOUD_COLLECTION" ]; then
-      CLOUD_COLLECTION=gettingstarted
-    fi                    
-    echo $CLOUD_COLLECTION
-
-    USER_INPUT=
-    read -e -p "How many shards would you like to split $CLOUD_COLLECTION into? [2] " USER_INPUT
-    # trim whitespace out of the user input
-    CLOUD_NUM_SHARDS=`echo $USER_INPUT | tr -d ' '`
-    
-    # handle the default selection or empty input
-    if [ -z "$CLOUD_NUM_SHARDS" ]; then
-      CLOUD_NUM_SHARDS=2
-    fi                    
-    echo $CLOUD_NUM_SHARDS
-    
-    USER_INPUT=
-    read -e -p "How many replicas per shard would you like to create? [2] " USER_INPUT
-    # trim whitespace out of the user input
-    CLOUD_REPFACT=`echo $USER_INPUT | tr -d ' '`
-    
-    # handle the default selection or empty input
-    if [ -z "$CLOUD_REPFACT" ]; then
-      CLOUD_REPFACT=2
-    fi                    
-    echo $CLOUD_REPFACT
-
-    USER_INPUT=
-    echo "Please choose a configuration for the $CLOUD_COLLECTION collection, available options are:"
-    read -e -p "basic_configs, data_driven_schema_configs, or sample_techproducts_configs [data_driven_schema_configs] " USER_INPUT
-    while true
-    do
-      # trim whitespace out of the user input
-      CLOUD_CONFIG=`echo $USER_INPUT | tr -d ' '`
-
-      # handle the default selection or empty input
-      if [ -z "$CLOUD_CONFIG" ]; then
-        CLOUD_CONFIG=data_driven_schema_configs
-      fi
-
-      # validate the confdir arg
-      if [[ ! -d "$SOLR_TIP/server/solr/configsets/$CLOUD_CONFIG" && ! -d "$CLOUD_CONFIG" ]]; then
-        echo -e "\nOops! Specified configuration $CLOUD_CONFIG not found!"
-        read -e -p "Choose one of: basic_configs, data_driven_schema_configs, or sample_techproducts_configs [data_driven_schema_configs] " USER_INPUT
-        CLOUD_CONFIG=
-      else
-        break;
-      fi
-    done
-
-  fi
-   
-  run_tool create_collection -name $CLOUD_COLLECTION -shards $CLOUD_NUM_SHARDS -replicationFactor $CLOUD_REPFACT \
-    -confname $CLOUD_COLLECTION -confdir $CLOUD_CONFIG \
-    -configsetsDir $SOLR_TIP/server/solr/configsets -solrUrl $SOLR_URL_SCHEME://localhost:$SOLR_PORT/solr
-
-  echo -e "\n\nSolrCloud example running, please visit $SOLR_URL_SCHEME://localhost:$SOLR_PORT/solr \n\n"
-fi
+launch_solr "$FG" "$ADDITIONAL_CMD_OPTS"
 
 exit $?