SOLR-3617: clean-up a few error messages and update changes to add to 4.10 release

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1619461 13f79535-47bb-0310-9956-ffa450edef68

solr/CHANGES.txt

@@ -196,6 +196,9 @@ New Features
 
 * SOLR-5244: Exporting Full Sorted Result Sets (Erik Hatcher, Joel Bernstein)
 
+* SOLR-3617: bin/solr and bin/solr.cmd scripts for starting, stopping, and running Solr examples
+  (Timothy Potter)
+
 Bug Fixes
 ----------------------
 

solr/bin/solr

@@ -307,7 +307,7 @@ if [ "$SCRIPT_CMD" == "healthcheck" ]; then
       case $1 in
           -c|-collection)
               if [ "${2:0:1}" == "-" ]; then
-                print_usage "$SCRIPT_CMD" "$2 is not a valid collection!"
+                print_usage "$SCRIPT_CMD" "Expected collection name but found $2 instead!"
                 exit 1            
               fi
               HEALTHCHECK_COLLECTION=$2
@@ -315,7 +315,7 @@ if [ "$SCRIPT_CMD" == "healthcheck" ]; then
           ;;
           -z|-zkhost)          
               if [ "${2:0:1}" == "-" ]; then
-                print_usage "$SCRIPT_CMD" "$2 is not a valid ZooKeeper connnection string!"
+                print_usage "$SCRIPT_CMD" "Expected a ZooKeeper connection string but found $2 instead!"
                 exit 1            
               fi          
               ZK_HOST="$2"
@@ -392,7 +392,7 @@ if [ $# -gt 0 ]; then
         ;;
         -d|-dir)
             if [ "${2:0:1}" == "-" ]; then
-              print_usage "$SCRIPT_CMD" "$2 is not a valid directory!"
+              print_usage "$SCRIPT_CMD" "Expected directory but found $2 instead!"
               exit 1            
             fi
 
@@ -406,7 +406,7 @@ if [ $# -gt 0 ]; then
         ;;
         -e|-example)
             if [ "${2:0:1}" == "-" ]; then
-              print_usage "$SCRIPT_CMD" "$2 is not a valid example!"
+              print_usage "$SCRIPT_CMD" "Expected example name but found $2 instead!"
               exit 1            
             fi
             EXAMPLE="$2"
@@ -418,7 +418,7 @@ if [ $# -gt 0 ]; then
         ;;
         -h|-host)
             if [ "${2:0:1}" == "-" ]; then
-              print_usage "$SCRIPT_CMD" "$2 is not a valid hostname!"
+              print_usage "$SCRIPT_CMD" "Expected hostname but found $2 instead!"
               exit 1            
             fi
             SOLR_HOST="$2"
@@ -426,7 +426,7 @@ if [ $# -gt 0 ]; then
         ;;
         -m|-memory)
             if [ "${2:0:1}" == "-" ]; then
-              print_usage "$SCRIPT_CMD" "$2 is not a valid memory setting!"
+              print_usage "$SCRIPT_CMD" "Expected memory setting but found $2 instead!"
               exit 1            
             fi            
             SOLR_HEAP="$2"
@@ -434,7 +434,7 @@ if [ $# -gt 0 ]; then
         ;;
         -p|-port)
             if [ "${2:0:1}" == "-" ]; then
-              print_usage "$SCRIPT_CMD" "$2 is not a valid port!"
+              print_usage "$SCRIPT_CMD" "Expected port number but found $2 instead!"
               exit 1            
             fi            
             SOLR_PORT="$2"
@@ -442,7 +442,7 @@ if [ $# -gt 0 ]; then
         ;;
         -z|-zkhost)
             if [ "${2:0:1}" == "-" ]; then
-              print_usage "$SCRIPT_CMD" "$2 is not a valid ZooKeeper connection string!"
+              print_usage "$SCRIPT_CMD" "Expected ZooKeeper connection string but found $2 instead!"
               exit 1            
             fi
 

solr/bin/solr.cmd

@@ -211,7 +211,7 @@ goto parse_args
 set "arg=%2"
 set firstChar=%arg:~0,1%
 IF "%firstChar%"=="-" (
-  set SCRIPT_ERROR=%2 is not a valid directory!
+  set SCRIPT_ERROR=Expected directory but found %2 instead!
   goto invalid_cmd_line
 )
 
@@ -230,7 +230,7 @@ goto parse_args
 set "arg=%2"
 set firstChar=%arg:~0,1%
 IF "%firstChar%"=="-" (
-  set SCRIPT_ERROR=%2 is not a valid example!
+  set SCRIPT_ERROR=Expected example name but found %2 instead!
   goto invalid_cmd_line
 )
 
@@ -244,7 +244,7 @@ goto parse_args
 set "arg=%2"
 set firstChar=%arg:~0,1%
 IF "%firstChar%"=="-" (
-  set SCRIPT_ERROR=%2 is not a valid memory setting!
+  set SCRIPT_ERROR=Expected memory setting but found %2 instead!
   goto invalid_cmd_line
 )
 
@@ -258,7 +258,7 @@ goto parse_args
 set "arg=%2"
 set firstChar=%arg:~0,1%
 IF "%firstChar%"=="-" (
-  set SCRIPT_ERROR=%2 is not a valid hostname!
+  set SCRIPT_ERROR=Expected hostname but found %2 instead!
   goto invalid_cmd_line
 )
 
@@ -271,7 +271,7 @@ goto parse_args
 set "arg=%2"
 set firstChar=%arg:~0,1%
 IF "%firstChar%"=="-" (
-  set SCRIPT_ERROR=%2 is not a valid port!
+  set SCRIPT_ERROR=Expected port but found %2 instead!
   goto invalid_cmd_line
 )
 
@@ -285,7 +285,7 @@ goto parse_args
 set "arg=%2"
 set firstChar=%arg:~0,1%
 IF "%firstChar%"=="-" (
-  set SCRIPT_ERROR=%2 is not a valid ZooKeeper connection string!
+  set SCRIPT_ERROR=Expected ZooKeeper connection string but found %2 instead!
   goto invalid_cmd_line
 )