merge default into bug21319

5 files changed, 100 insertions, 3 deletions

diff --git a/scripts/rabbitmq-plugins b/scripts/rabbitmq-plugins
new file mode 100755
index 0000000000..4c6cb1fa1d
--- /dev/null
+++ b/scripts/rabbitmq-plugins
@@ -0,0 +1,34 @@
+#!/bin/sh
+##  The contents of this file are subject to the Mozilla Public License
+##  Version 1.1 (the "License"); you may not use this file except in
+##  compliance with the License. You may obtain a copy of the License
+##  at http://www.mozilla.org/MPL/
+##
+##  Software distributed under the License is distributed on an "AS IS"
+##  basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+##  the License for the specific language governing rights and
+##  limitations under the License.
+##
+##  The Original Code is RabbitMQ.
+##
+##  The Initial Developer of the Original Code is VMware, Inc.
+##  Copyright (c) 2007-2011 VMware, Inc.  All rights reserved.
+##
+
+. `dirname $0`/rabbitmq-env
+
+ENABLED_PLUGINS_FILE=/etc/rabbitmq/enabled_plugins
+
+[ "x" = "x$RABBITMQ_ENABLED_PLUGINS_FILE" ] && RABBITMQ_ENABLED_PLUGINS_FILE=${ENABLED_PLUGINS_FILE}
+
+[ "x" = "x$RABBITMQ_PLUGINS_DIR" ] && RABBITMQ_PLUGINS_DIR="${RABBITMQ_HOME}/plugins"
+
+exec erl \
+    -pa "${RABBITMQ_HOME}/ebin" \
+    -noinput \
+    -hidden \
+    -sname rabbitmq-plugins$$ \
+    -s rabbit_plugins \
+    -enabled_plugins_file "$RABBITMQ_ENABLED_PLUGINS_FILE" \
+    -plugins_dist_dir "$RABBITMQ_PLUGINS_DIR" \
+    -extra "$@"
diff --git a/scripts/rabbitmq-plugins.bat b/scripts/rabbitmq-plugins.bat
new file mode 100755
index 0000000000..ca874a7f4b
--- /dev/null
+++ b/scripts/rabbitmq-plugins.bat
@@ -0,0 +1,51 @@
+@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

+REM  at 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

+REM  the License for the specific language governing rights and

+REM  limitations under the License.

+REM

+REM  The Original Code is RabbitMQ.

+REM

+REM  The Initial Developer of the Original Code is VMware, Inc.

+REM  Copyright (c) 2007-2011 VMware, Inc.  All rights reserved.

+REM

+

+setlocal

+

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

+)

+

+if "!RABBITMQ_ENABLED_PLUGINS_FILE!"=="" (

+    set RABBITMQ_ENABLED_PLUGINS_FILE=!RABBITMQ_BASE!\enabled_plugins

+)

+

+set RABBITMQ_PLUGINS_DIR=!TDP0!..\plugins

+

+"!ERLANG_HOME!\bin\erl.exe" -pa "!TDP0!..\ebin" -noinput -hidden -sname rabbitmq-plugins!RANDOM! -s rabbit_plugins -enabled_plugins_file "!RABBITMQ_ENABLED_PLUGINS_FILE!" -plugins_dist_dir "!RABBITMQ_PLUGINS_DIR:\=/!" -extra !STAR!

+

+endlocal

+endlocal

diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server
index deca5b3042..11cc7215bb 100755
--- a/scripts/rabbitmq-server
+++ b/scripts/rabbitmq-server
@@ -21,6 +21,7 @@ CONFIG_FILE=/etc/rabbitmq/rabbitmq
 LOG_BASE=/var/log/rabbitmq
 MNESIA_BASE=/var/lib/rabbitmq/mnesia
 SERVER_START_ARGS=
+ENABLED_PLUGINS_FILE=/etc/rabbitmq/enabled_plugins
 
 . `dirname $0`/rabbitmq-env
 
@@ -52,6 +53,7 @@ fi
 [ "x" = "x$RABBITMQ_PLUGINS_EXPAND_DIR" ] && RABBITMQ_PLUGINS_EXPAND_DIR=${PLUGINS_EXPAND_DIR}
 [ "x" = "x$RABBITMQ_PLUGINS_EXPAND_DIR" ] && RABBITMQ_PLUGINS_EXPAND_DIR=${RABBITMQ_MNESIA_BASE}/${RABBITMQ_NODENAME}-plugins-expand
 
+[ "x" = "x$RABBITMQ_ENABLED_PLUGINS_FILE" ] && RABBITMQ_ENABLED_PLUGINS_FILE=${ENABLED_PLUGINS_FILE}
 [ "x" = "x$RABBITMQ_PLUGINS_DIR" ] && RABBITMQ_PLUGINS_DIR="${RABBITMQ_HOME}/plugins"
 
 ## Log rotation
@@ -74,7 +76,7 @@ if [ "x" = "x$RABBITMQ_NODE_ONLY" ]; then
 	-hidden \
 	-s rabbit_prelaunch \
 	-sname rabbitmqprelaunch$$ \
-	-extra "$RABBITMQ_PLUGINS_DIR" "${RABBITMQ_PLUGINS_EXPAND_DIR}" "${RABBITMQ_NODENAME}"
+	-extra "$RABBITMQ_ENABLED_PLUGINS_FILE" "$RABBITMQ_PLUGINS_DIR" "${RABBITMQ_PLUGINS_EXPAND_DIR}" "${RABBITMQ_NODENAME}"
     then
 	RABBITMQ_BOOT_FILE="${RABBITMQ_PLUGINS_EXPAND_DIR}/rabbit"
 	RABBITMQ_EBIN_PATH=""
diff --git a/scripts/rabbitmq-server.bat b/scripts/rabbitmq-server.bat
index 56bed4358a..0a78794ffc 100644..100755
--- a/scripts/rabbitmq-server.bat
+++ b/scripts/rabbitmq-server.bat
@@ -84,6 +84,10 @@ if "!RABBITMQ_PLUGINS_EXPAND_DIR!"=="" (
     set RABBITMQ_PLUGINS_EXPAND_DIR=!RABBITMQ_MNESIA_BASE!/!RABBITMQ_NODENAME!-plugins-expand

 )

 

+if "!RABBITMQ_ENABLED_PLUGINS_FILE!"=="" (

+    set RABBITMQ_ENABLED_PLUGINS_FILE=!RABBITMQ_BASE!\enabled_plugins

+)

+

 set RABBITMQ_PLUGINS_DIR=!TDP0!..\plugins

 set RABBITMQ_EBIN_ROOT=!TDP0!..\ebin

 

@@ -92,7 +96,8 @@ set RABBITMQ_EBIN_ROOT=!TDP0!..\ebin
 -noinput -hidden ^

 -s rabbit_prelaunch ^

 -sname rabbitmqprelaunch!RANDOM! ^

--extra "!RABBITMQ_PLUGINS_DIR:\=/!" ^

+-extra "!RABBITMQ_ENABLED_PLUGINS_FILE!" ^

+       "!RABBITMQ_PLUGINS_DIR:\=/!" ^

        "!RABBITMQ_PLUGINS_EXPAND_DIR:\=/!" ^

        "!RABBITMQ_NODENAME!"

 

diff --git a/scripts/rabbitmq-service.bat b/scripts/rabbitmq-service.bat
index 26c6ea6545..e671ba7a76 100644..100755
--- a/scripts/rabbitmq-service.bat
+++ b/scripts/rabbitmq-service.bat
@@ -153,6 +153,10 @@ if errorlevel 1 (
     echo !RABBITMQ_SERVICENAME! service is already present - only updating service parameters

 )

 

+if "!RABBITMQ_ENABLED_PLUGINS_FILE!"=="" (

+    set RABBITMQ_ENABLED_PLUGINS_FILE=!RABBITMQ_BASE!\enabled_plugins

+)

+

 set RABBITMQ_PLUGINS_DIR=!TDP0!..\plugins

 set RABBITMQ_EBIN_ROOT=!TDP0!..\ebin

 

@@ -160,7 +164,8 @@ set RABBITMQ_EBIN_ROOT=!TDP0!..\ebin
 -pa "!RABBITMQ_EBIN_ROOT!" ^

 -noinput -hidden ^

 -s rabbit_prelaunch ^

--extra "!RABBITMQ_PLUGINS_DIR:\=/!" ^

+-extra "!RABBITMQ_ENABLED_PLUGINS_FILE!" ^

+       "!RABBITMQ_PLUGINS_DIR:\=/!" ^

        "!RABBITMQ_PLUGINS_EXPAND_DIR:\=/!" ^

        ""