merge bug23531 into default

6 files changed, 20 insertions, 24 deletions

diff --git a/docs/html-to-website-xml.xsl b/docs/html-to-website-xml.xsl
index ec8f87e5eb..4bfcf6ca50 100644
--- a/docs/html-to-website-xml.xsl
+++ b/docs/html-to-website-xml.xsl
@@ -1,6 +1,7 @@
 <?xml version='1.0'?>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:doc="http://www.rabbitmq.com/namespaces/ad-hoc/doc"
+                xmlns="http://www.w3.org/1999/xhtml"
                 version='1.0'>
 
 <xsl:param name="original"/>
@@ -10,10 +11,16 @@
 <xsl:template match="*"/>
 
 <!-- Copy every element through -->
-<xsl:template match="@*|node()">
-  <xsl:copy><xsl:apply-templates select="@*|node()"/></xsl:copy>
+<xsl:template match="*">
+  <xsl:element name="{name()}" namespace="http://www.w3.org/1999/xhtml">
+    <xsl:apply-templates select="@*|node()"/>
+  </xsl:element>
 </xsl:template>
 
+<xsl:template match="@*">
+  <xsl:copy/>
+</xsl:template>
+  
 <!-- Copy the root node, and munge the outer part of the page -->
 <xsl:template match="/html">
 <xsl:processing-instruction name="xml-stylesheet">type="text/xml" href="page.xsl"</xsl:processing-instruction>
diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server
index 0eb7092d39..c5d883c365 100755
--- a/scripts/rabbitmq-server
+++ b/scripts/rabbitmq-server
@@ -89,13 +89,10 @@ RABBITMQ_EBIN_ROOT="${RABBITMQ_HOME}/ebin"
 if [ "x" = "x$RABBITMQ_NODE_ONLY" ]; then
     if erl \
 	-pa "$RABBITMQ_EBIN_ROOT" \
-	-rabbit plugins_dir "\"$RABBITMQ_PLUGINS_DIR\"" \
-	-rabbit plugins_expand_dir "\"$RABBITMQ_PLUGINS_EXPAND_DIR\"" \
-	-rabbit rabbit_ebin "\"$RABBITMQ_EBIN_ROOT\"" \
 	-noinput \
 	-hidden \
 	-s rabbit_plugin_activator \
-	-extra "$@"
+	-extra "$RABBITMQ_PLUGINS_DIR" "${RABBITMQ_PLUGINS_EXPAND_DIR}"
     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 bd4120fa8e..94180de95a 100644
--- a/scripts/rabbitmq-server.bat
+++ b/scripts/rabbitmq-server.bat
@@ -118,12 +118,10 @@ set RABBITMQ_EBIN_ROOT=!TDP0!..\ebin
 -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!

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

+       "!RABBITMQ_PLUGINS_EXPAND_DIR:\=/!"

 

-set RABBITMQ_BOOT_FILE=!RABBITMQ_MNESIA_DIR!\plugins-scratch\rabbit

+set RABBITMQ_BOOT_FILE=!RABBITMQ_PLUGINS_EXPAND_DIR!\rabbit

 if not exist "!RABBITMQ_BOOT_FILE!.boot" (

     echo Custom Boot File "!RABBITMQ_BOOT_FILE!.boot" is missing.

     exit /B 1

diff --git a/scripts/rabbitmq-service.bat b/scripts/rabbitmq-service.bat
index ff25b146ed..2c96b6fd15 100644
--- a/scripts/rabbitmq-service.bat
+++ b/scripts/rabbitmq-service.bat
@@ -187,12 +187,10 @@ set RABBITMQ_EBIN_ROOT=!TDP0!..\ebin
 -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!

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

+       "!RABBITMQ_PLUGINS_EXPAND_DIR:\=/!"

 

-set RABBITMQ_BOOT_FILE=!RABBITMQ_MNESIA_DIR!\plugins-scratch\rabbit

+set RABBITMQ_BOOT_FILE=!RABBITMQ_PLUGINS_EXPAND_DIR!\rabbit

 if not exist "!RABBITMQ_BOOT_FILE!.boot" (

     echo Custom Boot File "!RABBITMQ_BOOT_FILE!.boot" is missing.

     exit /B 1

diff --git a/src/rabbit_binding.erl b/src/rabbit_binding.erl
index 9d1399f7cc..668fb9bb25 100644
--- a/src/rabbit_binding.erl
+++ b/src/rabbit_binding.erl
@@ -350,10 +350,10 @@ group_bindings_fold(Fun, SrcName, Acc, Removed, Bindings) ->
     group_bindings_fold(Fun, Fun(SrcName, Bindings, Acc), Removed).
 
 maybe_auto_delete(XName, Bindings, Deletions) ->
-    case rabbit_exchange:lookup(XName) of
-        {error, not_found} ->
+    case mnesia:read(rabbit_exchange, XName) of
+        [] ->
             add_deletion(XName, {undefined, not_deleted, Bindings}, Deletions);
-        {ok, X} ->
+        [X] ->
             add_deletion(XName, {X, not_deleted, Bindings},
                          case rabbit_exchange:maybe_auto_delete(X) of
                              not_deleted           -> Deletions;
diff --git a/src/rabbit_plugin_activator.erl b/src/rabbit_plugin_activator.erl
index ef81ddf23a..072f297e69 100644
--- a/src/rabbit_plugin_activator.erl
+++ b/src/rabbit_plugin_activator.erl
@@ -50,13 +50,9 @@
 
 start() ->
     io:format("Activating RabbitMQ plugins ...~n"),
-    %% Ensure Rabbit is loaded so we can access it's environment
-    application:load(rabbit),
 
     %% Determine our various directories
-    {ok, PluginDir}         = application:get_env(rabbit, plugins_dir),
-    {ok, UnpackedPluginDir} = application:get_env(rabbit, plugins_expand_dir),
-
+    [PluginDir, UnpackedPluginDir] = init:get_plain_arguments(),
     RootName = UnpackedPluginDir ++ "/rabbit",
 
     %% Unpack any .ez plugins