Merged in default

6 files changed, 69 insertions, 159 deletions

diff --git a/scripts/rabbitmq-env b/scripts/rabbitmq-env
index 8cb470d06a..df4b24d8fc 100755
--- a/scripts/rabbitmq-env
+++ b/scripts/rabbitmq-env
@@ -1,33 +1,18 @@
 #!/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/
+##  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.
+##  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 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-2010 LShift
-##   Ltd. Portions created by Cohesive Financial Technologies LLC are
-##   Copyright (C) 2007-2010 Cohesive Financial Technologies
-##   LLC. Portions created by Rabbit Technologies Ltd are Copyright
-##   (C) 2007-2010 Rabbit Technologies Ltd.
-##
-##   All Rights Reserved.
-##
-##   Contributor(s): ______________________________________.
+##  The Initial Developer of the Original Code is VMware, Inc.
+##  Copyright (c) 2007-2011 VMware, Inc.  All rights reserved.
 ##
 
 # Determine where this script is really located
diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server
index 4155b31d99..5c390a5193 100755
--- a/scripts/rabbitmq-server
+++ b/scripts/rabbitmq-server
@@ -1,33 +1,18 @@
 #!/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/
+##  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.
+##  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 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-2010 LShift
-##   Ltd. Portions created by Cohesive Financial Technologies LLC are
-##   Copyright (C) 2007-2010 Cohesive Financial Technologies
-##   LLC. Portions created by Rabbit Technologies Ltd are Copyright
-##   (C) 2007-2010 Rabbit Technologies Ltd.
-##
-##   All Rights Reserved.
-##
-##   Contributor(s): ______________________________________.
+##  The Initial Developer of the Original Code is VMware, Inc.
+##  Copyright (c) 2007-2011 VMware, Inc.  All rights reserved.
 ##
 
 SERVER_ERL_ARGS="+K true +A30 +P 1048576 \
@@ -40,7 +25,7 @@ SERVER_START_ARGS=
 
 . `dirname $0`/rabbitmq-env
 
-DEFAULT_NODE_IP_ADDRESS=0.0.0.0
+DEFAULT_NODE_IP_ADDRESS=auto
 DEFAULT_NODE_PORT=5672
 [ "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}
diff --git a/scripts/rabbitmq-server.bat b/scripts/rabbitmq-server.bat
index ec5b4d855f..0cfa5ea848 100644
--- a/scripts/rabbitmq-server.bat
+++ b/scripts/rabbitmq-server.bat
@@ -1,33 +1,18 @@
 @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  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 the

-REM   License for the specific language governing rights and limitations

-REM   under the License.

+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  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  The Initial Developer of the Original Code is VMware, Inc.

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

 REM

 

 setlocal

@@ -52,7 +37,7 @@ if "!RABBITMQ_NODENAME!"=="" (
 

 if "!RABBITMQ_NODE_IP_ADDRESS!"=="" (

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

-      set RABBITMQ_NODE_IP_ADDRESS=0.0.0.0

+      set RABBITMQ_NODE_IP_ADDRESS=auto

    )

 ) else (

    if "!RABBITMQ_NODE_PORT!"=="" (

diff --git a/scripts/rabbitmq-service.bat b/scripts/rabbitmq-service.bat
index d2592931ab..43520b55cb 100644
--- a/scripts/rabbitmq-service.bat
+++ b/scripts/rabbitmq-service.bat
@@ -1,33 +1,18 @@
 @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  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 the

-REM   License for the specific language governing rights and limitations

-REM   under the License.

+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  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  The Initial Developer of the Original Code is VMware, Inc.

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

 REM

 

 setlocal

@@ -58,7 +43,7 @@ if "!RABBITMQ_NODENAME!"=="" (
 

 if "!RABBITMQ_NODE_IP_ADDRESS!"=="" (

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

-       set RABBITMQ_NODE_IP_ADDRESS=0.0.0.0

+       set RABBITMQ_NODE_IP_ADDRESS=auto

     )

 ) else (

     if "!RABBITMQ_NODE_PORT!"=="" (

diff --git a/scripts/rabbitmqctl b/scripts/rabbitmqctl
index 56cff8911f..9a11c3b35e 100755
--- a/scripts/rabbitmqctl
+++ b/scripts/rabbitmqctl
@@ -1,33 +1,18 @@
 #!/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/
+##  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.
+##  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 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-2010 LShift
-##   Ltd. Portions created by Cohesive Financial Technologies LLC are
-##   Copyright (C) 2007-2010 Cohesive Financial Technologies
-##   LLC. Portions created by Rabbit Technologies Ltd are Copyright
-##   (C) 2007-2010 Rabbit Technologies Ltd.
-##
-##   All Rights Reserved.
-##
-##   Contributor(s): ______________________________________.
+##  The Initial Developer of the Original Code is VMware, Inc.
+##  Copyright (c) 2007-2011 VMware, Inc.  All rights reserved.
 ##
 
 . `dirname $0`/rabbitmq-env
diff --git a/scripts/rabbitmqctl.bat b/scripts/rabbitmqctl.bat
index 4ffde73f1a..a74a91fd91 100644
--- a/scripts/rabbitmqctl.bat
+++ b/scripts/rabbitmqctl.bat
@@ -1,33 +1,18 @@
 @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  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 the

-REM   License for the specific language governing rights and limitations

-REM   under the License.

+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  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  The Initial Developer of the Original Code is VMware, Inc.

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

 REM

 

 setlocal