Merge branch 'master' into rabbitmq-server-1229

Author: michaelklishin

priv/schema/rabbitmq.schema renamed to priv/schema/rabbit.schema

@@ -202,7 +202,6 @@ if "!RABBITMQ_SCHEMA_DIR!" == "" (
     )
 )
 
-
 REM [ "x" = "x$RABBITMQ_LOG_BASE" ] && RABBITMQ_LOG_BASE=${LOG_BASE}
 if "!RABBITMQ_LOG_BASE!"=="" (
     if "!LOG_BASE!"=="" (
@@ -418,7 +417,7 @@ exit /b
 
 :filter_path
 REM Ensure ERL_LIBS begins with valid path
-IF [%ERL_LIBS%] EQU [] (
+IF "%ERL_LIBS%"=="" (
     set ERL_LIBS=%~dps1%~n1%~x1
 ) else (
     set ERL_LIBS=%ERL_LIBS%;%~dps1%~n1%~x1

scripts/rabbitmq-env.bat

@@ -115,8 +115,8 @@ if [ ! -d ${RABBITMQ_GENERATED_CONFIG_DIR} ]; then
     mkdir -p "${RABBITMQ_GENERATED_CONFIG_DIR}"
 fi
 
-if [ ! -f "${RABBITMQ_SCHEMA_DIR}/rabbitmq.schema" ]; then
-    cp "${RABBITMQ_HOME}/priv/schema/rabbitmq.schema" "${RABBITMQ_SCHEMA_DIR}"
+if [ ! -f "${RABBITMQ_SCHEMA_DIR}/rabbit.schema" ]; then
+    cp "${RABBITMQ_HOME}/priv/schema/rabbit.schema" "${RABBITMQ_SCHEMA_DIR}"
 fi
 
 set -e

scripts/rabbitmq-server

@@ -79,8 +79,8 @@ if not exist "!RABBITMQ_GENERATED_CONFIG_DIR!" (
     mkdir "!RABBITMQ_GENERATED_CONFIG_DIR!"
 )
 
-if not exist "!RABBITMQ_SCHEMA_DIR!\rabbitmq.schema" (
-    copy "!RABBITMQ_HOME!\priv\schema\rabbitmq.schema" "!RABBITMQ_SCHEMA_DIR!\rabbitmq.schema"
+if not exist "!RABBITMQ_SCHEMA_DIR!\rabbit.schema" (
+    copy "!RABBITMQ_HOME!\priv\schema\rabbit.schema" "!RABBITMQ_SCHEMA_DIR!\rabbit.schema"
 )
 
 set RABBITMQ_EBIN_PATH="-pa !RABBITMQ_EBIN_ROOT!"

scripts/rabbitmq-server.bat

@@ -165,8 +165,8 @@ if not exist "!RABBITMQ_GENERATED_CONFIG_DIR!" (
     mkdir "!RABBITMQ_GENERATED_CONFIG_DIR!"
 )
 
-if not exist "!RABBITMQ_SCHEMA_DIR!\rabbitmq.schema" (
-    copy "!RABBITMQ_HOME!\priv\schema\rabbitmq.schema" "!RABBITMQ_SCHEMA_DIR!\rabbitmq.schema"
+if not exist "!RABBITMQ_SCHEMA_DIR!\rabbit.schema" (
+    copy "!RABBITMQ_HOME!\priv\schema\rabbit.schema" "!RABBITMQ_SCHEMA_DIR!\rabbit.schema"
 )
     REM Try to create advanced config file, if it doesn't exist
     REM It still can fail to be created, but at least not for default install