Attempt at an equivalent patch for the Windows scripts. Untested!

4 files changed, 37 insertions, 126 deletions

diff --git a/scripts/rabbitmq-activate-plugins.bat b/scripts/rabbitmq-activate-plugins.bat
deleted file mode 100644
index 3c9a057c..00000000
--- a/scripts/rabbitmq-activate-plugins.bat
+++ /dev/null
@@ -1,67 +0,0 @@
-@echo off

-REM   The contents of this file are subject to the Mozilla Public License

-REM   Version 1.1 (the "License"); you may not use this file except in

-REM   compliance with the License. You may obtain a copy of the License at

-REM   http://www.mozilla.org/MPL/

-REM

-REM   Software distributed under the License is distributed on an "AS IS"

-REM   basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the

-REM   License for the specific language governing rights and limitations

-REM   under the License.

-REM

-REM   The Original Code is RabbitMQ.

-REM

-REM   The Initial Developers of the Original Code are LShift Ltd,

-REM   Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd.

-REM

-REM   Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd,

-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-2010 LShift

-REM   Ltd. Portions created by Cohesive Financial Technologies LLC are

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

-REM   LLC. Portions created by Rabbit Technologies Ltd are Copyright

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

-REM

-REM   All Rights Reserved.

-REM

-REM   Contributor(s): ______________________________________.

-REM

-

-setlocal

-

-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. 

-    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

-)

-

-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!" ^

--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 !STAR!

-

-endlocal

-endlocal

diff --git a/scripts/rabbitmq-deactivate-plugins.bat b/scripts/rabbitmq-deactivate-plugins.bat
deleted file mode 100644
index 1bc3f88e..00000000
--- a/scripts/rabbitmq-deactivate-plugins.bat
+++ /dev/null
@@ -1,45 +0,0 @@
-@echo off

-REM   The contents of this file are subject to the Mozilla Public License

-REM   Version 1.1 (the "License"); you may not use this file except in

-REM   compliance with the License. You may obtain a copy of the License at

-REM   http://www.mozilla.org/MPL/

-REM

-REM   Software distributed under the License is distributed on an "AS IS"

-REM   basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the

-REM   License for the specific language governing rights and limitations

-REM   under the License.

-REM

-REM   The Original Code is RabbitMQ.

-REM

-REM   The Initial Developers of the Original Code are LShift Ltd,

-REM   Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd.

-REM

-REM   Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd,

-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-2010 LShift

-REM   Ltd. Portions created by Cohesive Financial Technologies LLC are

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

-REM   LLC. Portions created by Rabbit Technologies Ltd are Copyright

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

-REM

-REM   All Rights Reserved.

-REM

-REM   Contributor(s): ______________________________________.

-REM

-

-setlocal

-

-rem Preserve values that might contain exclamation marks before

-rem enabling delayed expansion

-set TDP0=%~dp0

-setlocal enabledelayedexpansion

-

-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-server.bat b/scripts/rabbitmq-server.bat
index 57fe1328..b3046594 100644
--- a/scripts/rabbitmq-server.bat
+++ b/scripts/rabbitmq-server.bat
@@ -110,15 +110,27 @@ set CLUSTER_CONFIG=-rabbit cluster_config \""!RABBITMQ_CLUSTER_CONFIG_FILE:\=/!"
 if "!RABBITMQ_MNESIA_DIR!"=="" (

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

 )

+

+set RABBITMQ_PLUGINS_DIR=!TDP0!..\plugins

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

 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!"

+

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

+-pa "!RABBITMQ_EBIN_ROOT!" ^

+-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_ROOT:\=/!"\" ^

+-extra !STAR!

+

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

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

+    exit /B 1

 )

+set RABBITMQ_BOOT_FILE=!RABBITMQ_EBIN_ROOT!\rabbit

+set RABBITMQ_EBIN_PATH=

+

 if "!RABBITMQ_CONFIG_FILE!"=="" (

     set RABBITMQ_CONFIG_FILE=!RABBITMQ_BASE!\rabbitmq

 )

diff --git a/scripts/rabbitmq-service.bat b/scripts/rabbitmq-service.bat
index a4021fd6..a25e236a 100644
--- a/scripts/rabbitmq-service.bat
+++ b/scripts/rabbitmq-service.bat
@@ -181,15 +181,26 @@ if errorlevel 1 (
     echo !RABBITMQ_SERVICENAME! service is already present - only updating service parameters

 )

 

+set RABBITMQ_PLUGINS_DIR=!TDP0!..\plugins

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

 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!"

+

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

+-pa "!RABBITMQ_EBIN_ROOT!" ^

+-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_ROOT:\=/!"\" ^

+-extra !STAR!

+

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

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

+    exit /B 1

 )

+set RABBITMQ_BOOT_FILE=!RABBITMQ_EBIN_ROOT!\rabbit

+set RABBITMQ_EBIN_PATH=

+

 if "!RABBITMQ_CONFIG_FILE!"=="" (

     set RABBITMQ_CONFIG_FILE=!RABBITMQ_BASE!\rabbitmq

 )