Skip to content

Commit

Permalink
Updated to RabbitMQ 2.8.1
Browse files Browse the repository at this point in the history
  • Loading branch information
jbrisbin committed Mar 26, 2012
1 parent ebe608c commit ce9d2b8
Show file tree
Hide file tree
Showing 26 changed files with 224 additions and 142 deletions.
9 changes: 3 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,18 @@ This is a fork of the [official RabbitMQ/AMQP Erlang client](https://github.com/
It's meant to be included in your rebar projects in your rebar.config file:

{deps, [
{amqp_client, ".*", {git, "git://github.com/jbrisbin/amqp_client.git", {tag, "rabbitmq_2.7.1"}}}
{amqp_client, ".*", {git, "git://github.com/jbrisbin/amqp_client.git", {tag, "rabbitmq-2.8.1"}}}
]}.

The "master" branch of this port is a simple re-packaging of the rabbit_common AMQP client dependency.

The "community" branch, however, is a port of the RabbitMQ source code with additional strict compilation
checking turned on and the source code edited to eliminate warnings. It should be 100% compatible with the
unaltered source code. The community branch is simply a tweak to allow projects that depend on rabbit_common
and also have strict compilation options turned on with this project introducing warnings into those projects.
The "community" branch, however, is a port of the RabbitMQ source code with additional strict compilation checking turned on and the source code edited to eliminate warnings. It should be 100% compatible with the unaltered source code. The community branch is simply a tweak to allow projects that depend on rabbit_common to not have to deal with the warnings issued by the compiler in the unaltered RabbitMQ code.

To use the "community" branch in your project, which includes stricter compilation settings, add "-community"
to the version tag:

{deps, [
{amqp_client, ".*", {git, "git://github.com/jbrisbin/amqp_client.git", {tag, "rabbitmq_2.7.1-community"}}}
{amqp_client, ".*", {git, "git://github.com/jbrisbin/amqp_client.git", {tag, "rabbitmq-2.8.1-community"}}}
]}.

### License
Expand Down
2 changes: 1 addition & 1 deletion include/amqp_client.hrl
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
%% The Original Code is RabbitMQ.
%%
%% The Initial Developer of the Original Code is VMware, Inc.
%% Copyright (c) 2007-2011 VMware, Inc. All rights reserved.
%% Copyright (c) 2007-2012 VMware, Inc. All rights reserved.
%%

-ifndef(AMQP_CLIENT_HRL).
Expand Down
4 changes: 3 additions & 1 deletion include/amqp_gen_consumer_spec.hrl
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,12 @@
%% The Original Code is RabbitMQ.
%%
%% The Initial Developer of the Original Code is VMware, Inc.
%% Copyright (c) 2011-2011 VMware, Inc. All rights reserved.
%% Copyright (c) 2011-2012 VMware, Inc. All rights reserved.
%%

-include("amqp_client.hrl").

-ifndef(edoc).
-type(state() :: any()).
-type(consume() :: #'basic.consume'{}).
-type(consume_ok() :: #'basic.consume_ok'{}).
Expand All @@ -38,3 +39,4 @@
{reply, any(), state()} | {noreply, state()} |
{error, reason(), state()}).
-spec(terminate/2 :: (any(), state()) -> state()).
-endif.
2 changes: 1 addition & 1 deletion rebar.config
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{deps, [
{rabbit_common, ".*", {git, "git://github.com/jbrisbin/rabbit_common.git", {tag, "rabbitmq_2.7.1"}}}
{rabbit_common, ".*", {git, "git://github.com/jbrisbin/rabbit_common.git", {tag, "rabbitmq-2.8.1"}}}
]}.

{erl_opts, [
Expand Down
2 changes: 1 addition & 1 deletion src/amqp_auth_mechanisms.erl
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
%% The Original Code is RabbitMQ.
%%
%% The Initial Developer of the Original Code is VMware, Inc.
%% Copyright (c) 2007-2011 VMware, Inc. All rights reserved.
%% Copyright (c) 2007-2012 VMware, Inc. All rights reserved.
%%

%% @private
Expand Down
Loading

0 comments on commit ce9d2b8

Please sign in to comment.