Skip to content

Commit 63d7a15

Browse files
author
Steve Powell
committed
Merging default
2 parents d985736 + 6028672 commit 63d7a15

File tree

197 files changed

+2462
-4451
lines changed

Some content is hidden

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

197 files changed

+2462
-4451
lines changed

‎LICENSE-MPL-RabbitMQ‎

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -446,28 +446,10 @@ 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 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-2010 LShift
458-
Ltd. Portions created by Cohesive Financial Technologies LLC are
459-
Copyright (C) 2007-2010 Cohesive Financial Technologies
460-
LLC. Portions created by Rabbit Technologies Ltd are Copyright
461-
(C) 2007-2010 Rabbit Technologies Ltd.
462-
463-
All Rights Reserved.
464-
465-
Contributor(s): ______________________________________.''
449+
The Initial Developer of the Original Code is VMware, Inc.
450+
Copyright (c) 2007-2011 VMware, Inc. All rights reserved.''
466451

467452
[NOTE: The text of this Exhibit A may differ slightly from the text of
468453
the notices in the Source Code files of the Original Code. You should
469454
use the text of this Exhibit A rather than the text found in the
470455
Original Code Source Code for Your Modifications.]
471-
472-
473-

‎README-EXAMPLES‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,3 +82,4 @@ SpammyTopicProducer - Sends lots of different topic messages over AMQP.
8282
StressPersister - Stress test for persister.
8383
TestMain - RabbitMQ server regression tests.
8484
TracerConcurrencyTest - Tests correct concurrency behaviour of RabbitMQ tracer.
85+

‎codegen.py‎

Lines changed: 22 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,17 @@
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/
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
4+
## at http://www.mozilla.org/MPL/
55
##
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.
6+
## Software distributed under the License is distributed on an "AS IS"
7+
## basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
8+
## the License for the specific language governing rights and
9+
## limitations under the License.
1010
##
11-
## The Original Code is RabbitMQ.
11+
## 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.
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-2010 LShift
22-
## Ltd. Portions created by Cohesive Financial Technologies LLC are
23-
## Copyright (C) 2007-2010 Cohesive Financial Technologies
24-
## LLC. Portions created by Rabbit Technologies Ltd are Copyright
25-
## (C) 2007-2010 Rabbit Technologies Ltd.
26-
##
27-
## All Rights Reserved.
28-
##
29-
## Contributor(s): ______________________________________.
13+
## The Initial Developer of the Original Code is VMware, Inc.
14+
## Copyright (c) 2007-2011 VMware, Inc. All rights reserved.
3015
##
3116

3217
from __future__ import nested_scopes
@@ -99,35 +84,20 @@ def printFileHeader():
9984
print """// NOTE: This -*- java -*- source code is autogenerated from the AMQP
10085
// specification!
10186
//
102-
// The contents of this file are subject to the Mozilla Public License
103-
// Version 1.1 (the "License"); you may not use this file except in
104-
// compliance with the License. You may obtain a copy of the License at
105-
// http://www.mozilla.org/MPL/
106-
//
107-
// Software distributed under the License is distributed on an "AS IS"
108-
// basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
109-
// License for the specific language governing rights and limitations
110-
// under the License.
111-
//
112-
// The Original Code is RabbitMQ.
113-
//
114-
// The Initial Developers of the Original Code are LShift Ltd,
115-
// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd.
116-
//
117-
// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd,
118-
// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd
119-
// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
120-
// Technologies LLC, and Rabbit Technologies Ltd.
87+
// The contents of this file are subject to the Mozilla Public License
88+
// Version 1.1 (the "License"); you may not use this file except in
89+
// compliance with the License. You may obtain a copy of the License
90+
// at http://www.mozilla.org/MPL/
12191
//
122-
// Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift
123-
// Ltd. Portions created by Cohesive Financial Technologies LLC are
124-
// Copyright (C) 2007-2010 Cohesive Financial Technologies
125-
// LLC. Portions created by Rabbit Technologies Ltd are Copyright
126-
// (C) 2007-2010 Rabbit Technologies Ltd.
92+
// Software distributed under the License is distributed on an "AS IS"
93+
// basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
94+
// the License for the specific language governing rights and
95+
// limitations under the License.
12796
//
128-
// All Rights Reserved.
97+
// The Original Code is RabbitMQ.
12998
//
130-
// Contributor(s): ______________________________________.
99+
// The Initial Developer of the Original Code is VMware, Inc.
100+
// Copyright (c) 2007-2011 VMware, Inc. All rights reserved.
131101
//
132102
"""
133103

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

Lines changed: 12 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,20 @@
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/
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
4+
// at http://www.mozilla.org/MPL/
55
//
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.
6+
// Software distributed under the License is distributed on an "AS IS"
7+
// basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
8+
// the License for the specific language governing rights and
9+
// limitations under the License.
1010
//
11-
// The Original Code is RabbitMQ.
11+
// 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.
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-2010 LShift
22-
// Ltd. Portions created by Cohesive Financial Technologies LLC are
23-
// Copyright (C) 2007-2010 Cohesive Financial Technologies
24-
// LLC. Portions created by Rabbit Technologies Ltd are Copyright
25-
// (C) 2007-2010 Rabbit Technologies Ltd.
26-
//
27-
// All Rights Reserved.
28-
//
29-
// Contributor(s): ______________________________________.
13+
// The Initial Developer of the Original Code is VMware, Inc.
14+
// Copyright (c) 2007-2011 VMware, Inc. All rights reserved.
3015
//
3116

17+
3218
package com.rabbitmq.client;
3319

3420
import java.io.IOException;

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

Lines changed: 12 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,20 @@
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/
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
4+
// at http://www.mozilla.org/MPL/
55
//
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.
6+
// Software distributed under the License is distributed on an "AS IS"
7+
// basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
8+
// the License for the specific language governing rights and
9+
// limitations under the License.
1010
//
11-
// The Original Code is RabbitMQ.
11+
// 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.
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-2010 LShift
22-
// Ltd. Portions created by Cohesive Financial Technologies LLC are
23-
// Copyright (C) 2007-2010 Cohesive Financial Technologies
24-
// LLC. Portions created by Rabbit Technologies Ltd are Copyright
25-
// (C) 2007-2010 Rabbit Technologies Ltd.
26-
//
27-
// All Rights Reserved.
28-
//
29-
// Contributor(s): ______________________________________.
13+
// The Initial Developer of the Original Code is VMware, Inc.
14+
// Copyright (c) 2007-2011 VMware, Inc. All rights reserved.
3015
//
3116

17+
3218
package com.rabbitmq.client;
3319

3420
/**

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

Lines changed: 12 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,20 @@
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/
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
4+
// at http://www.mozilla.org/MPL/
55
//
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.
6+
// Software distributed under the License is distributed on an "AS IS"
7+
// basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
8+
// the License for the specific language governing rights and
9+
// limitations under the License.
1010
//
11-
// The Original Code is RabbitMQ.
11+
// 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.
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-2010 LShift
22-
// Ltd. Portions created by Cohesive Financial Technologies LLC are
23-
// Copyright (C) 2007-2010 Cohesive Financial Technologies
24-
// LLC. Portions created by Rabbit Technologies Ltd are Copyright
25-
// (C) 2007-2010 Rabbit Technologies Ltd.
26-
//
27-
// All Rights Reserved.
28-
//
29-
// Contributor(s): ______________________________________.
13+
// The Initial Developer of the Original Code is VMware, Inc.
14+
// Copyright (c) 2007-2011 VMware, Inc. All rights reserved.
3015
//
3116

17+
3218
package com.rabbitmq.client;
3319

3420
/*

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

Lines changed: 12 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,19 @@
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/
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
4+
// at http://www.mozilla.org/MPL/
55
//
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.
6+
// Software distributed under the License is distributed on an "AS IS"
7+
// basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
8+
// the License for the specific language governing rights and
9+
// limitations under the License.
1010
//
11-
// The Original Code is RabbitMQ.
11+
// 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.
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-2010 LShift
22-
// Ltd. Portions created by Cohesive Financial Technologies LLC are
23-
// Copyright (C) 2007-2010 Cohesive Financial Technologies
24-
// LLC. Portions created by Rabbit Technologies Ltd are Copyright
25-
// (C) 2007-2010 Rabbit Technologies Ltd.
26-
//
27-
// All Rights Reserved.
28-
//
29-
// Contributor(s): ______________________________________.
13+
// The Initial Developer of the Original Code is VMware, Inc.
14+
// Copyright (c) 2007-2011 VMware, Inc. All rights reserved.
3015
//
16+
3117
package com.rabbitmq.client;
3218

3319
import java.util.Date;

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

Lines changed: 12 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,19 @@
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/
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
4+
// at http://www.mozilla.org/MPL/
55
//
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.
6+
// Software distributed under the License is distributed on an "AS IS"
7+
// basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
8+
// the License for the specific language governing rights and
9+
// limitations under the License.
1010
//
11-
// The Original Code is RabbitMQ.
11+
// 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.
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-2010 LShift
22-
// Ltd. Portions created by Cohesive Financial Technologies LLC are
23-
// Copyright (C) 2007-2010 Cohesive Financial Technologies
24-
// LLC. Portions created by Rabbit Technologies Ltd are Copyright
25-
// (C) 2007-2010 Rabbit Technologies Ltd.
26-
//
27-
// All Rights Reserved.
28-
//
29-
// Contributor(s): ______________________________________.
13+
// The Initial Developer of the Original Code is VMware, Inc.
14+
// Copyright (c) 2007-2011 VMware, Inc. All rights reserved.
3015
//
16+
3117
package com.rabbitmq.client;
3218

3319
import java.io.IOException;

0 commit comments

Comments
 (0)