Ticket #31155: solr.in.2.diff

files/solr.in

@@ -2 +2 @@
 
 CMDNAME=`basename "$0"`
 
-export JAVA_HOME=@JAVA_HOME@
-SOLR=@TARGET@
-
 usage() {
-    echo "Usage: ${CMDNAME} path/to/config/dir" 1>&2
+    echo "Usage: ${CMDNAME} [-h|--help] [solr_home]" 1>&2
     exit 1
 }
 
-if [ -z "$1" ]; then
-    usage
-else
-    cd ${SOLR} && exec ${JAVA_HOME}/bin/java -Dsolr.solr.home="$1" -jar ${SOLR}/start.jar
-fi
+SOLR_PATH=@solr_path@
+SOLR_HOME=@solr_home@
+
+while test -n "$1"; do
+    case "$1" in
+        -h|--help) usage ;;
+        *)         SOLR_HOME="$1";    shift ;;
+    esac
+done
+
+java -Dsolr.clustering.enabled=true \
+     -Dsolr.solr.home="${SOLR_HOME}" \
+     -Djetty.home="${SOLR_PATH}" \
+     -jar ${SOLR_PATH}/start.jar