Merge branch 'stable'

Author: michaelklishin

src/rabbit_web_mqtt_app.erl

@@ -11,7 +11,7 @@
 %% The Original Code is RabbitMQ.
 %%
 %% The Initial Developer of the Original Code is GoPivotal, Inc.
-%% Copyright (c) 2015 GoPivotal, Inc.  All rights reserved.
+%% Copyright (c) 2007-2016 Pivotal Software, Inc.  All rights reserved.
 %%
 
 -module(rabbit_web_mqtt_app).

src/rabbit_web_mqtt_connection_sup.erl

@@ -11,7 +11,7 @@
 %% The Original Code is RabbitMQ.
 %%
 %% The Initial Developer of the Original Code is GoPivotal, Inc.
-%% Copyright (c) 2016 Pivotal Software, Inc.  All rights reserved.
+%% Copyright (c) 2007-2016 Pivotal Software, Inc.  All rights reserved.
 %%
 
 -module(rabbit_web_mqtt_connection_sup).

src/rabbit_web_mqtt_handler.erl

@@ -11,7 +11,7 @@
 %% The Original Code is RabbitMQ.
 %%
 %% The Initial Developer of the Original Code is GoPivotal, Inc.
-%% Copyright (c) 2015 GoPivotal, Inc.  All rights reserved.
+%% Copyright (c) 2012-2016 Pivotal Software, Inc.  All rights reserved.
 %%
 
 -module(rabbit_web_mqtt_handler).
@@ -41,7 +41,7 @@ websocket_init(_, Req, Opts) ->
     Sock = cowboy_req:get(socket, Req),
     case rabbit_net:connection_string(Sock, inbound) of
         {ok, ConnStr} ->
-            rabbit_log:log(connection, info, "accepting WEB-MQTT connection ~p (~s)~n", [self(), ConnStr]),
+            rabbit_log:log(connection, info, "accepting Web MQTT connection ~p (~s)~n", [self(), ConnStr]),
             ProcessorState = rabbit_mqtt_processor:initial_state(Sock,
                 rabbit_mqtt_reader:ssl_login_name(Sock),
                 fun send_reply/2),
@@ -66,7 +66,7 @@ websocket_init(_, Req, Opts) ->
 websocket_handle({binary, Data}, Req, State) ->
     handle_data(Data, Req, State);
 websocket_handle(Frame, Req, State) ->
-    rabbit_log:log(connection, info, "WEB-MQTT: unexpected Websocket frame ~p~n",
+    rabbit_log:log(connection, info, "Web MQTT: unexpected WebSocket frame ~p~n",
                     [Frame]),
     {ok, Req, State, hibernate}.
 

src/rabbit_web_mqtt_middleware.erl

@@ -10,8 +10,7 @@
 %%
 %% The Original Code is RabbitMQ.
 %%
-%% The Initial Developer of the Original Code is GoPivotal, Inc.
-%% Copyright (c) 2016 GoPivotal, Inc.  All rights reserved.
+%% Copyright (c) 2012-2016 Pivotal Software, Inc.  All rights reserved.
 %%
 
 -module(rabbit_web_mqtt_middleware).

src/rabbitmq_web_mqtt.app.src

@@ -1,6 +1,6 @@
 {application, rabbitmq_web_mqtt,
  [
-  {description, "Rabbit WEB-MQTT - WebSockets to MQTT adapter"},
+  {description, "RabbitMQ MQTT-over-WebSockets adapter"},
   {vsn, ""},
   {modules, []},
   {registered, []},

test/src/rabbit_web_mqtt_test.erl

@@ -11,7 +11,7 @@
 %%   The Original Code is RabbitMQ Management Console.
 %%
 %%   The Initial Developer of the Original Code is GoPivotal, Inc.
-%%   Copyright (c) 2012-2014 GoPivotal, Inc.  All rights reserved.
+%%   Copyright (c) 2007-2016 Pivotal Software, Inc.  All rights reserved.
 %%
 
 -module(rabbit_web_mqtt_test).

test/src/rabbit_web_mqtt_test_all.erl

@@ -11,7 +11,7 @@
 %%   The Original Code is RabbitMQ Management Console.
 %%
 %%   The Initial Developer of the Original Code is GoPivotal, Inc.
-%%   Copyright (c) 2012-2014 GoPivotal, Inc.  All rights reserved.
+%%   Copyright (c) 2007-2016 Pivotal Software, Inc.  All rights reserved.
 %%
 
 -module(rabbit_web_mqtt_test_all).

test/src/rfc6455_client.erl

@@ -1,17 +1,17 @@
-%%   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 Management Console.
+%% The Original Code is RabbitMQ Management Console.
 %%
-%%   The Initial Developer of the Original Code is GoPivotal, Inc.
-%%   Copyright (c) 2012-2014 GoPivotal, Inc.  All rights reserved.
+%% The Initial Developer of the Original Code is GoPivotal, Inc.
+%% Copyright (c) 2012-2016 Pivotal Software, Inc.  All rights reserved.
 %%
 
 -module(rfc6455_client).