merging default into bug 22169

12 files changed, 272 insertions, 216 deletions

diff --git a/scripts/rabbitmq-activate-plugins b/scripts/rabbitmq-activate-plugins
index 5ce64c686c..00ee6c61c8 100755
--- a/scripts/rabbitmq-activate-plugins
+++ b/scripts/rabbitmq-activate-plugins
@@ -19,11 +19,11 @@
 ##   are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
 ##   Technologies LLC, and Rabbit Technologies Ltd.
 ##
-##   Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift
+##   Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift
 ##   Ltd. Portions created by Cohesive Financial Technologies LLC are
-##   Copyright (C) 2007-2009 Cohesive Financial Technologies
+##   Copyright (C) 2007-2010 Cohesive Financial Technologies
 ##   LLC. Portions created by Rabbit Technologies Ltd are Copyright
-##   (C) 2007-2009 Rabbit Technologies Ltd.
+##   (C) 2007-2010 Rabbit Technologies Ltd.
 ##
 ##   All Rights Reserved.
 ##
diff --git a/scripts/rabbitmq-activate-plugins.bat b/scripts/rabbitmq-activate-plugins.bat
index e7aa709544..3c9a057c95 100644
--- a/scripts/rabbitmq-activate-plugins.bat
+++ b/scripts/rabbitmq-activate-plugins.bat
@@ -19,11 +19,11 @@ REM   Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd
 REM   are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial

 REM   Technologies LLC, and Rabbit Technologies Ltd.

 REM

-REM   Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift

+REM   Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift

 REM   Ltd. Portions created by Cohesive Financial Technologies LLC are

-REM   Copyright (C) 2007-2009 Cohesive Financial Technologies

+REM   Copyright (C) 2007-2010 Cohesive Financial Technologies

 REM   LLC. Portions created by Rabbit Technologies Ltd are Copyright

-REM   (C) 2007-2009 Rabbit Technologies Ltd.

+REM   (C) 2007-2010 Rabbit Technologies Ltd.

 REM

 REM   All Rights Reserved.

 REM

@@ -32,7 +32,13 @@ REM
 

 setlocal

 

-if not exist "%ERLANG_HOME%\bin\erl.exe" (

+rem Preserve values that might contain exclamation marks before

+rem enabling delayed expansion

+set TDP0=%~dp0

+set STAR=%*

+setlocal enabledelayedexpansion

+

+if not exist "!ERLANG_HOME!\bin\erl.exe" (

     echo.

     echo ******************************

     echo ERLANG_HOME not set correctly. 

@@ -44,17 +50,18 @@ if not exist "%ERLANG_HOME%\bin\erl.exe" (
     exit /B

 )

 

-set RABBITMQ_PLUGINS_DIR=%~dp0..\plugins

-set RABBITMQ_PLUGINS_EXPAND_DIR=%~dp0..\priv\plugins

-set RABBITMQ_EBIN_DIR=%~dp0..\ebin

+set RABBITMQ_PLUGINS_DIR=!TDP0!..\plugins

+set RABBITMQ_PLUGINS_EXPAND_DIR=!TDP0!..\priv\plugins

+set RABBITMQ_EBIN_DIR=!TDP0!..\ebin

 

-"%ERLANG_HOME%\bin\erl.exe" ^

--pa "%RABBITMQ_EBIN_DIR%" ^

+"!ERLANG_HOME!\bin\erl.exe" ^

+-pa "!RABBITMQ_EBIN_DIR!" ^

 -noinput -hidden ^

 -s rabbit_plugin_activator ^

--rabbit plugins_dir \""%RABBITMQ_PLUGINS_DIR:\=/%"\" ^

--rabbit plugins_expand_dir \""%RABBITMQ_PLUGINS_EXPAND_DIR:\=/%"\" ^

--rabbit rabbit_ebin  \""%RABBITMQ_EBIN_DIR:\=/%"\" ^

--extra %*

+-rabbit plugins_dir \""!RABBITMQ_PLUGINS_DIR:\=/!"\" ^

+-rabbit plugins_expand_dir \""!RABBITMQ_PLUGINS_EXPAND_DIR:\=/!"\" ^

+-rabbit rabbit_ebin  \""!RABBITMQ_EBIN_DIR:\=/!"\" ^

+-extra !STAR!

 

 endlocal

+endlocal

diff --git a/scripts/rabbitmq-deactivate-plugins b/scripts/rabbitmq-deactivate-plugins
index 771c473496..3fd71bfacd 100755
--- a/scripts/rabbitmq-deactivate-plugins
+++ b/scripts/rabbitmq-deactivate-plugins
@@ -19,11 +19,11 @@
 ##   are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
 ##   Technologies LLC, and Rabbit Technologies Ltd.
 ##
-##   Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift
+##   Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift
 ##   Ltd. Portions created by Cohesive Financial Technologies LLC are
-##   Copyright (C) 2007-2009 Cohesive Financial Technologies
+##   Copyright (C) 2007-2010 Cohesive Financial Technologies
 ##   LLC. Portions created by Rabbit Technologies Ltd are Copyright
-##   (C) 2007-2009 Rabbit Technologies Ltd.
+##   (C) 2007-2010 Rabbit Technologies Ltd.
 ##
 ##   All Rights Reserved.
 ##
diff --git a/scripts/rabbitmq-deactivate-plugins.bat b/scripts/rabbitmq-deactivate-plugins.bat
index 40155183a1..1bc3f88efd 100644
--- a/scripts/rabbitmq-deactivate-plugins.bat
+++ b/scripts/rabbitmq-deactivate-plugins.bat
@@ -19,11 +19,11 @@ REM   Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd
 REM   are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial

 REM   Technologies LLC, and Rabbit Technologies Ltd.

 REM

-REM   Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift

+REM   Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift

 REM   Ltd. Portions created by Cohesive Financial Technologies LLC are

-REM   Copyright (C) 2007-2009 Cohesive Financial Technologies

+REM   Copyright (C) 2007-2010 Cohesive Financial Technologies

 REM   LLC. Portions created by Rabbit Technologies Ltd are Copyright

-REM   (C) 2007-2009 Rabbit Technologies Ltd.

+REM   (C) 2007-2010 Rabbit Technologies Ltd.

 REM

 REM   All Rights Reserved.

 REM

@@ -32,8 +32,14 @@ REM
 

 setlocal

 

-set RABBITMQ_EBIN_DIR=%~dp0..\ebin

+rem Preserve values that might contain exclamation marks before

+rem enabling delayed expansion

+set TDP0=%~dp0

+setlocal enabledelayedexpansion

 

-del /f "%RABBITMQ_EBIN_DIR%"\rabbit.rel "%RABBITMQ_EBIN_DIR%"\rabbit.script "%RABBITMQ_EBIN_DIR%"\rabbit.boot

+set RABBITMQ_EBIN_DIR=!TDP0!..\ebin

 

+del /f "!RABBITMQ_EBIN_DIR!"\rabbit.rel "!RABBITMQ_EBIN_DIR!"\rabbit.script "!RABBITMQ_EBIN_DIR!"\rabbit.boot

+

+endlocal

 endlocal

diff --git a/scripts/rabbitmq-env b/scripts/rabbitmq-env
index 69ddbcfed1..36734874e7 100755
--- a/scripts/rabbitmq-env
+++ b/scripts/rabbitmq-env
@@ -19,11 +19,11 @@
 ##   are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
 ##   Technologies LLC, and Rabbit Technologies Ltd.
 ##
-##   Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift
+##   Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift
 ##   Ltd. Portions created by Cohesive Financial Technologies LLC are
-##   Copyright (C) 2007-2009 Cohesive Financial Technologies
+##   Copyright (C) 2007-2010 Cohesive Financial Technologies
 ##   LLC. Portions created by Rabbit Technologies Ltd are Copyright
-##   (C) 2007-2009 Rabbit Technologies Ltd.
+##   (C) 2007-2010 Rabbit Technologies Ltd.
 ##
 ##   All Rights Reserved.
 ##
diff --git a/scripts/rabbitmq-multi b/scripts/rabbitmq-multi
index a6eb102a4b..8341d35c8c 100755
--- a/scripts/rabbitmq-multi
+++ b/scripts/rabbitmq-multi
@@ -19,11 +19,11 @@
 ##   are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
 ##   Technologies LLC, and Rabbit Technologies Ltd.
 ##
-##   Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift
+##   Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift
 ##   Ltd. Portions created by Cohesive Financial Technologies LLC are
-##   Copyright (C) 2007-2009 Cohesive Financial Technologies
+##   Copyright (C) 2007-2010 Cohesive Financial Technologies
 ##   LLC. Portions created by Rabbit Technologies Ltd are Copyright
-##   (C) 2007-2009 Rabbit Technologies Ltd.
+##   (C) 2007-2010 Rabbit Technologies Ltd.
 ##
 ##   All Rights Reserved.
 ##
@@ -40,8 +40,8 @@ CONFIG_FILE=/etc/rabbitmq/rabbitmq
 
 DEFAULT_NODE_IP_ADDRESS=0.0.0.0
 DEFAULT_NODE_PORT=5672
-[ "x" = "x$RABBITMQ_NODE_IP_ADDRESS" ] && RABBITMQ_NODE_IP_ADDRESS=${NODE_IP_ADDRESS}
-[ "x" = "x$RABBITMQ_NODE_PORT" ] && RABBITMQ_NODE_PORT=${NODE_PORT}
+[ "x" = "x$RABBITMQ_NODE_IP_ADDRESS" ] && [ "x" != "x$NODE_IP_ADDRESS" ] && RABBITMQ_NODE_IP_ADDRESS=${NODE_IP_ADDRESS}
+[ "x" = "x$RABBITMQ_NODE_PORT" ] && [ "x" != "x$NODE_PORT" ] && RABBITMQ_NODE_PORT=${NODE_PORT}
 if [ "x" = "x$RABBITMQ_NODE_IP_ADDRESS" ]
 then
     if [ "x" != "x$RABBITMQ_NODE_PORT" ]
diff --git a/scripts/rabbitmq-multi.bat b/scripts/rabbitmq-multi.bat
index 6dda13af37..a4b7f2e99b 100755..100644
--- a/scripts/rabbitmq-multi.bat
+++ b/scripts/rabbitmq-multi.bat
@@ -19,11 +19,11 @@ REM   Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd
 REM   are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial

 REM   Technologies LLC, and Rabbit Technologies Ltd.

 REM

-REM   Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift

+REM   Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift

 REM   Ltd. Portions created by Cohesive Financial Technologies LLC are

-REM   Copyright (C) 2007-2009 Cohesive Financial Technologies

+REM   Copyright (C) 2007-2010 Cohesive Financial Technologies

 REM   LLC. Portions created by Rabbit Technologies Ltd are Copyright

-REM   (C) 2007-2009 Rabbit Technologies Ltd.

+REM   (C) 2007-2010 Rabbit Technologies Ltd.

 REM

 REM   All Rights Reserved.

 REM

@@ -32,38 +32,44 @@ REM
 

 setlocal

 

-if "%RABBITMQ_BASE%"=="" (

-    set RABBITMQ_BASE=%APPDATA%\RabbitMQ

+rem Preserve values that might contain exclamation marks before

+rem enabling delayed expansion

+set TDP0=%~dp0

+set STAR=%*

+setlocal enabledelayedexpansion

+

+if "!RABBITMQ_BASE!"=="" (

+    set RABBITMQ_BASE=!APPDATA!\RabbitMQ

 )

 

-if "%RABBITMQ_NODENAME%"=="" (

+if "!RABBITMQ_NODENAME!"=="" (

     set RABBITMQ_NODENAME=rabbit

 )

 

-if "%RABBITMQ_NODE_IP_ADDRESS%"=="" (

-   if not "%RABBITMQ_NODE_PORT%"=="" (

+if "!RABBITMQ_NODE_IP_ADDRESS!"=="" (

+   if not "!RABBITMQ_NODE_PORT!"=="" (

       set RABBITMQ_NODE_IP_ADDRESS=0.0.0.0

    )

 ) else (

-   if "%RABBITMQ_NODE_PORT%"=="" (

+   if "!RABBITMQ_NODE_PORT!"=="" (

       set RABBITMQ_NODE_PORT=5672

    )

 )

 

-set RABBITMQ_PIDS_FILE=%RABBITMQ_BASE%\rabbitmq.pids

-set RABBITMQ_SCRIPT_HOME=%~sdp0%

+set RABBITMQ_PIDS_FILE=!RABBITMQ_BASE!\rabbitmq.pids

+set RABBITMQ_SCRIPT_HOME=!TDP0!

 

-if "%RABBITMQ_CONFIG_FILE%"=="" (

-    set RABBITMQ_CONFIG_FILE=%RABBITMQ_BASE%\rabbitmq

+if "!RABBITMQ_CONFIG_FILE!"=="" (

+    set RABBITMQ_CONFIG_FILE=!RABBITMQ_BASE!\rabbitmq

 )

 

-if exist "%RABBITMQ_CONFIG_FILE%.config" (

-    set RABBITMQ_CONFIG_ARG=-config "%RABBITMQ_CONFIG_FILE%"

+if exist "!RABBITMQ_CONFIG_FILE!.config" (

+    set RABBITMQ_CONFIG_ARG=-config "!RABBITMQ_CONFIG_FILE!"

 ) else (

     set RABBITMQ_CONFIG_ARG=

 )

 

-if not exist "%ERLANG_HOME%\bin\erl.exe" (

+if not exist "!ERLANG_HOME!\bin\erl.exe" (

     echo.

     echo ******************************

     echo ERLANG_HOME not set correctly.

@@ -75,14 +81,15 @@ if not exist "%ERLANG_HOME%\bin\erl.exe" (
     exit /B

 )

 

-"%ERLANG_HOME%\bin\erl.exe" ^

--pa "%~dp0..\ebin" ^

+"!ERLANG_HOME!\bin\erl.exe" ^

+-pa "!TDP0!..\ebin" ^

 -noinput -hidden ^

-%RABBITMQ_MULTI_ERL_ARGS% ^

+!RABBITMQ_MULTI_ERL_ARGS! ^

 -sname rabbitmq_multi ^

-%RABBITMQ_CONFIG_ARG% ^

+!RABBITMQ_CONFIG_ARG! ^

 -s rabbit_multi ^

-%RABBITMQ_MULTI_START_ARGS% ^

--extra %*

+!RABBITMQ_MULTI_START_ARGS! ^

+-extra !STAR!

 

 endlocal

+endlocal

diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server
index cbc295f7d9..638498c1e2 100755
--- a/scripts/rabbitmq-server
+++ b/scripts/rabbitmq-server
@@ -19,11 +19,11 @@
 ##   are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
 ##   Technologies LLC, and Rabbit Technologies Ltd.
 ##
-##   Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift
+##   Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift
 ##   Ltd. Portions created by Cohesive Financial Technologies LLC are
-##   Copyright (C) 2007-2009 Cohesive Financial Technologies
+##   Copyright (C) 2007-2010 Cohesive Financial Technologies
 ##   LLC. Portions created by Rabbit Technologies Ltd are Copyright
-##   (C) 2007-2009 Rabbit Technologies Ltd.
+##   (C) 2007-2010 Rabbit Technologies Ltd.
 ##
 ##   All Rights Reserved.
 ##
@@ -32,7 +32,7 @@
 
 NODENAME=rabbit
 SERVER_ERL_ARGS="+K true +A30 \
--kernel inet_default_listen_options [{nodelay,true},{sndbuf,16384},{recbuf,4096}] \
+-kernel inet_default_listen_options [{nodelay,true}] \
 -kernel inet_default_connect_options [{nodelay,true}]"
 CLUSTER_CONFIG_FILE=/etc/rabbitmq/rabbitmq_cluster.config
 CONFIG_FILE=/etc/rabbitmq/rabbitmq
@@ -44,8 +44,8 @@ SERVER_START_ARGS=
 
 DEFAULT_NODE_IP_ADDRESS=0.0.0.0
 DEFAULT_NODE_PORT=5672
-[ "x" = "x$RABBITMQ_NODE_IP_ADDRESS" ] && RABBITMQ_NODE_IP_ADDRESS=${NODE_IP_ADDRESS}
-[ "x" = "x$RABBITMQ_NODE_PORT" ] && RABBITMQ_NODE_PORT=${NODE_PORT}
+[ "x" = "x$RABBITMQ_NODE_IP_ADDRESS" ] && [ "x" != "x$NODE_IP_ADDRESS" ] && RABBITMQ_NODE_IP_ADDRESS=${NODE_IP_ADDRESS}
+[ "x" = "x$RABBITMQ_NODE_PORT" ] && [ "x" != "x$NODE_PORT" ] && RABBITMQ_NODE_PORT=${NODE_PORT}
 if [ "x" = "x$RABBITMQ_NODE_IP_ADDRESS" ]
 then
     if [ "x" != "x$RABBITMQ_NODE_PORT" ]
diff --git a/scripts/rabbitmq-server.bat b/scripts/rabbitmq-server.bat
index 5110285128..28eb8ebb8d 100755..100644
--- a/scripts/rabbitmq-server.bat
+++ b/scripts/rabbitmq-server.bat
@@ -19,11 +19,11 @@ REM   Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd
 REM   are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial

 REM   Technologies LLC, and Rabbit Technologies Ltd.

 REM

-REM   Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift

+REM   Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift

 REM   Ltd. Portions created by Cohesive Financial Technologies LLC are

-REM   Copyright (C) 2007-2009 Cohesive Financial Technologies

+REM   Copyright (C) 2007-2010 Cohesive Financial Technologies

 REM   LLC. Portions created by Rabbit Technologies Ltd are Copyright

-REM   (C) 2007-2009 Rabbit Technologies Ltd.

+REM   (C) 2007-2010 Rabbit Technologies Ltd.

 REM

 REM   All Rights Reserved.

 REM

@@ -32,25 +32,31 @@ REM
 

 setlocal

 

-if "%RABBITMQ_BASE%"=="" (

-    set RABBITMQ_BASE=%APPDATA%\RabbitMQ

+rem Preserve values that might contain exclamation marks before

+rem enabling delayed expansion

+set TDP0=%~dp0

+set STAR=%*

+setlocal enabledelayedexpansion

+

+if "!RABBITMQ_BASE!"=="" (

+    set RABBITMQ_BASE=!APPDATA!\RabbitMQ

 )

 

-if "%RABBITMQ_NODENAME%"=="" (

+if "!RABBITMQ_NODENAME!"=="" (

     set RABBITMQ_NODENAME=rabbit

 )

 

-if "%RABBITMQ_NODE_IP_ADDRESS%"=="" (

-   if not "%RABBITMQ_NODE_PORT%"=="" (

+if "!RABBITMQ_NODE_IP_ADDRESS!"=="" (

+   if not "!RABBITMQ_NODE_PORT!"=="" (

       set RABBITMQ_NODE_IP_ADDRESS=0.0.0.0

    )

 ) else (

-   if "%RABBITMQ_NODE_PORT%"=="" (

+   if "!RABBITMQ_NODE_PORT!"=="" (

       set RABBITMQ_NODE_PORT=5672

    )

 )

 

-if not exist "%ERLANG_HOME%\bin\erl.exe" (

+if not exist "!ERLANG_HOME!\bin\erl.exe" (

     echo.

     echo ******************************

     echo ERLANG_HOME not set correctly.

@@ -62,13 +68,13 @@ if not exist "%ERLANG_HOME%\bin\erl.exe" (
     exit /B

 )

 

-set RABBITMQ_BASE_UNIX=%RABBITMQ_BASE:\=/%

+set RABBITMQ_BASE_UNIX=!RABBITMQ_BASE:\=/!

 

-if "%RABBITMQ_MNESIA_BASE%"=="" (

-    set RABBITMQ_MNESIA_BASE=%RABBITMQ_BASE_UNIX%/db

+if "!RABBITMQ_MNESIA_BASE!"=="" (

+    set RABBITMQ_MNESIA_BASE=!RABBITMQ_BASE_UNIX!/db

 )

-if "%RABBITMQ_LOG_BASE%"=="" (

-    set RABBITMQ_LOG_BASE=%RABBITMQ_BASE_UNIX%/log

+if "!RABBITMQ_LOG_BASE!"=="" (

+    set RABBITMQ_LOG_BASE=!RABBITMQ_BASE_UNIX!/log

 )

 

 

@@ -77,81 +83,82 @@ rem Log management (rotation, filtering based of size...) is left as an exercice
 

 set BACKUP_EXTENSION=.1

 

-set LOGS=%RABBITMQ_BASE%\log\%RABBITMQ_NODENAME%.log

-set SASL_LOGS=%RABBITMQ_BASE%\log\%RABBITMQ_NODENAME%-sasl.log

+set LOGS=!RABBITMQ_BASE!\log\!RABBITMQ_NODENAME!.log

+set SASL_LOGS=!RABBITMQ_BASE!\log\!RABBITMQ_NODENAME!-sasl.log

 

-set LOGS_BACKUP=%RABBITMQ_BASE%\log\%RABBITMQ_NODENAME%.log%BACKUP_EXTENSION%

-set SASL_LOGS_BACKUP=%RABBITMQ_BASE%\log\%RABBITMQ_NODENAME%-sasl.log%BACKUP_EXTENSION%

+set LOGS_BACKUP=!RABBITMQ_BASE!\log\!RABBITMQ_NODENAME!.log!BACKUP_EXTENSION!

+set SASL_LOGS_BACKUP=!RABBITMQ_BASE!\log\!RABBITMQ_NODENAME!-sasl.log!BACKUP_EXTENSION!

 

-if exist "%LOGS%" (

-    type "%LOGS%" >> "%LOGS_BACKUP%"

+if exist "!LOGS!" (

+    type "!LOGS!" >> "!LOGS_BACKUP!"

 )

-if exist "%SASL_LOGS%" (

-    type "%SASL_LOGS%" >> "%SASL_LOGS_BACKUP%"

+if exist "!SASL_LOGS!" (

+    type "!SASL_LOGS!" >> "!SASL_LOGS_BACKUP!"

 )

 

 rem End of log management

 

 

-if "%RABBITMQ_CLUSTER_CONFIG_FILE%"=="" (

-    set RABBITMQ_CLUSTER_CONFIG_FILE=%RABBITMQ_BASE%\rabbitmq_cluster.config

+if "!RABBITMQ_CLUSTER_CONFIG_FILE!"=="" (

+    set RABBITMQ_CLUSTER_CONFIG_FILE=!RABBITMQ_BASE!\rabbitmq_cluster.config

 )

 set CLUSTER_CONFIG=

-if not exist "%RABBITMQ_CLUSTER_CONFIG_FILE%" GOTO L1

-set CLUSTER_CONFIG=-rabbit cluster_config \""%RABBITMQ_CLUSTER_CONFIG_FILE:\=/%"\"

+if not exist "!RABBITMQ_CLUSTER_CONFIG_FILE!" GOTO L1

+set CLUSTER_CONFIG=-rabbit cluster_config \""!RABBITMQ_CLUSTER_CONFIG_FILE:\=/!"\"

 :L1

 

-if "%RABBITMQ_MNESIA_DIR%"=="" (

-    set RABBITMQ_MNESIA_DIR=%RABBITMQ_MNESIA_BASE%/%RABBITMQ_NODENAME%-mnesia

+if "!RABBITMQ_MNESIA_DIR!"=="" (

+    set RABBITMQ_MNESIA_DIR=!RABBITMQ_MNESIA_BASE!/!RABBITMQ_NODENAME!-mnesia

 )

-set RABBITMQ_EBIN_ROOT=%~dp0..\ebin

-if exist "%RABBITMQ_EBIN_ROOT%\rabbit.boot" (

-    echo Using Custom Boot File "%RABBITMQ_EBIN_ROOT%\rabbit.boot"

-    set RABBITMQ_BOOT_FILE=%RABBITMQ_EBIN_ROOT%\rabbit

+set RABBITMQ_EBIN_ROOT=!TDP0!..\ebin

+if exist "!RABBITMQ_EBIN_ROOT!\rabbit.boot" (

+    echo Using Custom Boot File "!RABBITMQ_EBIN_ROOT!\rabbit.boot"

+    set RABBITMQ_BOOT_FILE=!RABBITMQ_EBIN_ROOT!\rabbit

     set RABBITMQ_EBIN_PATH=

 ) else (

     set RABBITMQ_BOOT_FILE=start_sasl

-    set RABBITMQ_EBIN_PATH=-pa "%RABBITMQ_EBIN_ROOT%"

+    set RABBITMQ_EBIN_PATH=-pa "!RABBITMQ_EBIN_ROOT!"

 )

-if "%RABBITMQ_CONFIG_FILE%"=="" (

-    set RABBITMQ_CONFIG_FILE=%RABBITMQ_BASE%\rabbitmq

+if "!RABBITMQ_CONFIG_FILE!"=="" (

+    set RABBITMQ_CONFIG_FILE=!RABBITMQ_BASE!\rabbitmq

 )

 

-if exist "%RABBITMQ_CONFIG_FILE%.config" (

-    set RABBITMQ_CONFIG_ARG=-config "%RABBITMQ_CONFIG_FILE%"

+if exist "!RABBITMQ_CONFIG_FILE!.config" (

+    set RABBITMQ_CONFIG_ARG=-config "!RABBITMQ_CONFIG_FILE!"

 ) else (

     set RABBITMQ_CONFIG_ARG=

 )

 

 set RABBITMQ_LISTEN_ARG=

-if not "%RABBITMQ_NODE_IP_ADDRESS%"=="" (

-   if not "%RABBITMQ_NODE_PORT%"=="" (

-      set RABBITMQ_LISTEN_ARG=-rabbit tcp_listeners [{\""%RABBITMQ_NODE_IP_ADDRESS%"\","%RABBITMQ_NODE_PORT%"}]

+if not "!RABBITMQ_NODE_IP_ADDRESS!"=="" (

+   if not "!RABBITMQ_NODE_PORT!"=="" (

+      set RABBITMQ_LISTEN_ARG=-rabbit tcp_listeners [{\""!RABBITMQ_NODE_IP_ADDRESS!"\","!RABBITMQ_NODE_PORT!"}]

    )

 )

 

-"%ERLANG_HOME%\bin\erl.exe" ^

-%RABBITMQ_EBIN_PATH% ^

+"!ERLANG_HOME!\bin\erl.exe" ^

+!RABBITMQ_EBIN_PATH! ^

 -noinput ^

--boot "%RABBITMQ_BOOT_FILE%" ^

-%RABBITMQ_CONFIG_ARG% ^

--sname %RABBITMQ_NODENAME% ^

+-boot "!RABBITMQ_BOOT_FILE!" ^

+!RABBITMQ_CONFIG_ARG! ^

+-sname !RABBITMQ_NODENAME! ^

 -s rabbit ^

 +W w ^

 +A30 ^

--kernel inet_default_listen_options "[{nodelay, true}, {sndbuf, 16384}, {recbuf, 4096}]" ^

+-kernel inet_default_listen_options "[{nodelay, true}]" ^

 -kernel inet_default_connect_options "[{nodelay, true}]" ^

-%RABBITMQ_LISTEN_ARG% ^

--kernel error_logger {file,\""%RABBITMQ_LOG_BASE%/%RABBITMQ_NODENAME%.log"\"} ^

-%RABBITMQ_SERVER_ERL_ARGS% ^

+!RABBITMQ_LISTEN_ARG! ^

+-kernel error_logger {file,\""!RABBITMQ_LOG_BASE!/!RABBITMQ_NODENAME!.log"\"} ^

+!RABBITMQ_SERVER_ERL_ARGS! ^

 -sasl errlog_type error ^

--sasl sasl_error_logger {file,\""%RABBITMQ_LOG_BASE%/%RABBITMQ_NODENAME%-sasl.log"\"} ^

+-sasl sasl_error_logger {file,\""!RABBITMQ_LOG_BASE!/!RABBITMQ_NODENAME!-sasl.log"\"} ^

 -os_mon start_cpu_sup true ^

 -os_mon start_disksup false ^

 -os_mon start_memsup false ^

--mnesia dir \""%RABBITMQ_MNESIA_DIR%"\" ^

-%CLUSTER_CONFIG% ^

-%RABBITMQ_SERVER_START_ARGS% ^

-%*

+-mnesia dir \""!RABBITMQ_MNESIA_DIR!"\" ^

+!CLUSTER_CONFIG! ^

+!RABBITMQ_SERVER_START_ARGS! ^

+!STAR!

 

 endlocal

+endlocal

diff --git a/scripts/rabbitmq-service.bat b/scripts/rabbitmq-service.bat
index 4668112576..a4021fd6a1 100755..100644
--- a/scripts/rabbitmq-service.bat
+++ b/scripts/rabbitmq-service.bat
@@ -19,11 +19,11 @@ REM   Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd
 REM   are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial

 REM   Technologies LLC, and Rabbit Technologies Ltd.

 REM

-REM   Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift

+REM   Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift

 REM   Ltd. Portions created by Cohesive Financial Technologies LLC are

-REM   Copyright (C) 2007-2009 Cohesive Financial Technologies

+REM   Copyright (C) 2007-2010 Cohesive Financial Technologies

 REM   LLC. Portions created by Rabbit Technologies Ltd are Copyright

-REM   (C) 2007-2009 Rabbit Technologies Ltd.

+REM   (C) 2007-2010 Rabbit Technologies Ltd.

 REM

 REM   All Rights Reserved.

 REM

@@ -32,61 +32,82 @@ REM
 

 setlocal

 

-if "%RABBITMQ_SERVICENAME%"=="" (

+rem Preserve values that might contain exclamation marks before

+rem enabling delayed expansion

+set TN0=%~n0

+set TDP0=%~dp0

+set P1=%1

+set STAR=%*

+setlocal enabledelayedexpansion

+

+if "!RABBITMQ_SERVICENAME!"=="" (

     set RABBITMQ_SERVICENAME=RabbitMQ

 )

 

-if "%RABBITMQ_BASE%"=="" (

-    set RABBITMQ_BASE=%APPDATA%\%RABBITMQ_SERVICENAME%

+if "!RABBITMQ_BASE!"=="" (

+    set RABBITMQ_BASE=!APPDATA!\!RABBITMQ_SERVICENAME!

 )

 

-if "%RABBITMQ_NODENAME%"=="" (

+if "!RABBITMQ_NODENAME!"=="" (

     set RABBITMQ_NODENAME=rabbit

 )

 

-if "%RABBITMQ_NODE_IP_ADDRESS%"=="" (

-   if not "%RABBITMQ_NODE_PORT%"=="" (

-      set RABBITMQ_NODE_IP_ADDRESS=0.0.0.0

-   )

+if "!RABBITMQ_NODE_IP_ADDRESS!"=="" (

+    if not "!RABBITMQ_NODE_PORT!"=="" (

+       set RABBITMQ_NODE_IP_ADDRESS=0.0.0.0

+    )

 ) else (

-   if "%RABBITMQ_NODE_PORT%"=="" (

-      set RABBITMQ_NODE_PORT=5672

-   )

-)

-

-if "%ERLANG_SERVICE_MANAGER_PATH%"=="" (

-    set ERLANG_SERVICE_MANAGER_PATH=C:\Program Files\erl5.6.5\erts-5.6.5\bin

+    if "!RABBITMQ_NODE_PORT!"=="" (

+       set RABBITMQ_NODE_PORT=5672

+    )

+)

+

+if "!ERLANG_SERVICE_MANAGER_PATH!"=="" (

+    if not exist "!ERLANG_HOME!\bin\erl.exe" (

+        echo.

+        echo ******************************

+        echo ERLANG_HOME not set correctly.

+        echo ******************************

+        echo.

+        echo Please either set ERLANG_HOME to point to your Erlang installation or place the

+        echo RabbitMQ server distribution in the Erlang lib folder.

+        echo.

+        exit /B

+    )

+    for /f "delims=" %%i in ('dir /ad/b "!ERLANG_HOME!"') do if exist "!ERLANG_HOME!\%%i\bin\erlsrv.exe" (

+        set ERLANG_SERVICE_MANAGER_PATH=!ERLANG_HOME!\%%i\bin

+    )

 )

 

 set CONSOLE_FLAG=

 set CONSOLE_LOG_VALID=

-for %%i in (new reuse) do if "%%i" == "%RABBITMQ_CONSOLE_LOG%" set CONSOLE_LOG_VALID=TRUE

-if "%CONSOLE_LOG_VALID%" == "TRUE" (

-    set CONSOLE_FLAG=-debugtype %RABBITMQ_CONSOLE_LOG%

+for %%i in (new reuse) do if "%%i" == "!RABBITMQ_CONSOLE_LOG!" set CONSOLE_LOG_VALID=TRUE

+if "!CONSOLE_LOG_VALID!" == "TRUE" (

+    set CONSOLE_FLAG=-debugtype !RABBITMQ_CONSOLE_LOG!

 )

 

 rem *** End of configuration ***

 

-if not exist "%ERLANG_SERVICE_MANAGER_PATH%\erlsrv.exe" (

+if not exist "!ERLANG_SERVICE_MANAGER_PATH!\erlsrv.exe" (

     echo.

     echo **********************************************

     echo ERLANG_SERVICE_MANAGER_PATH not set correctly. 

     echo **********************************************

     echo.

-    echo "%ERLANG_SERVICE_MANAGER_PATH%\erlsrv.exe" not found!

+    echo "!ERLANG_SERVICE_MANAGER_PATH!\erlsrv.exe" not found

     echo Please set ERLANG_SERVICE_MANAGER_PATH to the folder containing "erlsrv.exe".

     echo.

     exit /B 1

 )

 

 rem erlang prefers forwardslash as separator in paths

-set RABBITMQ_BASE_UNIX=%RABBITMQ_BASE:\=/%

+set RABBITMQ_BASE_UNIX=!RABBITMQ_BASE:\=/!

 

-if "%RABBITMQ_MNESIA_BASE%"=="" (

-    set RABBITMQ_MNESIA_BASE=%RABBITMQ_BASE_UNIX%/db

+if "!RABBITMQ_MNESIA_BASE!"=="" (

+    set RABBITMQ_MNESIA_BASE=!RABBITMQ_BASE_UNIX!/db

 )

-if "%RABBITMQ_LOG_BASE%"=="" (

-    set RABBITMQ_LOG_BASE=%RABBITMQ_BASE_UNIX%/log

+if "!RABBITMQ_LOG_BASE!"=="" (

+    set RABBITMQ_LOG_BASE=!RABBITMQ_BASE_UNIX!/log

 )

 

 

@@ -95,139 +116,140 @@ rem Log management (rotation, filtering based on size...) is left as an exercise
 

 set BACKUP_EXTENSION=.1

 

-set LOGS=%RABBITMQ_BASE%\log\%RABBITMQ_NODENAME%.log

-set SASL_LOGS=%RABBITMQ_BASE%\log\%RABBITMQ_NODENAME%-sasl.log

+set LOGS=!RABBITMQ_BASE!\log\!RABBITMQ_NODENAME!.log

+set SASL_LOGS=!RABBITMQ_BASE!\log\!RABBITMQ_NODENAME!-sasl.log

 

-set LOGS_BACKUP=%RABBITMQ_BASE%\log\%RABBITMQ_NODENAME%.log%BACKUP_EXTENSION%

-set SASL_LOGS_BACKUP=%RABBITMQ_BASE%\log\%RABBITMQ_NODENAME%-sasl.log%BACKUP_EXTENSION%

+set LOGS_BACKUP=!RABBITMQ_BASE!\log\!RABBITMQ_NODENAME!.log!BACKUP_EXTENSION!

+set SASL_LOGS_BACKUP=!RABBITMQ_BASE!\log\!RABBITMQ_NODENAME!-sasl.log!BACKUP_EXTENSION!

 

-if exist "%LOGS%" (

-	type "%LOGS%" >> "%LOGS_BACKUP%"

+if exist "!LOGS!" (

+	type "!LOGS!" >> "!LOGS_BACKUP!"

 )

-if exist "%SASL_LOGS%" (

-	type "%SASL_LOGS%" >> "%SASL_LOGS_BACKUP%"

+if exist "!SASL_LOGS!" (

+	type "!SASL_LOGS!" >> "!SASL_LOGS_BACKUP!"

 )

 

 rem End of log management

 

 

-if "%RABBITMQ_CLUSTER_CONFIG_FILE%"=="" (

-    set RABBITMQ_CLUSTER_CONFIG_FILE=%RABBITMQ_BASE%\rabbitmq_cluster.config

+if "!RABBITMQ_CLUSTER_CONFIG_FILE!"=="" (

+    set RABBITMQ_CLUSTER_CONFIG_FILE=!RABBITMQ_BASE!\rabbitmq_cluster.config

 )

 set CLUSTER_CONFIG=

-if not exist "%RABBITMQ_CLUSTER_CONFIG_FILE%" GOTO L1

-set CLUSTER_CONFIG=-rabbit cluster_config \""%RABBITMQ_CLUSTER_CONFIG_FILE:\=/%"\"

+if not exist "!RABBITMQ_CLUSTER_CONFIG_FILE!" GOTO L1

+set CLUSTER_CONFIG=-rabbit cluster_config \""!RABBITMQ_CLUSTER_CONFIG_FILE:\=/!"\"

 :L1

 

-if "%RABBITMQ_MNESIA_DIR%"=="" (

-    set RABBITMQ_MNESIA_DIR=%RABBITMQ_MNESIA_BASE%/%RABBITMQ_NODENAME%-mnesia

+if "!RABBITMQ_MNESIA_DIR!"=="" (

+    set RABBITMQ_MNESIA_DIR=!RABBITMQ_MNESIA_BASE!/!RABBITMQ_NODENAME!-mnesia

 )

 

 

-if "%1" == "install" goto INSTALL_SERVICE

-for %%i in (start stop disable enable list remove) do if "%%i" == "%1" goto MODIFY_SERVICE 

+if "!P1!" == "install" goto INSTALL_SERVICE

+for %%i in (start stop disable enable list remove) do if "%%i" == "!P1!" goto MODIFY_SERVICE 

 

 echo.

 echo *********************

 echo Service control usage

 echo *********************

 echo.

-echo %~n0 help    - Display this help

-echo %~n0 install - Install the %RABBITMQ_SERVICENAME% service

-echo %~n0 remove  - Remove the %RABBITMQ_SERVICENAME% service

+echo !TN0! help    - Display this help

+echo !TN0! install - Install the !RABBITMQ_SERVICENAME! service

+echo !TN0! remove  - Remove the !RABBITMQ_SERVICENAME! service

 echo.

 echo The following actions can also be accomplished by using 

 echo Windows Services Management Console (services.msc):

 echo.

-echo %~n0 start   - Start the %RABBITMQ_SERVICENAME% service

-echo %~n0 stop    - Stop the %RABBITMQ_SERVICENAME% service

-echo %~n0 disable - Disable the %RABBITMQ_SERVICENAME% service

-echo %~n0 enable  - Enable the %RABBITMQ_SERVICENAME% service

+echo !TN0! start   - Start the !RABBITMQ_SERVICENAME! service

+echo !TN0! stop    - Stop the !RABBITMQ_SERVICENAME! service

+echo !TN0! disable - Disable the !RABBITMQ_SERVICENAME! service

+echo !TN0! enable  - Enable the !RABBITMQ_SERVICENAME! service

 echo.

 exit /B

 

 

 :INSTALL_SERVICE

 

-if not exist "%RABBITMQ_BASE%" (

-    echo Creating base directory %RABBITMQ_BASE% & md "%RABBITMQ_BASE%" 

+if not exist "!RABBITMQ_BASE!" (

+    echo Creating base directory !RABBITMQ_BASE! & md "!RABBITMQ_BASE!" 

 )

 

-"%ERLANG_SERVICE_MANAGER_PATH%\erlsrv" list %RABBITMQ_SERVICENAME% 2>NUL 1>NUL

+"!ERLANG_SERVICE_MANAGER_PATH!\erlsrv" list !RABBITMQ_SERVICENAME! 2>NUL 1>NUL

 if errorlevel 1 (

-    "%ERLANG_SERVICE_MANAGER_PATH%\erlsrv" add %RABBITMQ_SERVICENAME%

+    "!ERLANG_SERVICE_MANAGER_PATH!\erlsrv" add !RABBITMQ_SERVICENAME!

 ) else (

-    echo %RABBITMQ_SERVICENAME% service is already present - only updating service parameters

+    echo !RABBITMQ_SERVICENAME! service is already present - only updating service parameters

 )

 

-set RABBITMQ_EBIN_ROOT=%~dp0..\ebin

-if exist "%RABBITMQ_EBIN_ROOT%\rabbit.boot" (

-    echo Using Custom Boot File "%RABBITMQ_EBIN_ROOT%\rabbit.boot"

-    set RABBITMQ_BOOT_FILE=%RABBITMQ_EBIN_ROOT%\rabbit

+set RABBITMQ_EBIN_ROOT=!TDP0!..\ebin

+if exist "!RABBITMQ_EBIN_ROOT!\rabbit.boot" (

+    echo Using Custom Boot File "!RABBITMQ_EBIN_ROOT!\rabbit.boot"

+    set RABBITMQ_BOOT_FILE=!RABBITMQ_EBIN_ROOT!\rabbit

     set RABBITMQ_EBIN_PATH=

 ) else (

     set RABBITMQ_BOOT_FILE=start_sasl

-    set RABBITMQ_EBIN_PATH=-pa "%RABBITMQ_EBIN_ROOT%"

+    set RABBITMQ_EBIN_PATH=-pa "!RABBITMQ_EBIN_ROOT!"

 )

-if "%RABBITMQ_CONFIG_FILE%"=="" (

-    set RABBITMQ_CONFIG_FILE=%RABBITMQ_BASE%\rabbitmq

+if "!RABBITMQ_CONFIG_FILE!"=="" (

+    set RABBITMQ_CONFIG_FILE=!RABBITMQ_BASE!\rabbitmq

 )

    

-if exist "%RABBITMQ_CONFIG_FILE%.config" (

-    set RABBITMQ_CONFIG_ARG=-config "%RABBITMQ_CONFIG_FILE%"

+if exist "!RABBITMQ_CONFIG_FILE!.config" (

+    set RABBITMQ_CONFIG_ARG=-config "!RABBITMQ_CONFIG_FILE!"

 ) else (

     set RABBITMQ_CONFIG_ARG=

 )

 

 set RABBITMQ_LISTEN_ARG=

-if not "%RABBITMQ_NODE_IP_ADDRESS%"=="" (

-   if not "%RABBITMQ_NODE_PORT%"=="" (

-      set RABBITMQ_LISTEN_ARG=-rabbit tcp_listeners "[{\"%RABBITMQ_NODE_IP_ADDRESS%\", %RABBITMQ_NODE_PORT%}]"

+if not "!RABBITMQ_NODE_IP_ADDRESS!"=="" (

+   if not "!RABBITMQ_NODE_PORT!"=="" (

+      set RABBITMQ_LISTEN_ARG=-rabbit tcp_listeners "[{\"!RABBITMQ_NODE_IP_ADDRESS!\", !RABBITMQ_NODE_PORT!}]"

    )

 )

 

 set ERLANG_SERVICE_ARGUMENTS= ^

-%RABBITMQ_EBIN_PATH% ^

--boot "%RABBITMQ_BOOT_FILE%" ^

-%RABBITMQ_CONFIG_ARG% ^

+!RABBITMQ_EBIN_PATH! ^

+-boot "!RABBITMQ_BOOT_FILE!" ^

+!RABBITMQ_CONFIG_ARG! ^

 -s rabbit ^

 +W w ^

 +A30 ^

--kernel inet_default_listen_options "[{nodelay,true},{sndbuf,16384},{recbuf,4096}]" ^

+-kernel inet_default_listen_options "[{nodelay,true}]" ^

 -kernel inet_default_connect_options "[{nodelay,true}]" ^

-%RABBITMQ_LISTEN_ARG% ^

--kernel error_logger {file,\""%RABBITMQ_LOG_BASE%/%RABBITMQ_NODENAME%.log"\"} ^

-%RABBITMQ_SERVER_ERL_ARGS% ^

+!RABBITMQ_LISTEN_ARG! ^

+-kernel error_logger {file,\""!RABBITMQ_LOG_BASE!/!RABBITMQ_NODENAME!.log"\"} ^

+!RABBITMQ_SERVER_ERL_ARGS! ^

 -sasl errlog_type error ^

--sasl sasl_error_logger {file,\""%RABBITMQ_LOG_BASE%/%RABBITMQ_NODENAME%-sasl.log"\"} ^

+-sasl sasl_error_logger {file,\""!RABBITMQ_LOG_BASE!/!RABBITMQ_NODENAME!-sasl.log"\"} ^

 -os_mon start_cpu_sup true ^

 -os_mon start_disksup false ^

 -os_mon start_memsup false ^

--mnesia dir \""%RABBITMQ_MNESIA_DIR%"\" ^

-%CLUSTER_CONFIG% ^

-%RABBITMQ_SERVER_START_ARGS% ^

-%*

-

-set ERLANG_SERVICE_ARGUMENTS=%ERLANG_SERVICE_ARGUMENTS:\=\\%

-set ERLANG_SERVICE_ARGUMENTS=%ERLANG_SERVICE_ARGUMENTS:"=\"%

-

-"%ERLANG_SERVICE_MANAGER_PATH%\erlsrv" set %RABBITMQ_SERVICENAME% ^

--machine "%ERLANG_SERVICE_MANAGER_PATH%\erl.exe" ^

--env ERL_CRASH_DUMP="%RABBITMQ_BASE_UNIX%/erl_crash.dump" ^

--workdir "%RABBITMQ_BASE%" ^

+-mnesia dir \""!RABBITMQ_MNESIA_DIR!"\" ^

+!CLUSTER_CONFIG! ^

+!RABBITMQ_SERVER_START_ARGS! ^

+!STAR!

+

+set ERLANG_SERVICE_ARGUMENTS=!ERLANG_SERVICE_ARGUMENTS:\=\\!

+set ERLANG_SERVICE_ARGUMENTS=!ERLANG_SERVICE_ARGUMENTS:"=\"!

+

+"!ERLANG_SERVICE_MANAGER_PATH!\erlsrv" set !RABBITMQ_SERVICENAME! ^

+-machine "!ERLANG_SERVICE_MANAGER_PATH!\erl.exe" ^

+-env ERL_CRASH_DUMP="!RABBITMQ_BASE_UNIX!/erl_crash.dump" ^

+-workdir "!RABBITMQ_BASE!" ^

 -stopaction "rabbit:stop_and_halt()." ^

--sname %RABBITMQ_NODENAME% ^

-%CONSOLE_FLAG% ^

--args "%ERLANG_SERVICE_ARGUMENTS%" > NUL

+-sname !RABBITMQ_NODENAME! ^

+!CONSOLE_FLAG! ^

+-args "!ERLANG_SERVICE_ARGUMENTS!" > NUL

 goto END

 

 

 :MODIFY_SERVICE

 

-"%ERLANG_SERVICE_MANAGER_PATH%\erlsrv" %1 %RABBITMQ_SERVICENAME%

+"!ERLANG_SERVICE_MANAGER_PATH!\erlsrv" !P1! !RABBITMQ_SERVICENAME!

 goto END

 

 

 :END

 

 endlocal

+endlocal

diff --git a/scripts/rabbitmqctl b/scripts/rabbitmqctl
index a332afc6ca..cfb775eb67 100755
--- a/scripts/rabbitmqctl
+++ b/scripts/rabbitmqctl
@@ -19,11 +19,11 @@
 ##   are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
 ##   Technologies LLC, and Rabbit Technologies Ltd.
 ##
-##   Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift
+##   Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift
 ##   Ltd. Portions created by Cohesive Financial Technologies LLC are
-##   Copyright (C) 2007-2009 Cohesive Financial Technologies
+##   Copyright (C) 2007-2010 Cohesive Financial Technologies
 ##   LLC. Portions created by Rabbit Technologies Ltd are Copyright
-##   (C) 2007-2009 Rabbit Technologies Ltd.
+##   (C) 2007-2010 Rabbit Technologies Ltd.
 ##
 ##   All Rights Reserved.
 ##
diff --git a/scripts/rabbitmqctl.bat b/scripts/rabbitmqctl.bat
index 512e8587dc..5557245165 100755..100644
--- a/scripts/rabbitmqctl.bat
+++ b/scripts/rabbitmqctl.bat
@@ -19,11 +19,11 @@ REM   Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd
 REM   are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial

 REM   Technologies LLC, and Rabbit Technologies Ltd.

 REM

-REM   Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift

+REM   Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift

 REM   Ltd. Portions created by Cohesive Financial Technologies LLC are

-REM   Copyright (C) 2007-2009 Cohesive Financial Technologies

+REM   Copyright (C) 2007-2010 Cohesive Financial Technologies

 REM   LLC. Portions created by Rabbit Technologies Ltd are Copyright

-REM   (C) 2007-2009 Rabbit Technologies Ltd.

+REM   (C) 2007-2010 Rabbit Technologies Ltd.

 REM

 REM   All Rights Reserved.

 REM

@@ -32,11 +32,17 @@ REM
 

 setlocal

 

-if "%RABBITMQ_NODENAME%"=="" (

+rem Preserve values that might contain exclamation marks before

+rem enabling delayed expansion

+set TDP0=%~dp0

+set STAR=%*

+setlocal enabledelayedexpansion

+

+if "!RABBITMQ_NODENAME!"=="" (

     set RABBITMQ_NODENAME=rabbit

 )

 

-if not exist "%ERLANG_HOME%\bin\erl.exe" (

+if not exist "!ERLANG_HOME!\bin\erl.exe" (

     echo.

     echo ******************************

     echo ERLANG_HOME not set correctly. 

@@ -48,6 +54,7 @@ if not exist "%ERLANG_HOME%\bin\erl.exe" (
     exit /B

 )

 

-"%ERLANG_HOME%\bin\erl.exe" -pa "%~dp0..\ebin" -noinput -hidden %RABBITMQ_CTL_ERL_ARGS% -sname rabbitmqctl -s rabbit_control -nodename %RABBITMQ_NODENAME% -extra %*

+"!ERLANG_HOME!\bin\erl.exe" -pa "!TDP0!..\ebin" -noinput -hidden !RABBITMQ_CTL_ERL_ARGS! -sname rabbitmqctl -s rabbit_control -nodename !RABBITMQ_NODENAME! -extra !STAR!

 

 endlocal

+endlocal