merge bug21243 into default

4 files changed, 122 insertions, 4 deletions

diff --git a/scripts/activate-plugins b/scripts/activate-plugins
new file mode 100755
index 0000000000..52f7ddbe61
--- /dev/null
+++ b/scripts/activate-plugins
@@ -0,0 +1,47 @@
+#!/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 Developers of the Original Code are LShift Ltd,
+##   Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd.
+##
+##   Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd,
+##   Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd
+##   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
+##   Ltd. Portions created by Cohesive Financial Technologies LLC are
+##   Copyright (C) 2007-2009 Cohesive Financial Technologies
+##   LLC. Portions created by Rabbit Technologies Ltd are Copyright
+##   (C) 2007-2009 Rabbit Technologies Ltd.
+##
+##   All Rights Reserved.
+##
+##   Contributor(s): ______________________________________.
+##
+
+[ -f /etc/rabbitmq/rabbitmq.conf ] && . /etc/rabbitmq/rabbitmq.conf
+
+RABBITMQ_EBIN=`dirname $0`/../ebin
+[ "x" = "x$RABBITMQ_PLUGINS_DIR" ] && RABBITMQ_PLUGINS_DIR="`dirname $0`/../plugins"
+[ "x" = "x$RABBITMQ_PLUGINS_EXPAND_DIR" ] && RABBITMQ_PLUGINS_EXPAND_DIR="`dirname $0`/../priv/plugins"
+
+exec erl \
+    -pa "$RABBITMQ_EBIN" \
+    -rabbit plugins_dir "\"$RABBITMQ_PLUGINS_DIR\"" \
+	-rabbit plugins_expand_dir "\"$RABBITMQ_PLUGINS_EXPAND_DIR\"" \
+	-rabbit rabbit_ebin "\"$RABBITMQ_EBIN\"" \
+	-noinput \
+    -hidden \
+    -s rabbit_plugin_activator \
+    -extra "$@"
diff --git a/scripts/activate-plugins.bat b/scripts/activate-plugins.bat
new file mode 100644
index 0000000000..8bef4ad266
--- /dev/null
+++ b/scripts/activate-plugins.bat
@@ -0,0 +1,53 @@
+@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-2009 LShift

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

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

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

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

+REM

+REM   All Rights Reserved.

+REM

+REM   Contributor(s): ______________________________________.

+REM

+

+if "%ERLANG_HOME%"=="" (

+    set ERLANG_HOME=%~dp0%..\..\..

+)

+

+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="%~dp0..\plugins"

+set RABBITMQ_PLUGINS_EXPAND_DIR="%~dp0..\priv\plugins"

+set RABBITMQ_EBIN_DIR="%~dp0..\ebin"

+

+"%ERLANG_HOME%\bin\erl.exe" -pa "%~dp0..\ebin" -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 %*

diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server
index 8502d60abc..40e32d3da9 100755
--- a/scripts/rabbitmq-server
+++ b/scripts/rabbitmq-server
@@ -75,16 +75,25 @@ fi
 RABBITMQ_START_RABBIT=
 [ "x" = "x$RABBITMQ_NODE_ONLY" ] && RABBITMQ_START_RABBIT='-noinput -s rabbit'
 
+RABBITMQ_EBIN_ROOT="`dirname $0`/../ebin"
+if [ -f "${RABBITMQ_EBIN_ROOT}/rabbit.boot" ]; then
+	RABBITMQ_BOOT_FILE="${RABBITMQ_EBIN_ROOT}/rabbit"
+	RABBITMQ_EBIN_PATH=""
+else
+	RABBITMQ_BOOT_FILE=start_sasl
+	RABBITMQ_EBIN_PATH="-pa ${RABBITMQ_EBIN_ROOT}"
+fi
+
 # we need to turn off path expansion because some of the vars, notably
 # RABBITMQ_SERVER_ERL_ARGS, contain terms that look like globs and
 # there is no other way of preventing their expansion.
 set -f
 
 exec erl \
-    -pa "`dirname $0`/../ebin" \
+	${RABBITMQ_EBIN_PATH} \
     ${RABBITMQ_START_RABBIT} \
     -sname ${RABBITMQ_NODENAME} \
-    -boot start_sasl \
+    -boot ${RABBITMQ_BOOT_FILE} \
     +W w \
     ${RABBITMQ_SERVER_ERL_ARGS} \
     -rabbit tcp_listeners '[{"'${RABBITMQ_NODE_IP_ADDRESS}'", '${RABBITMQ_NODE_PORT}'}]' \
diff --git a/scripts/rabbitmq-server.bat b/scripts/rabbitmq-server.bat
index 9915727bd9..b1932a7997 100755
--- a/scripts/rabbitmq-server.bat
+++ b/scripts/rabbitmq-server.bat
@@ -104,11 +104,20 @@ 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_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_PATH=

+) else (

+	set RABBITMQ_BOOT_FILE=start_sasl

+	set RABBITMQ_EBIN_PATH=-pa "%RABBITMQ_EBIN_ROOT%"

+)

 

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

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

+%RABBITMQ_EBIN_PATH% ^

 -noinput ^

--boot start_sasl ^

+-boot %RABBITMQ_BOOT_FILE% ^

 -sname %RABBITMQ_NODENAME% ^

 -s rabbit ^

 +W w ^