Skip to content

Commit dcdf070

Browse files
author
Matthias Radestock
committed
merge bug19974 into default
2 parents cb64611 + 39b9963 commit dcdf070

File tree

116 files changed

+1545
-649
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

116 files changed

+1545
-649
lines changed

‎LICENSE-MPL-RabbitMQ‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -446,13 +446,19 @@ EXHIBIT A -Mozilla Public License.
446446

447447
The Original Code is RabbitMQ.
448448

449-
The Initial Developers of the Original Code are LShift Ltd.,
450-
Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd.
451-
452-
Portions created by LShift Ltd., Cohesive Financial Technologies
453-
LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007-2008
454-
LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit
455-
Technologies Ltd.;
449+
The Initial Developers of the Original Code are LShift Ltd,
450+
Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd.
451+
452+
Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd,
453+
Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd
454+
are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
455+
Technologies LLC, and Rabbit Technologies Ltd.
456+
457+
Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift
458+
Ltd. Portions created by Cohesive Financial Technologies LLC are
459+
Copyright (C) 2007-2009 Cohesive Financial Technologies
460+
LLC. Portions created by Rabbit Technologies Ltd are Copyright
461+
(C) 2007-2009 Rabbit Technologies Ltd.
456462

457463
All Rights Reserved.
458464

‎codegen.py‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,19 @@
1010
##
1111
## The Original Code is RabbitMQ.
1212
##
13-
## The Initial Developers of the Original Code are LShift Ltd.,
14-
## Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd.
13+
## The Initial Developers of the Original Code are LShift Ltd,
14+
## Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd.
1515
##
16-
## Portions created by LShift Ltd., Cohesive Financial Technologies
17-
## LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007-2008
18-
## LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit
19-
## Technologies Ltd.;
16+
## Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd,
17+
## Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd
18+
## are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
19+
## Technologies LLC, and Rabbit Technologies Ltd.
20+
##
21+
## Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift
22+
## Ltd. Portions created by Cohesive Financial Technologies LLC are
23+
## Copyright (C) 2007-2009 Cohesive Financial Technologies
24+
## LLC. Portions created by Rabbit Technologies Ltd are Copyright
25+
## (C) 2007-2009 Rabbit Technologies Ltd.
2026
##
2127
## All Rights Reserved.
2228
##

‎src/com/rabbitmq/client/Address.java‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,19 @@
1010
//
1111
// The Original Code is RabbitMQ.
1212
//
13-
// The Initial Developers of the Original Code are LShift Ltd.,
14-
// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd.
13+
// The Initial Developers of the Original Code are LShift Ltd,
14+
// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd.
1515
//
16-
// Portions created by LShift Ltd., Cohesive Financial Technologies
17-
// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007-2008
18-
// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit
19-
// Technologies Ltd.;
16+
// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd,
17+
// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd
18+
// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
19+
// Technologies LLC, and Rabbit Technologies Ltd.
20+
//
21+
// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift
22+
// Ltd. Portions created by Cohesive Financial Technologies LLC are
23+
// Copyright (C) 2007-2009 Cohesive Financial Technologies
24+
// LLC. Portions created by Rabbit Technologies Ltd are Copyright
25+
// (C) 2007-2009 Rabbit Technologies Ltd.
2026
//
2127
// All Rights Reserved.
2228
//

‎src/com/rabbitmq/client/AlreadyClosedException.java‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,34 @@
1+
// The contents of this file are subject to the Mozilla Public License
2+
// Version 1.1 (the "License"); you may not use this file except in
3+
// compliance with the License. You may obtain a copy of the License at
4+
// http://www.mozilla.org/MPL/
5+
//
6+
// Software distributed under the License is distributed on an "AS IS"
7+
// basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
8+
// License for the specific language governing rights and limitations
9+
// under the License.
10+
//
11+
// The Original Code is RabbitMQ.
12+
//
13+
// The Initial Developers of the Original Code are LShift Ltd,
14+
// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd.
15+
//
16+
// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd,
17+
// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd
18+
// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
19+
// Technologies LLC, and Rabbit Technologies Ltd.
20+
//
21+
// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift
22+
// Ltd. Portions created by Cohesive Financial Technologies LLC are
23+
// Copyright (C) 2007-2009 Cohesive Financial Technologies
24+
// LLC. Portions created by Rabbit Technologies Ltd are Copyright
25+
// (C) 2007-2009 Rabbit Technologies Ltd.
26+
//
27+
// All Rights Reserved.
28+
//
29+
// Contributor(s): ______________________________________.
30+
//
31+
132
package com.rabbitmq.client;
233

334
/*

‎src/com/rabbitmq/client/Channel.java‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,19 @@
1010
//
1111
// The Original Code is RabbitMQ.
1212
//
13-
// The Initial Developers of the Original Code are LShift Ltd.,
14-
// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd.
13+
// The Initial Developers of the Original Code are LShift Ltd,
14+
// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd.
1515
//
16-
// Portions created by LShift Ltd., Cohesive Financial Technologies
17-
// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007-2008
18-
// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit
19-
// Technologies Ltd.;
16+
// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd,
17+
// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd
18+
// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
19+
// Technologies LLC, and Rabbit Technologies Ltd.
20+
//
21+
// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift
22+
// Ltd. Portions created by Cohesive Financial Technologies LLC are
23+
// Copyright (C) 2007-2009 Cohesive Financial Technologies
24+
// LLC. Portions created by Rabbit Technologies Ltd are Copyright
25+
// (C) 2007-2009 Rabbit Technologies Ltd.
2026
//
2127
// All Rights Reserved.
2228
//

‎src/com/rabbitmq/client/Command.java‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,19 @@
1010
//
1111
// The Original Code is RabbitMQ.
1212
//
13-
// The Initial Developers of the Original Code are LShift Ltd.,
14-
// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd.
13+
// The Initial Developers of the Original Code are LShift Ltd,
14+
// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd.
1515
//
16-
// Portions created by LShift Ltd., Cohesive Financial Technologies
17-
// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007-2008
18-
// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit
19-
// Technologies Ltd.;
16+
// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd,
17+
// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd
18+
// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
19+
// Technologies LLC, and Rabbit Technologies Ltd.
20+
//
21+
// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift
22+
// Ltd. Portions created by Cohesive Financial Technologies LLC are
23+
// Copyright (C) 2007-2009 Cohesive Financial Technologies
24+
// LLC. Portions created by Rabbit Technologies Ltd are Copyright
25+
// (C) 2007-2009 Rabbit Technologies Ltd.
2026
//
2127
// All Rights Reserved.
2228
//

‎src/com/rabbitmq/client/Connection.java‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,19 @@
1010
//
1111
// The Original Code is RabbitMQ.
1212
//
13-
// The Initial Developers of the Original Code are LShift Ltd.,
14-
// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd.
13+
// The Initial Developers of the Original Code are LShift Ltd,
14+
// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd.
1515
//
16-
// Portions created by LShift Ltd., Cohesive Financial Technologies
17-
// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007-2008
18-
// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit
19-
// Technologies Ltd.;
16+
// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd,
17+
// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd
18+
// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
19+
// Technologies LLC, and Rabbit Technologies Ltd.
20+
//
21+
// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift
22+
// Ltd. Portions created by Cohesive Financial Technologies LLC are
23+
// Copyright (C) 2007-2009 Cohesive Financial Technologies
24+
// LLC. Portions created by Rabbit Technologies Ltd are Copyright
25+
// (C) 2007-2009 Rabbit Technologies Ltd.
2026
//
2127
// All Rights Reserved.
2228
//

‎src/com/rabbitmq/client/ConnectionFactory.java‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,19 @@
1010
//
1111
// The Original Code is RabbitMQ.
1212
//
13-
// The Initial Developers of the Original Code are LShift Ltd.,
14-
// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd.
13+
// The Initial Developers of the Original Code are LShift Ltd,
14+
// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd.
1515
//
16-
// Portions created by LShift Ltd., Cohesive Financial Technologies
17-
// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007-2008
18-
// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit
19-
// Technologies Ltd.;
16+
// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd,
17+
// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd
18+
// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
19+
// Technologies LLC, and Rabbit Technologies Ltd.
20+
//
21+
// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift
22+
// Ltd. Portions created by Cohesive Financial Technologies LLC are
23+
// Copyright (C) 2007-2009 Cohesive Financial Technologies
24+
// LLC. Portions created by Rabbit Technologies Ltd are Copyright
25+
// (C) 2007-2009 Rabbit Technologies Ltd.
2026
//
2127
// All Rights Reserved.
2228
//

‎src/com/rabbitmq/client/ConnectionParameters.java‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,19 @@
1010
//
1111
// The Original Code is RabbitMQ.
1212
//
13-
// The Initial Developers of the Original Code are LShift Ltd.,
14-
// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd.
13+
// The Initial Developers of the Original Code are LShift Ltd,
14+
// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd.
1515
//
16-
// Portions created by LShift Ltd., Cohesive Financial Technologies
17-
// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007-2008
18-
// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit
19-
// Technologies Ltd.;
16+
// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd,
17+
// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd
18+
// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
19+
// Technologies LLC, and Rabbit Technologies Ltd.
20+
//
21+
// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift
22+
// Ltd. Portions created by Cohesive Financial Technologies LLC are
23+
// Copyright (C) 2007-2009 Cohesive Financial Technologies
24+
// LLC. Portions created by Rabbit Technologies Ltd are Copyright
25+
// (C) 2007-2009 Rabbit Technologies Ltd.
2026
//
2127
// All Rights Reserved.
2228
//

‎src/com/rabbitmq/client/Consumer.java‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,19 @@
1010
//
1111
// The Original Code is RabbitMQ.
1212
//
13-
// The Initial Developers of the Original Code are LShift Ltd.,
14-
// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd.
13+
// The Initial Developers of the Original Code are LShift Ltd,
14+
// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd.
1515
//
16-
// Portions created by LShift Ltd., Cohesive Financial Technologies
17-
// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007-2008
18-
// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit
19-
// Technologies Ltd.;
16+
// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd,
17+
// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd
18+
// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
19+
// Technologies LLC, and Rabbit Technologies Ltd.
20+
//
21+
// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift
22+
// Ltd. Portions created by Cohesive Financial Technologies LLC are
23+
// Copyright (C) 2007-2009 Cohesive Financial Technologies
24+
// LLC. Portions created by Rabbit Technologies Ltd are Copyright
25+
// (C) 2007-2009 Rabbit Technologies Ltd.
2026
//
2127
// All Rights Reserved.
2228
//

0 commit comments

Comments
 (0)