Skip to content

Commit 76e92a7

Browse files
author
Simon MacMullen
committed
Merge bug25343
2 parents c8434d4 + 5f42829 commit 76e92a7

File tree

217 files changed

+219
-219
lines changed

Some content is hidden

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

217 files changed

+219
-219
lines changed

‎LICENSE-MPL-RabbitMQ

+1-1
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,7 @@ EXHIBIT A -Mozilla Public License.
447447
The Original Code is RabbitMQ.
448448

449449
The Initial Developer of the Original Code is VMware, Inc.
450-
Copyright (c) 2007-2012 VMware, Inc. All rights reserved.''
450+
Copyright (c) 2007-2013 VMware, Inc. All rights reserved.''
451451

452452
[NOTE: The text of this Exhibit A may differ slightly from the text of
453453
the notices in the Source Code files of the Original Code. You should

‎codegen.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
## The Original Code is RabbitMQ.
1212
##
1313
## The Initial Developer of the Original Code is VMware, Inc.
14-
## Copyright (c) 2007-2012 VMware, Inc. All rights reserved.
14+
## Copyright (c) 2007-2013 VMware, Inc. All rights reserved.
1515
##
1616

1717
from __future__ import nested_scopes
@@ -143,7 +143,7 @@ def printFileHeader():
143143
// The Original Code is RabbitMQ.
144144
//
145145
// The Initial Developer of the Original Code is VMware, Inc.
146-
// Copyright (c) 2007-2012 VMware, Inc. All rights reserved.
146+
// Copyright (c) 2007-2013 VMware, Inc. All rights reserved.
147147
//
148148
"""
149149

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// The Original Code is RabbitMQ.
1212
//
1313
// The Initial Developer of the Original Code is VMware, Inc.
14-
// Copyright (c) 2007-2012 VMware, Inc. All rights reserved.
14+
// Copyright (c) 2007-2013 VMware, Inc. All rights reserved.
1515
//
1616

1717

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// The Original Code is RabbitMQ.
1212
//
1313
// The Initial Developer of the Original Code is VMware, Inc.
14-
// Copyright (c) 2007-2012 VMware, Inc. All rights reserved.
14+
// Copyright (c) 2007-2013 VMware, Inc. All rights reserved.
1515
//
1616

1717

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// The Original Code is RabbitMQ.
1212
//
1313
// The Initial Developer of the Original Code is VMware, Inc.
14-
// Copyright (c) 2007-2012 VMware, Inc. All rights reserved.
14+
// Copyright (c) 2007-2013 VMware, Inc. All rights reserved.
1515
//
1616

1717
package com.rabbitmq.client;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// The Original Code is RabbitMQ.
1212
//
1313
// The Initial Developer of the Original Code is VMware, Inc.
14-
// Copyright (c) 2007-2012 VMware, Inc. All rights reserved.
14+
// Copyright (c) 2007-2013 VMware, Inc. All rights reserved.
1515
//
1616

1717
package com.rabbitmq.client;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// The Original Code is RabbitMQ.
1212
//
1313
// The Initial Developer of the Original Code is VMware, Inc.
14-
// Copyright (c) 2007-2012 VMware, Inc. All rights reserved.
14+
// Copyright (c) 2007-2013 VMware, Inc. All rights reserved.
1515
//
1616

1717

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// The Original Code is RabbitMQ.
1212
//
1313
// The Initial Developer of the Original Code is VMware, Inc.
14-
// Copyright (c) 2007-2012 VMware, Inc. All rights reserved.
14+
// Copyright (c) 2007-2013 VMware, Inc. All rights reserved.
1515
//
1616

1717

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// The Original Code is RabbitMQ.
1212
//
1313
// The Initial Developer of the Original Code is VMware, Inc.
14-
// Copyright (c) 2007-2012 VMware, Inc. All rights reserved.
14+
// Copyright (c) 2007-2013 VMware, Inc. All rights reserved.
1515
//
1616

1717
package com.rabbitmq.client;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// The Original Code is RabbitMQ.
1212
//
1313
// The Initial Developer of the Original Code is VMware, Inc.
14-
// Copyright (c) 2007-2012 VMware, Inc. All rights reserved.
14+
// Copyright (c) 2007-2013 VMware, Inc. All rights reserved.
1515
//
1616

1717
package com.rabbitmq.client;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// The Original Code is RabbitMQ.
1212
//
1313
// The Initial Developer of the Original Code is VMware, Inc.
14-
// Copyright (c) 2007-2012 VMware, Inc. All rights reserved.
14+
// Copyright (c) 2007-2013 VMware, Inc. All rights reserved.
1515
//
1616

1717
package com.rabbitmq.client;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// The Original Code is RabbitMQ.
1212
//
1313
// The Initial Developer of the Original Code is VMware, Inc.
14-
// Copyright (c) 2007-2012 VMware, Inc. All rights reserved.
14+
// Copyright (c) 2007-2013 VMware, Inc. All rights reserved.
1515
//
1616

1717
package com.rabbitmq.client;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// The Original Code is RabbitMQ.
1212
//
1313
// The Initial Developer of the Original Code is VMware, Inc.
14-
// Copyright (c) 2007-2012 VMware, Inc. All rights reserved.
14+
// Copyright (c) 2007-2013 VMware, Inc. All rights reserved.
1515
//
1616

1717

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// The Original Code is RabbitMQ.
1212
//
1313
// The Initial Developer of the Original Code is VMware, Inc.
14-
// Copyright (c) 2007-2012 VMware, Inc. All rights reserved.
14+
// Copyright (c) 2007-2013 VMware, Inc. All rights reserved.
1515
//
1616

1717

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// The Original Code is RabbitMQ.
1212
//
1313
// The Initial Developer of the Original Code is VMware, Inc.
14-
// Copyright (c) 2007-2012 VMware, Inc. All rights reserved.
14+
// Copyright (c) 2007-2013 VMware, Inc. All rights reserved.
1515
//
1616

1717
package com.rabbitmq.client;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// The Original Code is RabbitMQ.
1212
//
1313
// The Initial Developer of the Original Code is VMware, Inc.
14-
// Copyright (c) 2007-2012 VMware, Inc. All rights reserved.
14+
// Copyright (c) 2007-2013 VMware, Inc. All rights reserved.
1515
//
1616

1717
package com.rabbitmq.client;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// The Original Code is RabbitMQ.
1212
//
1313
// The Initial Developer of the Original Code is VMware, Inc.
14-
// Copyright (c) 2007-2012 VMware, Inc. All rights reserved.
14+
// Copyright (c) 2007-2013 VMware, Inc. All rights reserved.
1515
//
1616

1717

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// The Original Code is RabbitMQ.
1212
//
1313
// The Initial Developer of the Original Code is VMware, Inc.
14-
// Copyright (c) 2007-2012 VMware, Inc. All rights reserved.
14+
// Copyright (c) 2007-2013 VMware, Inc. All rights reserved.
1515
//
1616

1717
package com.rabbitmq.client;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// The Original Code is RabbitMQ.
1212
//
1313
// The Initial Developer of the Original Code is VMware, Inc.
14-
// Copyright (c) 2007-2012 VMware, Inc. All rights reserved.
14+
// Copyright (c) 2007-2013 VMware, Inc. All rights reserved.
1515
//
1616

1717
package com.rabbitmq.client;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// The Original Code is RabbitMQ.
1212
//
1313
// The Initial Developer of the Original Code is VMware, Inc.
14-
// Copyright (c) 2007-2012 VMware, Inc. All rights reserved.
14+
// Copyright (c) 2007-2013 VMware, Inc. All rights reserved.
1515
//
1616

1717

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// The Original Code is RabbitMQ.
1212
//
1313
// The Initial Developer of the Original Code is VMware, Inc.
14-
// Copyright (c) 2007-2012 VMware, Inc. All rights reserved.
14+
// Copyright (c) 2007-2013 VMware, Inc. All rights reserved.
1515
//
1616

1717

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// The Original Code is RabbitMQ.
1212
//
1313
// The Initial Developer of the Original Code is VMware, Inc.
14-
// Copyright (c) 2007-2012 VMware, Inc. All rights reserved.
14+
// Copyright (c) 2007-2013 VMware, Inc. All rights reserved.
1515
//
1616

1717

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// The Original Code is RabbitMQ.
1212
//
1313
// The Initial Developer of the Original Code is VMware, Inc.
14-
// Copyright (c) 2007-2012 VMware, Inc. All rights reserved.
14+
// Copyright (c) 2007-2013 VMware, Inc. All rights reserved.
1515
//
1616

1717
package com.rabbitmq.client;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// The Original Code is RabbitMQ.
1212
//
1313
// The Initial Developer of the Original Code is VMware, Inc.
14-
// Copyright (c) 2007-2012 VMware, Inc. All rights reserved.
14+
// Copyright (c) 2007-2013 VMware, Inc. All rights reserved.
1515
//
1616

1717

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// The Original Code is RabbitMQ.
1212
//
1313
// The Initial Developer of the Original Code is VMware, Inc.
14-
// Copyright (c) 2007-2012 VMware, Inc. All rights reserved.
14+
// Copyright (c) 2007-2013 VMware, Inc. All rights reserved.
1515
//
1616

1717

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// The Original Code is RabbitMQ.
1212
//
1313
// The Initial Developer of the Original Code is VMware, Inc.
14-
// Copyright (c) 2007-2012 VMware, Inc. All rights reserved.
14+
// Copyright (c) 2007-2013 VMware, Inc. All rights reserved.
1515
//
1616

1717

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// The Original Code is RabbitMQ.
1212
//
1313
// The Initial Developer of the Original Code is VMware, Inc.
14-
// Copyright (c) 2007-2012 VMware, Inc. All rights reserved.
14+
// Copyright (c) 2007-2013 VMware, Inc. All rights reserved.
1515
//
1616

1717
package com.rabbitmq.client;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// The Original Code is RabbitMQ.
1212
//
1313
// The Initial Developer of the Original Code is VMware, Inc.
14-
// Copyright (c) 2007-2012 VMware, Inc. All rights reserved.
14+
// Copyright (c) 2007-2013 VMware, Inc. All rights reserved.
1515
//
1616

1717
package com.rabbitmq.client;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// The Original Code is RabbitMQ.
1212
//
1313
// The Initial Developer of the Original Code is VMware, Inc.
14-
// Copyright (c) 2007-2012 VMware, Inc. All rights reserved.
14+
// Copyright (c) 2007-2013 VMware, Inc. All rights reserved.
1515
//
1616

1717

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// The Original Code is RabbitMQ.
1212
//
1313
// The Initial Developer of the Original Code is VMware, Inc.
14-
// Copyright (c) 2007-2012 VMware, Inc. All rights reserved.
14+
// Copyright (c) 2007-2013 VMware, Inc. All rights reserved.
1515
//
1616

1717

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// The Original Code is RabbitMQ.
1212
//
1313
// The Initial Developer of the Original Code is VMware, Inc.
14-
// Copyright (c) 2007-2012 VMware, Inc. All rights reserved.
14+
// Copyright (c) 2007-2013 VMware, Inc. All rights reserved.
1515
//
1616

1717

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// The Original Code is RabbitMQ.
1212
//
1313
// The Initial Developer of the Original Code is VMware, Inc.
14-
// Copyright (c) 2007-2012 VMware, Inc. All rights reserved.
14+
// Copyright (c) 2007-2013 VMware, Inc. All rights reserved.
1515
//
1616

1717

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// The Original Code is RabbitMQ.
1212
//
1313
// The Initial Developer of the Original Code is VMware, Inc.
14-
// Copyright (c) 2007-2012 VMware, Inc. All rights reserved.
14+
// Copyright (c) 2007-2013 VMware, Inc. All rights reserved.
1515
//
1616

1717
package com.rabbitmq.client;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// The Original Code is RabbitMQ.
1212
//
1313
// The Initial Developer of the Original Code is VMware, Inc.
14-
// Copyright (c) 2007-2012 VMware, Inc. All rights reserved.
14+
// Copyright (c) 2007-2013 VMware, Inc. All rights reserved.
1515
//
1616

1717
package com.rabbitmq.client;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// The Original Code is RabbitMQ.
1212
//
1313
// The Initial Developer of the Original Code is VMware, Inc.
14-
// Copyright (c) 2007-2012 VMware, Inc. All rights reserved.
14+
// Copyright (c) 2007-2013 VMware, Inc. All rights reserved.
1515
//
1616

1717

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// The Original Code is RabbitMQ.
1212
//
1313
// The Initial Developer of the Original Code is VMware, Inc.
14-
// Copyright (c) 2007-2012 VMware, Inc. All rights reserved.
14+
// Copyright (c) 2007-2013 VMware, Inc. All rights reserved.
1515
//
1616

1717

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// The Original Code is RabbitMQ.
1212
//
1313
// The Initial Developer of the Original Code is VMware, Inc.
14-
// Copyright (c) 2007-2012 VMware, Inc. All rights reserved.
14+
// Copyright (c) 2007-2013 VMware, Inc. All rights reserved.
1515
//
1616

1717
package com.rabbitmq.client;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// The Original Code is RabbitMQ.
1212
//
1313
// The Initial Developer of the Original Code is VMware, Inc.
14-
// Copyright (c) 2007-2012 VMware, Inc. All rights reserved.
14+
// Copyright (c) 2007-2013 VMware, Inc. All rights reserved.
1515
//
1616

1717

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// The Original Code is RabbitMQ.
1212
//
1313
// The Initial Developer of the Original Code is VMware, Inc.
14-
// Copyright (c) 2007-2012 VMware, Inc. All rights reserved.
14+
// Copyright (c) 2007-2013 VMware, Inc. All rights reserved.
1515
//
1616

1717

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// The Original Code is RabbitMQ.
1212
//
1313
// The Initial Developer of the Original Code is VMware, Inc.
14-
// Copyright (c) 2007-2012 VMware, Inc. All rights reserved.
14+
// Copyright (c) 2007-2013 VMware, Inc. All rights reserved.
1515
//
1616

1717

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// The Original Code is RabbitMQ.
1212
//
1313
// The Initial Developer of the Original Code is VMware, Inc.
14-
// Copyright (c) 2007-2012 VMware, Inc. All rights reserved.
14+
// Copyright (c) 2007-2013 VMware, Inc. All rights reserved.
1515
//
1616

1717

‎src/com/rabbitmq/client/impl/AMQBasicProperties.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// The Original Code is RabbitMQ.
1212
//
1313
// The Initial Developer of the Original Code is VMware, Inc.
14-
// Copyright (c) 2007-2012 VMware, Inc. All rights reserved.
14+
// Copyright (c) 2007-2013 VMware, Inc. All rights reserved.
1515
//
1616

1717
package com.rabbitmq.client.impl;

‎src/com/rabbitmq/client/impl/AMQChannel.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// The Original Code is RabbitMQ.
1212
//
1313
// The Initial Developer of the Original Code is VMware, Inc.
14-
// Copyright (c) 2007-2012 VMware, Inc. All rights reserved.
14+
// Copyright (c) 2007-2013 VMware, Inc. All rights reserved.
1515
//
1616

1717

0 commit comments

Comments
 (0)