Merge branch 'stable'

Author: michaelklishin

scripts/rabbitmq-env.bat

@@ -177,31 +177,6 @@ if "!RABBITMQ_CONFIG_FILE!"=="" (
     )
 )
 
-if "!RABBITMQ_GENERATED_CONFIG_DIR!"=="" (
-    if "!GENERATED_CONFIG_DIR!"=="" (
-        set RABBITMQ_GENERATED_CONFIG_DIR=!RABBITMQ_BASE!\config
-    ) else (
-        set RABBITMQ_GENERATED_CONFIG_DIR=!GENERATED_CONFIG_DIR!
-    )
-)
-
-CALL :unquote RABBITMQ_ADVANCED_CONFIG_FILE %RABBITMQ_ADVANCED_CONFIG_FILE%
-if "!RABBITMQ_ADVANCED_CONFIG_FILE!"=="" (
-    if "!ADVANCED_CONFIG_FILE!"=="" (
-        set RABBITMQ_ADVANCED_CONFIG_FILE=!RABBITMQ_BASE!\advanced
-    ) else (
-        set RABBITMQ_ADVANCED_CONFIG_FILE=!ADVANCED_CONFIG_FILE!
-    )
-)
-
-if "!RABBITMQ_SCHEMA_DIR!" == "" (
-    if "!SCHEMA_DIR!"=="" (
-        set RABBITMQ_SCHEMA_DIR=!RABBITMQ_HOME!\priv\schema
-    ) else (
-        set RABBITMQ_SCHEMA_DIR=!SCHEMA_DIR!
-    )
-)
-
 REM [ "x" = "x$RABBITMQ_LOG_BASE" ] && RABBITMQ_LOG_BASE=${LOG_BASE}
 if "!RABBITMQ_LOG_BASE!"=="" (
     if "!LOG_BASE!"=="" (