From dc15eec37f503a28373be4d32d7b02ffba20e978 Mon Sep 17 00:00:00 2001 From: Michael Barker Date: Thu, 21 May 2009 06:40:41 +0000 Subject: [PATCH] 2009-05-21 Michael Barker Updated to version 1.5.3 of the RabbitMQ libraries. 2009-05-20 Michael Barker * RabbitMQMessageEnumerator.cs: Removed references to realms & tickets. * RabbitMQMessageQueue.cs: Removed references to realms & tickets. svn path=/trunk/mcs/; revision=134509 --- .../Mono.Messaging.RabbitMQ/ChangeLog | 7 +- .../RabbitMQMessageEnumerator.cs | 6 +- .../RabbitMQMessageQueue.cs | 21 +- mcs/class/RabbitMQ.Client/ChangeLog | 3 + mcs/class/RabbitMQ.Client/docs/specs/Makefile | 1 + .../RabbitMQ.Client/docs/specs/amqp0-8.xml | 56 +++- .../docs/specs/autogenerated-api-0-8.cs | 195 ++++++++++--- .../docs/specs/autogenerated-api-0-9.cs | 51 +--- .../docs/specs/autogenerated-api-qpid-0-8.cs | 50 +--- .../RabbitMQ.Client/src/apigen/AmqpClass.cs | 20 +- .../RabbitMQ.Client/src/apigen/AmqpEntity.cs | 20 +- .../RabbitMQ.Client/src/apigen/AmqpField.cs | 20 +- .../RabbitMQ.Client/src/apigen/AmqpMethod.cs | 20 +- .../RabbitMQ.Client/src/apigen/Apigen.cs | 20 +- mcs/class/RabbitMQ.Client/src/apigen/Makefile | 1 - .../RabbitMQ.Client/src/bootstrap/Makefile | 10 - .../bootstrap/apigen-bootstrap.dll.sources | 15 - .../src/client/RabbitMQ.Client.dll.sources | 7 +- .../src/client/api/AmqpTcpEndpoint.cs | 20 +- .../src/client/api/AmqpTimestamp.cs | 20 +- .../src/client/api/AmqpVersion.cs | 20 +- .../src/client/api/BinaryTableValue.cs | 20 +- .../src/client/api/ConnectionFactory.cs | 21 +- .../src/client/api/ConnectionParameters.cs | 30 +- .../src/client/api/DefaultBasicConsumer.cs | 20 +- .../src/client/api/ExchangeType.cs | 20 +- .../src/client/api/IBasicConsumer.cs | 20 +- .../src/client/api/IBasicProperties.cs | 20 +- .../src/client/api/IConnection.cs | 84 +++++- .../src/client/api/IContentHeader.cs | 20 +- .../src/client/api/IFileProperties.cs | 20 +- .../RabbitMQ.Client/src/client/api/IMethod.cs | 20 +- .../RabbitMQ.Client/src/client/api/IModel.cs | 191 +++++++------ .../src/client/api/IProtocol.cs | 26 +- .../src/client/api/IStreamProperties.cs | 20 +- .../src/client/api/Protocols.cs | 20 +- .../src/client/api/PublicationAddress.cs | 20 +- .../src/client/api/QueueingBasicConsumer.cs | 22 +- .../src/client/api/ShutdownEventArgs.cs | 20 +- .../src/client/api/ShutdownInitiator.cs | 20 +- .../src/client/api/ShutdownReportEntry.cs | 20 +- .../src/client/content/BasicMessageBuilder.cs | 20 +- .../src/client/content/BasicMessageReader.cs | 20 +- .../src/client/content/BytesMessageBuilder.cs | 20 +- .../src/client/content/BytesMessageReader.cs | 20 +- .../src/client/content/BytesWireFormatting.cs | 20 +- .../client/content/IBytesMessageBuilder.cs | 20 +- .../src/client/content/IBytesMessageReader.cs | 20 +- .../src/client/content/IMapMessageBuilder.cs | 20 +- .../src/client/content/IMapMessageReader.cs | 20 +- .../src/client/content/IMessageBuilder.cs | 20 +- .../src/client/content/IMessageReader.cs | 20 +- .../client/content/IStreamMessageBuilder.cs | 20 +- .../client/content/IStreamMessageReader.cs | 20 +- .../src/client/content/MapMessageBuilder.cs | 20 +- .../src/client/content/MapMessageReader.cs | 20 +- .../src/client/content/MapWireFormatting.cs | 20 +- .../src/client/content/PrimitiveParser.cs | 20 +- .../client/content/StreamMessageBuilder.cs | 20 +- .../src/client/content/StreamMessageReader.cs | 20 +- .../client/content/StreamWireFormatting.cs | 20 +- .../client/events/BasicDeliverEventArgs.cs | 20 +- .../client/events/BasicDeliverEventHandler.cs | 20 +- .../src/client/events/BasicReturnEventArgs.cs | 20 +- .../client/events/BasicReturnEventHandler.cs | 20 +- .../events/CallbackExceptionEventArgs.cs | 20 +- .../events/CallbackExceptionEventHandler.cs | 20 +- .../events/ConnectionShutdownEventHandler.cs | 20 +- .../src/client/events/ConsumerEventArgs.cs | 20 +- .../src/client/events/ConsumerEventHandler.cs | 20 +- .../events/ConsumerShutdownEventHandler.cs | 20 +- .../client/events/EventingBasicConsumer.cs | 20 +- .../events/ModelShutdownEventHandler.cs | 20 +- .../exceptions/AlreadyClosedException.cs | 20 +- .../exceptions/BrokerUnreachableException.cs | 20 +- .../exceptions/ChannelAllocationException.cs | 20 +- .../OperationInterruptedException.cs | 20 +- .../PacketNotRecognizedException.cs | 20 +- .../ProtocolVersionMismatchException.cs | 20 +- .../exceptions/UnexpectedMethodException.cs | 20 +- .../exceptions/UnsupportedMethodException.cs | 20 +- .../UnsupportedMethodFieldException.cs | 20 +- .../exceptions/WireFormattingException.cs | 20 +- .../src/client/impl/AbstractProtocolBase.cs | 26 +- .../src/client/impl/BasicProperties.cs | 20 +- .../src/client/impl/BodyTooLongException.cs | 20 +- .../src/client/impl/ChannelErrorException.cs | 20 +- .../src/client/impl/Command.cs | 20 +- .../src/client/impl/CommandAssembler.cs | 20 +- .../src/client/impl/ConnectionBase.cs | 78 ++++-- .../src/client/impl/ConnectionStartDetails.cs | 20 +- .../src/client/impl/ContentHeaderBase.cs | 20 +- .../impl/ContentHeaderPropertyReader.cs | 20 +- .../impl/ContentHeaderPropertyWriter.cs | 20 +- .../src/client/impl/FileProperties.cs | 20 +- .../RabbitMQ.Client/src/client/impl/Frame.cs | 20 +- .../src/client/impl/HardProtocolException.cs | 20 +- .../src/client/impl/IFrameHandler.cs | 20 +- .../src/client/impl/IRpcContinuation.cs | 20 +- .../src/client/impl/ISession.cs | 26 +- .../src/client/impl/MainSession.cs | 22 +- .../client/impl/MalformedFrameException.cs | 20 +- .../src/client/impl/MethodArgumentReader.cs | 20 +- .../src/client/impl/MethodArgumentWriter.cs | 20 +- .../src/client/impl/MethodBase.cs | 20 +- .../src/client/impl/ModelBase.cs | 264 ++++++++---------- .../src/client/impl/ProtocolException.cs | 20 +- .../src/client/impl/QuiescingSession.cs | 20 +- .../src/client/impl/RedirectException.cs | 20 +- .../src/client/impl/RpcContinuationQueue.cs | 20 +- .../src/client/impl/Session.cs | 20 +- .../src/client/impl/SessionBase.cs | 42 ++- .../src/client/impl/SessionManager.cs | 20 +- .../src/client/impl/ShutdownContinuation.cs | 20 +- .../impl/SimpleBlockingRpcContinuation.cs | 20 +- .../src/client/impl/SocketFrameHandler_0_9.cs | 22 +- .../src/client/impl/SoftProtocolException.cs | 20 +- .../src/client/impl/StreamProperties.cs | 20 +- .../src/client/impl/SyntaxError.cs | 20 +- .../client/impl/UnexpectedFrameException.cs | 20 +- .../impl/UnknownClassOrMethodException.cs | 20 +- .../src/client/impl/WireFormatting.cs | 20 +- .../src/client/impl/v0_8/Connection.cs | 20 +- .../src/client/impl/v0_8/ProtocolBase.cs | 26 +- .../src/client/impl/v0_8qpid/Connection.cs | 20 +- .../src/client/impl/v0_8qpid/ProtocolBase.cs | 26 +- .../src/client/impl/v0_9/Connection.cs | 20 +- .../src/client/impl/v0_9/ProtocolBase.cs | 26 +- .../client/messagepatterns/SimpleRpcClient.cs | 48 ++-- .../client/messagepatterns/SimpleRpcServer.cs | 168 +++++------ .../client/messagepatterns/Subscription.cs | 173 ++++++------ .../RabbitMQ.Client/src/examples/AddClient.cs | 23 +- .../RabbitMQ.Client/src/examples/AddServer.cs | 23 +- .../src/examples/DeclareQueue.cs | 39 ++- .../src/examples/ExceptionTest.cs | 27 +- .../RabbitMQ.Client/src/examples/LogTail.cs | 26 +- .../RabbitMQ.Client/src/examples/SendMap.cs | 35 +-- .../src/examples/SendString.cs | 26 +- .../RabbitMQ.Client/src/examples/SingleGet.cs | 25 +- .../RabbitMQ.Client/src/util/BlockingCell.cs | 20 +- .../RabbitMQ.Client/src/util/DebugUtil.cs | 20 +- mcs/class/RabbitMQ.Client/src/util/Either.cs | 20 +- .../src/util/NetworkBinaryReader.cs | 20 +- .../src/util/NetworkBinaryWriter.cs | 20 +- .../RabbitMQ.Client/src/util/Semaphore.cs | 20 +- .../RabbitMQ.Client/src/util/SharedQueue.cs | 20 +- mcs/class/RabbitMQ.Client/src/util/XmlUtil.cs | 20 +- 147 files changed, 2518 insertions(+), 1590 deletions(-) delete mode 100644 mcs/class/RabbitMQ.Client/src/bootstrap/Makefile delete mode 100644 mcs/class/RabbitMQ.Client/src/bootstrap/apigen-bootstrap.dll.sources diff --git a/mcs/class/Mono.Messaging.RabbitMQ/Mono.Messaging.RabbitMQ/ChangeLog b/mcs/class/Mono.Messaging.RabbitMQ/Mono.Messaging.RabbitMQ/ChangeLog index c76ac7ac199..7cefeaa3aec 100644 --- a/mcs/class/Mono.Messaging.RabbitMQ/Mono.Messaging.RabbitMQ/ChangeLog +++ b/mcs/class/Mono.Messaging.RabbitMQ/Mono.Messaging.RabbitMQ/ChangeLog @@ -47,4 +47,9 @@ 2009-05-19 Michael Barker - * RabbitMQMessageQueue.cs: Added comments. \ No newline at end of file + * RabbitMQMessageQueue.cs: Added comments. + +2009-05-20 Michael Barker + + * RabbitMQMessageEnumerator.cs: Removed references to realms & tickets. + * RabbitMQMessageQueue.cs: Removed references to realms & tickets. \ No newline at end of file diff --git a/mcs/class/Mono.Messaging.RabbitMQ/Mono.Messaging.RabbitMQ/RabbitMQMessageEnumerator.cs b/mcs/class/Mono.Messaging.RabbitMQ/Mono.Messaging.RabbitMQ/RabbitMQMessageEnumerator.cs index 30d0ea3542b..93be9fd83fe 100644 --- a/mcs/class/Mono.Messaging.RabbitMQ/Mono.Messaging.RabbitMQ/RabbitMQMessageEnumerator.cs +++ b/mcs/class/Mono.Messaging.RabbitMQ/Mono.Messaging.RabbitMQ/RabbitMQMessageEnumerator.cs @@ -117,10 +117,10 @@ namespace Mono.Messaging.RabbitMQ { if (subscription == null) { IModel ch = Model; - ushort ticket = ch.AccessRequest ("/data"); - string finalName = ch.QueueDeclare (ticket, qRef.Queue, false); + //ushort ticket = ch.AccessRequest ("/data"); + string finalName = ch.QueueDeclare (qRef.Queue, false); - subscription = new Subscription (ch, ticket, finalName); + subscription = new Subscription (ch, finalName); } return subscription; diff --git a/mcs/class/Mono.Messaging.RabbitMQ/Mono.Messaging.RabbitMQ/RabbitMQMessageQueue.cs b/mcs/class/Mono.Messaging.RabbitMQ/Mono.Messaging.RabbitMQ/RabbitMQMessageQueue.cs index 3d5fc614ffb..ea35c687760 100644 --- a/mcs/class/Mono.Messaging.RabbitMQ/Mono.Messaging.RabbitMQ/RabbitMQMessageQueue.cs +++ b/mcs/class/Mono.Messaging.RabbitMQ/Mono.Messaging.RabbitMQ/RabbitMQMessageQueue.cs @@ -209,8 +209,7 @@ namespace Mono.Messaging.RabbitMQ { using (IConnection cn = cf.CreateConnection (qRef.Host)) { using (IModel model = cn.CreateModel ()) { - ushort ticket = model.AccessRequest (realm); - model.QueueDelete (ticket, qRef.Queue, false, false, false); + model.QueueDelete (qRef.Queue, false, false, false); } } } @@ -298,11 +297,10 @@ namespace Mono.Messaging.RabbitMQ { private void Send (IModel model, IMessage msg) { - ushort ticket = model.AccessRequest ("/data"); - string finalName = model.QueueDeclare (ticket, QRef.Queue, true); + string finalName = model.QueueDeclare (QRef.Queue, true); IMessageBuilder mb = helper.WriteMessage (model, msg); - model.BasicPublish (ticket, "", finalName, + model.BasicPublish ("", finalName, (IBasicProperties) mb.GetContentHeader(), mb.GetContentBody ()); } @@ -313,8 +311,7 @@ namespace Mono.Messaging.RabbitMQ { using (IConnection cn = cf.CreateConnection (QRef.Host)) { using (IModel model = cn.CreateModel ()) { - ushort ticket = model.AccessRequest (realm); - model.QueuePurge (ticket, QRef.Queue, false); + model.QueuePurge (QRef.Queue, false); } } } @@ -677,10 +674,9 @@ namespace Mono.Messaging.RabbitMQ { private IMessage Receive (IModel model, int timeout, bool doAck) { - ushort ticket = model.AccessRequest (realm); - string finalName = model.QueueDeclare (ticket, QRef.Queue, false); + string finalName = model.QueueDeclare (QRef.Queue, false); - using (Subscription sub = new Subscription (model, ticket, finalName)) { + using (Subscription sub = new Subscription (model, finalName)) { BasicDeliverEventArgs result; if (sub.Next (timeout, out result)) { IMessage m = helper.ReadMessage (QRef, result); @@ -696,10 +692,9 @@ namespace Mono.Messaging.RabbitMQ { private IMessage Receive (IModel model, int timeout, bool doAck, IsMatch matcher) { - ushort ticket = model.AccessRequest (realm); - string finalName = model.QueueDeclare (ticket, QRef.Queue, false); + string finalName = model.QueueDeclare (QRef.Queue, false); - using (Subscription sub = new Subscription (model, ticket, finalName)) { + using (Subscription sub = new Subscription (model, finalName)) { BasicDeliverEventArgs result; while (sub.Next (timeout, out result)) { diff --git a/mcs/class/RabbitMQ.Client/ChangeLog b/mcs/class/RabbitMQ.Client/ChangeLog index e6b29c1b357..4dfdb797ff6 100644 --- a/mcs/class/RabbitMQ.Client/ChangeLog +++ b/mcs/class/RabbitMQ.Client/ChangeLog @@ -39,3 +39,6 @@ RabbitMQ.Client assembly from RabbitMQ project. http://www.rabbitmq.com/ +2009-05-21 Michael Barker + + Updated to version 1.5.3 of the RabbitMQ libraries. diff --git a/mcs/class/RabbitMQ.Client/docs/specs/Makefile b/mcs/class/RabbitMQ.Client/docs/specs/Makefile index 4b01a833b0d..f5c7f91e4cb 100644 --- a/mcs/class/RabbitMQ.Client/docs/specs/Makefile +++ b/mcs/class/RabbitMQ.Client/docs/specs/Makefile @@ -20,6 +20,7 @@ install-local: clean-local: rm -f ../../src/apigen/apigen-bootstrap.dll + rm autogenerated-api*.cs test-local: diff --git a/mcs/class/RabbitMQ.Client/docs/specs/amqp0-8.xml b/mcs/class/RabbitMQ.Client/docs/specs/amqp0-8.xml index 8ad0f17a2c2..326ce992a1c 100644 --- a/mcs/class/RabbitMQ.Client/docs/specs/amqp0-8.xml +++ b/mcs/class/RabbitMQ.Client/docs/specs/amqp0-8.xml @@ -1,5 +1,6 @@ - + + + + This method unbinds a queue from an exchange. + + If a unbind fails, the server MUST raise a connection exception. + + + + + + + The client provides a valid access ticket giving "active" + access rights to the queue's access realm. + + + + + Specifies the name of the queue to unbind. + + + If the queue does not exist the server MUST raise a channel exception + with reply code 404 (not found). + + + + + + The name of the exchange to unbind from. + + + If the exchange does not exist the server MUST raise a channel + exception with reply code 404 (not found). + + + + + + Specifies the routing key of the binding to unbind. + + + + Specifies the arguments of the binding to unbind. + + + + + This method confirms that the unbind was successful. + + + purge a queue diff --git a/mcs/class/RabbitMQ.Client/docs/specs/autogenerated-api-0-8.cs b/mcs/class/RabbitMQ.Client/docs/specs/autogenerated-api-0-8.cs index 7ab99176d18..19dbf65a94a 100644 --- a/mcs/class/RabbitMQ.Client/docs/specs/autogenerated-api-0-8.cs +++ b/mcs/class/RabbitMQ.Client/docs/specs/autogenerated-api-0-8.cs @@ -185,6 +185,16 @@ namespace RabbitMQ.Client.Framing.v0_8 { result.ReadArgumentsFrom(new RabbitMQ.Client.Impl.MethodArgumentReader(reader)); return result; } + case 50: { + RabbitMQ.Client.Framing.Impl.v0_8.QueueUnbind result = new RabbitMQ.Client.Framing.Impl.v0_8.QueueUnbind(); + result.ReadArgumentsFrom(new RabbitMQ.Client.Impl.MethodArgumentReader(reader)); + return result; + } + case 51: { + RabbitMQ.Client.Framing.Impl.v0_8.QueueUnbindOk result = new RabbitMQ.Client.Framing.Impl.v0_8.QueueUnbindOk(); + result.ReadArgumentsFrom(new RabbitMQ.Client.Impl.MethodArgumentReader(reader)); + return result; + } case 30: { RabbitMQ.Client.Framing.Impl.v0_8.QueuePurge result = new RabbitMQ.Client.Framing.Impl.v0_8.QueuePurge(); result.ReadArgumentsFrom(new RabbitMQ.Client.Impl.MethodArgumentReader(reader)); @@ -1367,6 +1377,41 @@ namespace RabbitMQ.Client.Framing.v0_8 { /// public interface IQueueBindOk: IMethod { } + /// Autogenerated type. AMQP specification method "queue.unbind". + /// + /// This method unbinds a queue from an exchange. + /// + public interface IQueueUnbind: IMethod { + /// + /// + /// The client provides a valid access ticket giving "active" + /// access rights to the queue's access realm. + /// + /// + ushort Ticket { get; } + /// + /// Specifies the name of the queue to unbind. + /// + string Queue { get; } + /// + /// The name of the exchange to unbind from. + /// + string Exchange { get; } + /// + /// Specifies the routing key of the binding to unbind. + /// + string RoutingKey { get; } + /// + /// Specifies the arguments of the binding to unbind. + /// + System.Collections.IDictionary Arguments { get; } + } + /// Autogenerated type. AMQP specification method "queue.unbind-ok". + /// + /// This method confirms that the unbind was successful. + /// + public interface IQueueUnbindOk: IMethod { + } /// Autogenerated type. AMQP specification method "queue.purge". /// /// @@ -4908,6 +4953,97 @@ namespace RabbitMQ.Client.Framing.Impl.v0_8 { } } /// Autogenerated type. Private implementation class - do not use directly. + public class QueueUnbind: RabbitMQ.Client.Impl.MethodBase, IQueueUnbind { + public const int ClassId = 50; + public const int MethodId = 50; + + public ushort m_ticket; + public string m_queue; + public string m_exchange; + public string m_routingKey; + public System.Collections.IDictionary m_arguments; + + ushort IQueueUnbind.Ticket { get { return m_ticket; } } + string IQueueUnbind.Queue { get { return m_queue; } } + string IQueueUnbind.Exchange { get { return m_exchange; } } + string IQueueUnbind.RoutingKey { get { return m_routingKey; } } + System.Collections.IDictionary IQueueUnbind.Arguments { get { return m_arguments; } } + + public QueueUnbind() {} + public QueueUnbind( + ushort initTicket, + string initQueue, + string initExchange, + string initRoutingKey, + System.Collections.IDictionary initArguments) + { + m_ticket = initTicket; + m_queue = initQueue; + m_exchange = initExchange; + m_routingKey = initRoutingKey; + m_arguments = initArguments; + } + + public override int ProtocolClassId { get { return 50; } } + public override int ProtocolMethodId { get { return 50; } } + public override string ProtocolMethodName { get { return "queue.unbind"; } } + public override bool HasContent { get { return false; } } + + public override void ReadArgumentsFrom(RabbitMQ.Client.Impl.MethodArgumentReader reader) { + m_ticket = reader.ReadShort(); + m_queue = reader.ReadShortstr(); + m_exchange = reader.ReadShortstr(); + m_routingKey = reader.ReadShortstr(); + m_arguments = reader.ReadTable(); + } + + public override void WriteArgumentsTo(RabbitMQ.Client.Impl.MethodArgumentWriter writer) { + writer.WriteShort(m_ticket); + writer.WriteShortstr(m_queue); + writer.WriteShortstr(m_exchange); + writer.WriteShortstr(m_routingKey); + writer.WriteTable(m_arguments); + } + + public override void AppendArgumentDebugStringTo(System.Text.StringBuilder sb) { + sb.Append("("); + sb.Append(m_ticket); sb.Append(","); + sb.Append(m_queue); sb.Append(","); + sb.Append(m_exchange); sb.Append(","); + sb.Append(m_routingKey); sb.Append(","); + sb.Append(m_arguments); + sb.Append(")"); + } + } + /// Autogenerated type. Private implementation class - do not use directly. + public class QueueUnbindOk: RabbitMQ.Client.Impl.MethodBase, IQueueUnbindOk { + public const int ClassId = 50; + public const int MethodId = 51; + + + + public QueueUnbindOk( +) + { + } + + public override int ProtocolClassId { get { return 50; } } + public override int ProtocolMethodId { get { return 51; } } + public override string ProtocolMethodName { get { return "queue.unbind-ok"; } } + public override bool HasContent { get { return false; } } + + public override void ReadArgumentsFrom(RabbitMQ.Client.Impl.MethodArgumentReader reader) { + } + + public override void WriteArgumentsTo(RabbitMQ.Client.Impl.MethodArgumentWriter writer) { + } + + public override void AppendArgumentDebugStringTo(System.Text.StringBuilder sb) { + sb.Append("("); + sb.Append(")"); + } + } + /// Autogenerated type. Private implementation class - do not use directly. public class QueuePurge: RabbitMQ.Client.Impl.MethodBase, IQueuePurge { public const int ClassId = 50; public const int MethodId = 30; @@ -7556,28 +7692,7 @@ namespace RabbitMQ.Client.Framing.Impl.v0_8 { public class Model: RabbitMQ.Client.Impl.ModelBase { public Model(RabbitMQ.Client.Impl.ISession session): base(session) {} - public override System.UInt16 _Private_AccessRequest( - System.String @realm, - System.Boolean @exclusive, - System.Boolean @passive, - System.Boolean @active, - System.Boolean @write, - System.Boolean @read) - { - AccessRequest __req = new AccessRequest(); - __req.m_realm = @realm; - __req.m_exclusive = @exclusive; - __req.m_passive = @passive; - __req.m_active = @active; - __req.m_write = @write; - __req.m_read = @read; - RabbitMQ.Client.Impl.MethodBase __repBase = ModelRpc(__req,null,null); - AccessRequestOk __rep = __repBase as AccessRequestOk; - if (__rep == null) throw new UnexpectedMethodException(__repBase); - return __rep.m_ticket; - } public override void _Private_BasicPublish( - System.UInt16 @ticket, System.String @exchange, System.String @routingKey, System.Boolean @mandatory, @@ -7586,7 +7701,6 @@ namespace RabbitMQ.Client.Framing.Impl.v0_8 { System.Byte[] @body) { BasicPublish __req = new BasicPublish(); - __req.m_ticket = @ticket; __req.m_exchange = @exchange; __req.m_routingKey = @routingKey; __req.m_mandatory = @mandatory; @@ -7594,7 +7708,6 @@ namespace RabbitMQ.Client.Framing.Impl.v0_8 { ModelSend(__req, (BasicProperties) basicProperties,body); } public override void _Private_BasicConsume( - System.UInt16 @ticket, System.String @queue, System.String @consumerTag, System.Boolean @noLocal, @@ -7604,7 +7717,6 @@ namespace RabbitMQ.Client.Framing.Impl.v0_8 { System.Collections.IDictionary @filter) { BasicConsume __req = new BasicConsume(); - __req.m_ticket = @ticket; __req.m_queue = @queue; __req.m_consumerTag = @consumerTag; __req.m_noLocal = @noLocal; @@ -7653,16 +7765,19 @@ namespace RabbitMQ.Client.Framing.Impl.v0_8 { ModelSend(__req,null,null); } public override void _Private_BasicGet( - System.UInt16 @ticket, System.String @queue, System.Boolean @noAck) { BasicGet __req = new BasicGet(); - __req.m_ticket = @ticket; __req.m_queue = @queue; __req.m_noAck = @noAck; ModelSend(__req,null,null); } + public override void _Private_ChannelFlowOk() + { + ChannelFlowOk __req = new ChannelFlowOk(); + ModelSend(__req,null,null); + } public override RabbitMQ.Client.Impl.ConnectionTuneDetails ConnectionStartOk( System.Collections.IDictionary @clientProperties, System.String @mechanism, @@ -7747,7 +7862,6 @@ namespace RabbitMQ.Client.Framing.Impl.v0_8 { if (__rep == null) throw new UnexpectedMethodException(__repBase); } public override void ExchangeDeclare( - System.UInt16 @ticket, System.String @exchange, System.String @type, System.Boolean @passive, @@ -7758,7 +7872,6 @@ namespace RabbitMQ.Client.Framing.Impl.v0_8 { System.Collections.IDictionary @arguments) { ExchangeDeclare __req = new ExchangeDeclare(); - __req.m_ticket = @ticket; __req.m_exchange = @exchange; __req.m_type = @type; __req.m_passive = @passive; @@ -7775,13 +7888,11 @@ namespace RabbitMQ.Client.Framing.Impl.v0_8 { if (__rep == null) throw new UnexpectedMethodException(__repBase); } public override void ExchangeDelete( - System.UInt16 @ticket, System.String @exchange, System.Boolean @ifUnused, System.Boolean @nowait) { ExchangeDelete __req = new ExchangeDelete(); - __req.m_ticket = @ticket; __req.m_exchange = @exchange; __req.m_ifUnused = @ifUnused; __req.m_nowait = @nowait; @@ -7793,7 +7904,6 @@ namespace RabbitMQ.Client.Framing.Impl.v0_8 { if (__rep == null) throw new UnexpectedMethodException(__repBase); } public override System.String QueueDeclare( - System.UInt16 @ticket, System.String @queue, System.Boolean @passive, System.Boolean @durable, @@ -7803,7 +7913,6 @@ namespace RabbitMQ.Client.Framing.Impl.v0_8 { System.Collections.IDictionary @arguments) { QueueDeclare __req = new QueueDeclare(); - __req.m_ticket = @ticket; __req.m_queue = @queue; __req.m_passive = @passive; __req.m_durable = @durable; @@ -7821,7 +7930,6 @@ namespace RabbitMQ.Client.Framing.Impl.v0_8 { return __rep.m_queue; } public override void QueueBind( - System.UInt16 @ticket, System.String @queue, System.String @exchange, System.String @routingKey, @@ -7829,7 +7937,6 @@ namespace RabbitMQ.Client.Framing.Impl.v0_8 { System.Collections.IDictionary @arguments) { QueueBind __req = new QueueBind(); - __req.m_ticket = @ticket; __req.m_queue = @queue; __req.m_exchange = @exchange; __req.m_routingKey = @routingKey; @@ -7843,21 +7950,25 @@ namespace RabbitMQ.Client.Framing.Impl.v0_8 { if (__rep == null) throw new UnexpectedMethodException(__repBase); } public override void QueueUnbind( - System.UInt16 @ticket, System.String @queue, System.String @exchange, System.String @routingKey, System.Collections.IDictionary @arguments) { - throw new UnsupportedMethodException("QueueUnbind"); + QueueUnbind __req = new QueueUnbind(); + __req.m_queue = @queue; + __req.m_exchange = @exchange; + __req.m_routingKey = @routingKey; + __req.m_arguments = @arguments; + RabbitMQ.Client.Impl.MethodBase __repBase = ModelRpc(__req,null,null); + QueueUnbindOk __rep = __repBase as QueueUnbindOk; + if (__rep == null) throw new UnexpectedMethodException(__repBase); } public override System.UInt32 QueuePurge( - System.UInt16 @ticket, System.String @queue, System.Boolean @nowait) { QueuePurge __req = new QueuePurge(); - __req.m_ticket = @ticket; __req.m_queue = @queue; __req.m_nowait = @nowait; if (nowait) { @@ -7870,14 +7981,12 @@ namespace RabbitMQ.Client.Framing.Impl.v0_8 { return __rep.m_messageCount; } public override System.UInt32 QueueDelete( - System.UInt16 @ticket, System.String @queue, System.Boolean @ifUnused, System.Boolean @ifEmpty, System.Boolean @nowait) { QueueDelete __req = new QueueDelete(); - __req.m_ticket = @ticket; __req.m_queue = @queue; __req.m_ifUnused = @ifUnused; __req.m_ifEmpty = @ifEmpty; @@ -8020,6 +8129,12 @@ namespace RabbitMQ.Client.Framing.Impl.v0_8 { cmd.Body); return true; } + case 1310740: { + ChannelFlow __impl = (ChannelFlow) __method; + HandleChannelFlow( + __impl.m_active); + return true; + } case 1310760: { ChannelClose __impl = (ChannelClose) __method; HandleChannelClose( diff --git a/mcs/class/RabbitMQ.Client/docs/specs/autogenerated-api-0-9.cs b/mcs/class/RabbitMQ.Client/docs/specs/autogenerated-api-0-9.cs index d42c0f8c30d..5b6bd1d24c6 100644 --- a/mcs/class/RabbitMQ.Client/docs/specs/autogenerated-api-0-9.cs +++ b/mcs/class/RabbitMQ.Client/docs/specs/autogenerated-api-0-9.cs @@ -8381,28 +8381,7 @@ namespace RabbitMQ.Client.Framing.Impl.v0_9 { public class Model: RabbitMQ.Client.Impl.ModelBase { public Model(RabbitMQ.Client.Impl.ISession session): base(session) {} - public override System.UInt16 _Private_AccessRequest( - System.String @realm, - System.Boolean @exclusive, - System.Boolean @passive, - System.Boolean @active, - System.Boolean @write, - System.Boolean @read) - { - AccessRequest __req = new AccessRequest(); - __req.m_realm = @realm; - __req.m_exclusive = @exclusive; - __req.m_passive = @passive; - __req.m_active = @active; - __req.m_write = @write; - __req.m_read = @read; - RabbitMQ.Client.Impl.MethodBase __repBase = ModelRpc(__req,null,null); - AccessRequestOk __rep = __repBase as AccessRequestOk; - if (__rep == null) throw new UnexpectedMethodException(__repBase); - return __rep.m_ticket; - } public override void _Private_BasicPublish( - System.UInt16 @ticket, System.String @exchange, System.String @routingKey, System.Boolean @mandatory, @@ -8411,7 +8390,6 @@ namespace RabbitMQ.Client.Framing.Impl.v0_9 { System.Byte[] @body) { BasicPublish __req = new BasicPublish(); - __req.m_ticket = @ticket; __req.m_exchange = @exchange; __req.m_routingKey = @routingKey; __req.m_mandatory = @mandatory; @@ -8419,7 +8397,6 @@ namespace RabbitMQ.Client.Framing.Impl.v0_9 { ModelSend(__req, (BasicProperties) basicProperties,body); } public override void _Private_BasicConsume( - System.UInt16 @ticket, System.String @queue, System.String @consumerTag, System.Boolean @noLocal, @@ -8429,7 +8406,6 @@ namespace RabbitMQ.Client.Framing.Impl.v0_9 { System.Collections.IDictionary @filter) { BasicConsume __req = new BasicConsume(); - __req.m_ticket = @ticket; __req.m_queue = @queue; __req.m_consumerTag = @consumerTag; __req.m_noLocal = @noLocal; @@ -8476,16 +8452,19 @@ namespace RabbitMQ.Client.Framing.Impl.v0_9 { ModelSend(__req,null,null); } public override void _Private_BasicGet( - System.UInt16 @ticket, System.String @queue, System.Boolean @noAck) { BasicGet __req = new BasicGet(); - __req.m_ticket = @ticket; __req.m_queue = @queue; __req.m_noAck = @noAck; ModelSend(__req,null,null); } + public override void _Private_ChannelFlowOk() + { + ChannelFlowOk __req = new ChannelFlowOk(); + ModelSend(__req,null,null); + } public override RabbitMQ.Client.Impl.ConnectionTuneDetails ConnectionStartOk( System.Collections.IDictionary @clientProperties, System.String @mechanism, @@ -8570,7 +8549,6 @@ namespace RabbitMQ.Client.Framing.Impl.v0_9 { if (__rep == null) throw new UnexpectedMethodException(__repBase); } public override void ExchangeDeclare( - System.UInt16 @ticket, System.String @exchange, System.String @type, System.Boolean @passive, @@ -8581,7 +8559,6 @@ namespace RabbitMQ.Client.Framing.Impl.v0_9 { System.Collections.IDictionary @arguments) { ExchangeDeclare __req = new ExchangeDeclare(); - __req.m_ticket = @ticket; __req.m_exchange = @exchange; __req.m_type = @type; __req.m_passive = @passive; @@ -8598,13 +8575,11 @@ namespace RabbitMQ.Client.Framing.Impl.v0_9 { if (__rep == null) throw new UnexpectedMethodException(__repBase); } public override void ExchangeDelete( - System.UInt16 @ticket, System.String @exchange, System.Boolean @ifUnused, System.Boolean @nowait) { ExchangeDelete __req = new ExchangeDelete(); - __req.m_ticket = @ticket; __req.m_exchange = @exchange; __req.m_ifUnused = @ifUnused; __req.m_nowait = @nowait; @@ -8616,7 +8591,6 @@ namespace RabbitMQ.Client.Framing.Impl.v0_9 { if (__rep == null) throw new UnexpectedMethodException(__repBase); } public override System.String QueueDeclare( - System.UInt16 @ticket, System.String @queue, System.Boolean @passive, System.Boolean @durable, @@ -8626,7 +8600,6 @@ namespace RabbitMQ.Client.Framing.Impl.v0_9 { System.Collections.IDictionary @arguments) { QueueDeclare __req = new QueueDeclare(); - __req.m_ticket = @ticket; __req.m_queue = @queue; __req.m_passive = @passive; __req.m_durable = @durable; @@ -8644,7 +8617,6 @@ namespace RabbitMQ.Client.Framing.Impl.v0_9 { return __rep.m_queue; } public override void QueueBind( - System.UInt16 @ticket, System.String @queue, System.String @exchange, System.String @routingKey, @@ -8652,7 +8624,6 @@ namespace RabbitMQ.Client.Framing.Impl.v0_9 { System.Collections.IDictionary @arguments) { QueueBind __req = new QueueBind(); - __req.m_ticket = @ticket; __req.m_queue = @queue; __req.m_exchange = @exchange; __req.m_routingKey = @routingKey; @@ -8666,14 +8637,12 @@ namespace RabbitMQ.Client.Framing.Impl.v0_9 { if (__rep == null) throw new UnexpectedMethodException(__repBase); } public override void QueueUnbind( - System.UInt16 @ticket, System.String @queue, System.String @exchange, System.String @routingKey, System.Collections.IDictionary @arguments) { QueueUnbind __req = new QueueUnbind(); - __req.m_ticket = @ticket; __req.m_queue = @queue; __req.m_exchange = @exchange; __req.m_routingKey = @routingKey; @@ -8683,12 +8652,10 @@ namespace RabbitMQ.Client.Framing.Impl.v0_9 { if (__rep == null) throw new UnexpectedMethodException(__repBase); } public override System.UInt32 QueuePurge( - System.UInt16 @ticket, System.String @queue, System.Boolean @nowait) { QueuePurge __req = new QueuePurge(); - __req.m_ticket = @ticket; __req.m_queue = @queue; __req.m_nowait = @nowait; if (nowait) { @@ -8701,14 +8668,12 @@ namespace RabbitMQ.Client.Framing.Impl.v0_9 { return __rep.m_messageCount; } public override System.UInt32 QueueDelete( - System.UInt16 @ticket, System.String @queue, System.Boolean @ifUnused, System.Boolean @ifEmpty, System.Boolean @nowait) { QueueDelete __req = new QueueDelete(); - __req.m_ticket = @ticket; __req.m_queue = @queue; __req.m_ifUnused = @ifUnused; __req.m_ifEmpty = @ifEmpty; @@ -8851,6 +8816,12 @@ namespace RabbitMQ.Client.Framing.Impl.v0_9 { cmd.Body); return true; } + case 1310740: { + ChannelFlow __impl = (ChannelFlow) __method; + HandleChannelFlow( + __impl.m_active); + return true; + } case 1310760: { ChannelClose __impl = (ChannelClose) __method; HandleChannelClose( diff --git a/mcs/class/RabbitMQ.Client/docs/specs/autogenerated-api-qpid-0-8.cs b/mcs/class/RabbitMQ.Client/docs/specs/autogenerated-api-qpid-0-8.cs index d02cdbcc000..75302f3eac3 100644 --- a/mcs/class/RabbitMQ.Client/docs/specs/autogenerated-api-qpid-0-8.cs +++ b/mcs/class/RabbitMQ.Client/docs/specs/autogenerated-api-qpid-0-8.cs @@ -7738,28 +7738,7 @@ namespace RabbitMQ.Client.Framing.Impl.v0_8qpid { public class Model: RabbitMQ.Client.Impl.ModelBase { public Model(RabbitMQ.Client.Impl.ISession session): base(session) {} - public override System.UInt16 _Private_AccessRequest( - System.String @realm, - System.Boolean @exclusive, - System.Boolean @passive, - System.Boolean @active, - System.Boolean @write, - System.Boolean @read) - { - AccessRequest __req = new AccessRequest(); - __req.m_realm = @realm; - __req.m_exclusive = @exclusive; - __req.m_passive = @passive; - __req.m_active = @active; - __req.m_write = @write; - __req.m_read = @read; - RabbitMQ.Client.Impl.MethodBase __repBase = ModelRpc(__req,null,null); - AccessRequestOk __rep = __repBase as AccessRequestOk; - if (__rep == null) throw new UnexpectedMethodException(__repBase); - return __rep.m_ticket; - } public override void _Private_BasicPublish( - System.UInt16 @ticket, System.String @exchange, System.String @routingKey, System.Boolean @mandatory, @@ -7768,7 +7747,6 @@ namespace RabbitMQ.Client.Framing.Impl.v0_8qpid { System.Byte[] @body) { BasicPublish __req = new BasicPublish(); - __req.m_ticket = @ticket; __req.m_exchange = @exchange; __req.m_routingKey = @routingKey; __req.m_mandatory = @mandatory; @@ -7776,7 +7754,6 @@ namespace RabbitMQ.Client.Framing.Impl.v0_8qpid { ModelSend(__req, (BasicProperties) basicProperties,body); } public override void _Private_BasicConsume( - System.UInt16 @ticket, System.String @queue, System.String @consumerTag, System.Boolean @noLocal, @@ -7786,7 +7763,6 @@ namespace RabbitMQ.Client.Framing.Impl.v0_8qpid { System.Collections.IDictionary @filter) { BasicConsume __req = new BasicConsume(); - __req.m_ticket = @ticket; __req.m_queue = @queue; __req.m_consumerTag = @consumerTag; __req.m_noLocal = @noLocal; @@ -7833,16 +7809,19 @@ namespace RabbitMQ.Client.Framing.Impl.v0_8qpid { ModelSend(__req,null,null); } public override void _Private_BasicGet( - System.UInt16 @ticket, System.String @queue, System.Boolean @noAck) { BasicGet __req = new BasicGet(); - __req.m_ticket = @ticket; __req.m_queue = @queue; __req.m_noAck = @noAck; ModelSend(__req,null,null); } + public override void _Private_ChannelFlowOk() + { + ChannelFlowOk __req = new ChannelFlowOk(); + ModelSend(__req,null,null); + } public override RabbitMQ.Client.Impl.ConnectionTuneDetails ConnectionStartOk( System.Collections.IDictionary @clientProperties, System.String @mechanism, @@ -7927,7 +7906,6 @@ namespace RabbitMQ.Client.Framing.Impl.v0_8qpid { if (__rep == null) throw new UnexpectedMethodException(__repBase); } public override void ExchangeDeclare( - System.UInt16 @ticket, System.String @exchange, System.String @type, System.Boolean @passive, @@ -7938,7 +7916,6 @@ namespace RabbitMQ.Client.Framing.Impl.v0_8qpid { System.Collections.IDictionary @arguments) { ExchangeDeclare __req = new ExchangeDeclare(); - __req.m_ticket = @ticket; __req.m_exchange = @exchange; __req.m_type = @type; __req.m_passive = @passive; @@ -7955,13 +7932,11 @@ namespace RabbitMQ.Client.Framing.Impl.v0_8qpid { if (__rep == null) throw new UnexpectedMethodException(__repBase); } public override void ExchangeDelete( - System.UInt16 @ticket, System.String @exchange, System.Boolean @ifUnused, System.Boolean @nowait) { ExchangeDelete __req = new ExchangeDelete(); - __req.m_ticket = @ticket; __req.m_exchange = @exchange; __req.m_ifUnused = @ifUnused; __req.m_nowait = @nowait; @@ -7973,7 +7948,6 @@ namespace RabbitMQ.Client.Framing.Impl.v0_8qpid { if (__rep == null) throw new UnexpectedMethodException(__repBase); } public override System.String QueueDeclare( - System.UInt16 @ticket, System.String @queue, System.Boolean @passive, System.Boolean @durable, @@ -7983,7 +7957,6 @@ namespace RabbitMQ.Client.Framing.Impl.v0_8qpid { System.Collections.IDictionary @arguments) { QueueDeclare __req = new QueueDeclare(); - __req.m_ticket = @ticket; __req.m_queue = @queue; __req.m_passive = @passive; __req.m_durable = @durable; @@ -8001,7 +7974,6 @@ namespace RabbitMQ.Client.Framing.Impl.v0_8qpid { return __rep.m_queue; } public override void QueueBind( - System.UInt16 @ticket, System.String @queue, System.String @exchange, System.String @routingKey, @@ -8009,7 +7981,6 @@ namespace RabbitMQ.Client.Framing.Impl.v0_8qpid { System.Collections.IDictionary @arguments) { QueueBind __req = new QueueBind(); - __req.m_ticket = @ticket; __req.m_queue = @queue; __req.m_exchange = @exchange; __req.m_routingKey = @routingKey; @@ -8023,7 +7994,6 @@ namespace RabbitMQ.Client.Framing.Impl.v0_8qpid { if (__rep == null) throw new UnexpectedMethodException(__repBase); } public override void QueueUnbind( - System.UInt16 @ticket, System.String @queue, System.String @exchange, System.String @routingKey, @@ -8032,12 +8002,10 @@ namespace RabbitMQ.Client.Framing.Impl.v0_8qpid { throw new UnsupportedMethodException("QueueUnbind"); } public override System.UInt32 QueuePurge( - System.UInt16 @ticket, System.String @queue, System.Boolean @nowait) { QueuePurge __req = new QueuePurge(); - __req.m_ticket = @ticket; __req.m_queue = @queue; __req.m_nowait = @nowait; if (nowait) { @@ -8050,14 +8018,12 @@ namespace RabbitMQ.Client.Framing.Impl.v0_8qpid { return __rep.m_messageCount; } public override System.UInt32 QueueDelete( - System.UInt16 @ticket, System.String @queue, System.Boolean @ifUnused, System.Boolean @ifEmpty, System.Boolean @nowait) { QueueDelete __req = new QueueDelete(); - __req.m_ticket = @ticket; __req.m_queue = @queue; __req.m_ifUnused = @ifUnused; __req.m_ifEmpty = @ifEmpty; @@ -8202,6 +8168,12 @@ namespace RabbitMQ.Client.Framing.Impl.v0_8qpid { cmd.Body); return true; } + case 1310740: { + ChannelFlow __impl = (ChannelFlow) __method; + HandleChannelFlow( + __impl.m_active); + return true; + } case 1310760: { ChannelClose __impl = (ChannelClose) __method; HandleChannelClose( diff --git a/mcs/class/RabbitMQ.Client/src/apigen/AmqpClass.cs b/mcs/class/RabbitMQ.Client/src/apigen/AmqpClass.cs index d682f22d9fc..25a0406c008 100644 --- a/mcs/class/RabbitMQ.Client/src/apigen/AmqpClass.cs +++ b/mcs/class/RabbitMQ.Client/src/apigen/AmqpClass.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // diff --git a/mcs/class/RabbitMQ.Client/src/apigen/AmqpEntity.cs b/mcs/class/RabbitMQ.Client/src/apigen/AmqpEntity.cs index e1e9c952a19..174d00242a7 100644 --- a/mcs/class/RabbitMQ.Client/src/apigen/AmqpEntity.cs +++ b/mcs/class/RabbitMQ.Client/src/apigen/AmqpEntity.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // diff --git a/mcs/class/RabbitMQ.Client/src/apigen/AmqpField.cs b/mcs/class/RabbitMQ.Client/src/apigen/AmqpField.cs index 778dd3b7956..b69aef194c5 100644 --- a/mcs/class/RabbitMQ.Client/src/apigen/AmqpField.cs +++ b/mcs/class/RabbitMQ.Client/src/apigen/AmqpField.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // diff --git a/mcs/class/RabbitMQ.Client/src/apigen/AmqpMethod.cs b/mcs/class/RabbitMQ.Client/src/apigen/AmqpMethod.cs index f35c131acd3..0672eaee424 100644 --- a/mcs/class/RabbitMQ.Client/src/apigen/AmqpMethod.cs +++ b/mcs/class/RabbitMQ.Client/src/apigen/AmqpMethod.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // diff --git a/mcs/class/RabbitMQ.Client/src/apigen/Apigen.cs b/mcs/class/RabbitMQ.Client/src/apigen/Apigen.cs index 69ab87a6126..fe4715d715c 100644 --- a/mcs/class/RabbitMQ.Client/src/apigen/Apigen.cs +++ b/mcs/class/RabbitMQ.Client/src/apigen/Apigen.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // diff --git a/mcs/class/RabbitMQ.Client/src/apigen/Makefile b/mcs/class/RabbitMQ.Client/src/apigen/Makefile index 162e9b10b9e..9d5e49a3181 100644 --- a/mcs/class/RabbitMQ.Client/src/apigen/Makefile +++ b/mcs/class/RabbitMQ.Client/src/apigen/Makefile @@ -7,7 +7,6 @@ PROGRAM = RabbitMQ.Client.Apigen.exe LOCAL_MCS_FLAGS = /r:System.dll \ /r:System.Xml.dll \ - /r:apigen-bootstrap.dll \ /main:RabbitMQ.Client.Apigen.Apigen include ../../../../build/executable.make diff --git a/mcs/class/RabbitMQ.Client/src/bootstrap/Makefile b/mcs/class/RabbitMQ.Client/src/bootstrap/Makefile deleted file mode 100644 index 05c6e50e256..00000000000 --- a/mcs/class/RabbitMQ.Client/src/bootstrap/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -thisdir := class/RabbitMQ.Client/src/apigen -SUBDIRS = -include ../../../../build/rules.make - -LIBRARY = apigen-bootstrap.dll -LIB_MCS_FLAGS = /r:System.dll -NO_TEST = yes -NO_SIGN_ASSEMBLY = yes - -include ../../../../build/library.make diff --git a/mcs/class/RabbitMQ.Client/src/bootstrap/apigen-bootstrap.dll.sources b/mcs/class/RabbitMQ.Client/src/bootstrap/apigen-bootstrap.dll.sources deleted file mode 100644 index f55f71f8408..00000000000 --- a/mcs/class/RabbitMQ.Client/src/bootstrap/apigen-bootstrap.dll.sources +++ /dev/null @@ -1,15 +0,0 @@ -../client/api/IModel.cs -../client/api/IContentHeader.cs -../client/api/IBasicProperties.cs -../client/api/IFileProperties.cs -../client/api/IStreamProperties.cs -../client/api/AmqpTimestamp.cs -../client/api/IBasicConsumer.cs -../client/api/ShutdownEventArgs.cs -../client/api/ShutdownInitiator.cs -../client/api/PublicationAddress.cs -../client/events/BasicReturnEventArgs.cs -../client/events/BasicReturnEventHandler.cs -../client/events/CallbackExceptionEventArgs.cs -../client/events/CallbackExceptionEventHandler.cs -../client/events/ModelShutdownEventHandler.cs diff --git a/mcs/class/RabbitMQ.Client/src/client/RabbitMQ.Client.dll.sources b/mcs/class/RabbitMQ.Client/src/client/RabbitMQ.Client.dll.sources index 18936d47a38..2f4ed36868d 100644 --- a/mcs/class/RabbitMQ.Client/src/client/RabbitMQ.Client.dll.sources +++ b/mcs/class/RabbitMQ.Client/src/client/RabbitMQ.Client.dll.sources @@ -107,16 +107,12 @@ ./api/AmqpVersion.cs ./api/IBasicConsumer.cs ./api/IConnection.cs -./api/AccessRequestConfig.cs ./api/ShutdownInitiator.cs ./api/IModel.cs ./api/ConnectionFactory.cs ./api/IStreamProperties.cs ./api/IBasicProperties.cs ./api/ShutdownEventArgs.cs -../../docs/specs/autogenerated-api-0-9.cs -../../docs/specs/autogenerated-api-0-8.cs -../../docs/specs/autogenerated-api-qpid-0-8.cs ../util/DebugUtil.cs ../util/NetworkBinaryReader.cs ../util/NetworkBinaryWriter.cs @@ -125,3 +121,6 @@ ../util/Either.cs ../util/SharedQueue.cs ../util/XmlUtil.cs +../../docs/specs/autogenerated-api-0-9.cs +../../docs/specs/autogenerated-api-0-8.cs +../../docs/specs/autogenerated-api-qpid-0-8.cs diff --git a/mcs/class/RabbitMQ.Client/src/client/api/AmqpTcpEndpoint.cs b/mcs/class/RabbitMQ.Client/src/client/api/AmqpTcpEndpoint.cs index d64ddb5cf70..197bf686af6 100644 --- a/mcs/class/RabbitMQ.Client/src/client/api/AmqpTcpEndpoint.cs +++ b/mcs/class/RabbitMQ.Client/src/client/api/AmqpTcpEndpoint.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // diff --git a/mcs/class/RabbitMQ.Client/src/client/api/AmqpTimestamp.cs b/mcs/class/RabbitMQ.Client/src/client/api/AmqpTimestamp.cs index 0b3d56beda4..0b930f5aba1 100644 --- a/mcs/class/RabbitMQ.Client/src/client/api/AmqpTimestamp.cs +++ b/mcs/class/RabbitMQ.Client/src/client/api/AmqpTimestamp.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // diff --git a/mcs/class/RabbitMQ.Client/src/client/api/AmqpVersion.cs b/mcs/class/RabbitMQ.Client/src/client/api/AmqpVersion.cs index c89e1f9f39a..77ae1801be1 100644 --- a/mcs/class/RabbitMQ.Client/src/client/api/AmqpVersion.cs +++ b/mcs/class/RabbitMQ.Client/src/client/api/AmqpVersion.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // diff --git a/mcs/class/RabbitMQ.Client/src/client/api/BinaryTableValue.cs b/mcs/class/RabbitMQ.Client/src/client/api/BinaryTableValue.cs index de2336ce3c8..00ff7ff69d8 100644 --- a/mcs/class/RabbitMQ.Client/src/client/api/BinaryTableValue.cs +++ b/mcs/class/RabbitMQ.Client/src/client/api/BinaryTableValue.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // diff --git a/mcs/class/RabbitMQ.Client/src/client/api/ConnectionFactory.cs b/mcs/class/RabbitMQ.Client/src/client/api/ConnectionFactory.cs index 701cb4a502a..1500f8f7c37 100644 --- a/mcs/class/RabbitMQ.Client/src/client/api/ConnectionFactory.cs +++ b/mcs/class/RabbitMQ.Client/src/client/api/ConnectionFactory.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // @@ -77,7 +83,6 @@ namespace RabbitMQ.Client /// IConnection conn = factory.CreateConnection(protocol, hostName, portNumber); /// // /// IModel ch = conn.CreateModel(); - /// ushort ticket = ch.AccessRequest("/data"); /// // /// // ... use ch's IModel methods ... /// // diff --git a/mcs/class/RabbitMQ.Client/src/client/api/ConnectionParameters.cs b/mcs/class/RabbitMQ.Client/src/client/api/ConnectionParameters.cs index be969b4d395..ab7cff95024 100644 --- a/mcs/class/RabbitMQ.Client/src/client/api/ConnectionParameters.cs +++ b/mcs/class/RabbitMQ.Client/src/client/api/ConnectionParameters.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // @@ -83,7 +89,6 @@ namespace RabbitMQ.Client private ushort m_requestedChannelMax = DefaultChannelMax; private uint m_requestedFrameMax = DefaultFrameMax; private ushort m_requestedHeartbeat = DefaultHeartbeat; - private AccessRequestConfig m_accessRequestConfig = AccessRequestConfig.UseDefault; ///Construct a fresh instance, with all fields set to ///their respective defaults. @@ -131,15 +136,6 @@ namespace RabbitMQ.Client set { m_requestedHeartbeat = value; } } - /// Used to control whether Access.Request methods - /// are sent to the peer or not, in conjunction with the - /// protocol default. - public AccessRequestConfig AccessRequestConfig - { - get { return m_accessRequestConfig; } - set { m_accessRequestConfig = value; } - } - ///Implement ICloneable.Clone by delegating to our type-safe variant. object ICloneable.Clone() { diff --git a/mcs/class/RabbitMQ.Client/src/client/api/DefaultBasicConsumer.cs b/mcs/class/RabbitMQ.Client/src/client/api/DefaultBasicConsumer.cs index a2ed68733f9..74ab8ca8a94 100644 --- a/mcs/class/RabbitMQ.Client/src/client/api/DefaultBasicConsumer.cs +++ b/mcs/class/RabbitMQ.Client/src/client/api/DefaultBasicConsumer.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // diff --git a/mcs/class/RabbitMQ.Client/src/client/api/ExchangeType.cs b/mcs/class/RabbitMQ.Client/src/client/api/ExchangeType.cs index 756225b22dd..4422beaf772 100644 --- a/mcs/class/RabbitMQ.Client/src/client/api/ExchangeType.cs +++ b/mcs/class/RabbitMQ.Client/src/client/api/ExchangeType.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // diff --git a/mcs/class/RabbitMQ.Client/src/client/api/IBasicConsumer.cs b/mcs/class/RabbitMQ.Client/src/client/api/IBasicConsumer.cs index c85afed0c15..2be582a6e11 100644 --- a/mcs/class/RabbitMQ.Client/src/client/api/IBasicConsumer.cs +++ b/mcs/class/RabbitMQ.Client/src/client/api/IBasicConsumer.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // diff --git a/mcs/class/RabbitMQ.Client/src/client/api/IBasicProperties.cs b/mcs/class/RabbitMQ.Client/src/client/api/IBasicProperties.cs index cbd6f5601cc..1784c0f02ed 100644 --- a/mcs/class/RabbitMQ.Client/src/client/api/IBasicProperties.cs +++ b/mcs/class/RabbitMQ.Client/src/client/api/IBasicProperties.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // diff --git a/mcs/class/RabbitMQ.Client/src/client/api/IConnection.cs b/mcs/class/RabbitMQ.Client/src/client/api/IConnection.cs index 482f0ca6857..981f996aadf 100644 --- a/mcs/class/RabbitMQ.Client/src/client/api/IConnection.cs +++ b/mcs/class/RabbitMQ.Client/src/client/api/IConnection.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // @@ -169,6 +175,20 @@ namespace RabbitMQ.Client /// void Close(); + ///Close this connection and all its channels. + /// + ///The method behaves in the same way as Close(), with the only + ///difference that the connection is closed with the given connection + ///close code and message. + /// + ///The close code (See under "Reply Codes" in the AMQP specification) + /// + /// + ///A message indicating the reason for closing the connection + /// + /// + void Close(ushort reasonCode, string reasonText); + ///Close this connection and all its channels ///and wait with a timeout for all the in-progress close operations ///to complete. @@ -189,6 +209,23 @@ namespace RabbitMQ.Client /// void Close(int timeout); + ///Close this connection and all its channels + ///and wait with a timeout for all the in-progress close operations + ///to complete. + /// + /// + ///The method behaves in the same way as Close(int timeout), with the only + ///difference that the connection is closed with the given connection + ///close code and message. + /// + ///The close code (See under "Reply Codes" in the AMQP specification) + /// + /// + ///A message indicating the reason for closing the connection + /// + /// + void Close(ushort reasonCode, string reasonText, int timeout); + ///Abort this connection and all its channels. /// ///Note that all active channels, sessions, and models will be @@ -200,10 +237,24 @@ namespace RabbitMQ.Client /// void Abort(); + ///Abort this connection and all its channels. + /// + ///The method behaves in the same way as Abort(), with the only + ///difference that the connection is closed with the given connection + ///close code and message. + /// + ///The close code (See under "Reply Codes" in the AMQP specification) + /// + /// + ///A message indicating the reason for closing the connection + /// + /// + void Abort(ushort reasonCode, string reasonText); + /// ///Abort this connection and all its channels and wait with a ///timeout for all the in-progress close operations to complete. - ///. + /// /// ///This method, behaves in a similar way as method Abort() with the ///only difference that it explictly specifies the timeout given @@ -217,6 +268,23 @@ namespace RabbitMQ.Client /// void Abort(int timeout); + /// + ///Abort this connection and all its channels and wait with a + ///timeout for all the in-progress close operations to complete. + /// + /// + ///The method behaves in the same way as Abort(timeout), with the only + ///difference that the connection is closed with the given connection + ///close code and message. + /// + ///The close code (See under "Reply Codes" in the AMQP specification) + /// + /// + ///A message indicating the reason for closing the connection + /// + /// + void Abort(ushort reasonCode, string reasonText, int timeout); + ///Returns the list of ShutdownReportEntry objects that ///contain information about any errors reported while closing the ///connection in the order they appeared diff --git a/mcs/class/RabbitMQ.Client/src/client/api/IContentHeader.cs b/mcs/class/RabbitMQ.Client/src/client/api/IContentHeader.cs index 15b95ca09dd..d301e456e43 100644 --- a/mcs/class/RabbitMQ.Client/src/client/api/IContentHeader.cs +++ b/mcs/class/RabbitMQ.Client/src/client/api/IContentHeader.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // diff --git a/mcs/class/RabbitMQ.Client/src/client/api/IFileProperties.cs b/mcs/class/RabbitMQ.Client/src/client/api/IFileProperties.cs index e2292d05ce7..ea7132b6b2f 100644 --- a/mcs/class/RabbitMQ.Client/src/client/api/IFileProperties.cs +++ b/mcs/class/RabbitMQ.Client/src/client/api/IFileProperties.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // diff --git a/mcs/class/RabbitMQ.Client/src/client/api/IMethod.cs b/mcs/class/RabbitMQ.Client/src/client/api/IMethod.cs index f48dc681f14..30d347106cb 100644 --- a/mcs/class/RabbitMQ.Client/src/client/api/IMethod.cs +++ b/mcs/class/RabbitMQ.Client/src/client/api/IMethod.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // diff --git a/mcs/class/RabbitMQ.Client/src/client/api/IModel.cs b/mcs/class/RabbitMQ.Client/src/client/api/IModel.cs index 33ed06f3122..32474899f64 100644 --- a/mcs/class/RabbitMQ.Client/src/client/api/IModel.cs +++ b/mcs/class/RabbitMQ.Client/src/client/api/IModel.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // @@ -118,34 +124,6 @@ namespace RabbitMQ.Client [return: AmqpFieldMapping(null, "active")] void ChannelFlow(bool active); - ///(Spec method) Convenience method, asking for - ///non-exclusive access to all capabilities within a - ///realm. - /// - ///If Access.Request is disabled, either through the IProtocol - ///default or through the AccessRequestConfig property of - ///ConnectionParameters, no request is sent to the peer and a - ///dummy ticket number is returned. - /// - [AmqpMethodDoNotImplement(null)] - ushort AccessRequest(string realm); - - ///(Spec method) Retrieve an access ticket - ///("capability") for a realm. - /// - ///If Access.Request is disabled, either through the IProtocol - ///default or through the AccessRequestConfig property of - ///ConnectionParameters, no request is sent to the peer and a - ///dummy ticket number is returned. - /// - [AmqpMethodDoNotImplement(null)] - ushort AccessRequest(string realm, - bool exclusive, - bool passive, - bool active, - bool write, - bool read); - ///(Spec method) Declare an exchange. /// ///The exchange is declared non-passive, non-autodelete, and @@ -153,7 +131,7 @@ namespace RabbitMQ.Client ///exercised. /// [AmqpMethodDoNotImplement(null)] - void ExchangeDeclare(ushort ticket, string exchange, string type, bool durable); + void ExchangeDeclare(string exchange, string type, bool durable); ///(Spec method) Declare an exchange. /// @@ -162,11 +140,10 @@ namespace RabbitMQ.Client ///exercised. /// [AmqpMethodDoNotImplement(null)] - void ExchangeDeclare(ushort ticket, string exchange, string type); + void ExchangeDeclare(string exchange, string type); ///(Spec method) Declare an exchange. - void ExchangeDeclare(ushort ticket, - string exchange, + void ExchangeDeclare(string exchange, string type, bool passive, bool durable, @@ -177,8 +154,7 @@ namespace RabbitMQ.Client IDictionary arguments); ///(Spec method) Delete an exchange. - void ExchangeDelete(ushort ticket, - string exchange, + void ExchangeDelete(string exchange, bool ifUnused, [AmqpNowaitArgument(null)] bool nowait); @@ -191,7 +167,7 @@ namespace RabbitMQ.Client ///name is the return value of this method. /// [AmqpMethodDoNotImplement(null)] - string QueueDeclare(ushort ticket); + string QueueDeclare(); ///(Spec method) Declare a queue. /// @@ -199,8 +175,7 @@ namespace RabbitMQ.Client ///non-exclusive, and non-autodelete, with no arguments. /// [AmqpMethodDoNotImplement(null)] - string QueueDeclare(ushort ticket, - string queue); + string QueueDeclare(string queue); ///(Spec method) Declare a queue. /// @@ -208,8 +183,7 @@ namespace RabbitMQ.Client ///non-autodelete, with no arguments. /// [AmqpMethodDoNotImplement(null)] - string QueueDeclare(ushort ticket, - string queue, + string QueueDeclare(string queue, bool durable); ///(Spec method) Declare a queue. @@ -217,8 +191,7 @@ namespace RabbitMQ.Client ///Returns the name of the queue that was declared. /// [return: AmqpFieldMapping(null, "queue")] - string QueueDeclare(ushort ticket, - string queue, + string QueueDeclare(string queue, bool passive, bool durable, bool exclusive, @@ -228,8 +201,7 @@ namespace RabbitMQ.Client IDictionary arguments); ///(Spec method) Bind a queue to an exchange. - void QueueBind(ushort ticket, - string queue, + void QueueBind(string queue, string exchange, string routingKey, [AmqpNowaitArgument(null)] @@ -239,12 +211,12 @@ namespace RabbitMQ.Client ///(Spec method) Unbind a queue from an exchange. /// ///Note: This operation is only supported when communicating - ///using AMQP protocol version 0-9. + ///using AMQP protocol version 0-9, or when communicating with + ///a 0-8 broker that has been enhanced with the unofficial + ///addition of a queue.unbind method. /// - [AmqpUnsupported("RabbitMQ.Client.Framing.v0_8")] [AmqpUnsupported("RabbitMQ.Client.Framing.v0_8qpid")] - void QueueUnbind(ushort ticket, - string queue, + void QueueUnbind(string queue, string exchange, string routingKey, IDictionary arguments); @@ -255,8 +227,7 @@ namespace RabbitMQ.Client ///specified, returns uint.MaxValue. /// [return: AmqpFieldMapping(null, "messageCount")] - uint QueuePurge(ushort ticket, - string queue, + uint QueuePurge(string queue, [AmqpNowaitArgument(null, "0xFFFFFFFF")] bool nowait); @@ -267,8 +238,7 @@ namespace RabbitMQ.Client ///uint.MaxValue. /// [return: AmqpFieldMapping(null, "messageCount")] - uint QueueDelete(ushort ticket, - string queue, + uint QueueDelete(string queue, bool ifUnused, bool ifEmpty, [AmqpNowaitArgument(null, "0xFFFFFFFF")] @@ -281,8 +251,7 @@ namespace RabbitMQ.Client ///noLocal=false and exclusive=false. /// [AmqpMethodDoNotImplement(null)] - string BasicConsume(ushort ticket, - string queue, + string BasicConsume(string queue, IDictionary filter, IBasicConsumer consumer); @@ -293,8 +262,7 @@ namespace RabbitMQ.Client ///noLocal=false and exclusive=false. /// [AmqpMethodDoNotImplement(null)] - string BasicConsume(ushort ticket, - string queue, + string BasicConsume(string queue, bool noAck, IDictionary filter, IBasicConsumer consumer); @@ -305,8 +273,7 @@ namespace RabbitMQ.Client ///noLocal=false and exclusive=false. /// [AmqpMethodDoNotImplement(null)] - string BasicConsume(ushort ticket, - string queue, + string BasicConsume(string queue, bool noAck, string consumerTag, IDictionary filter, @@ -314,8 +281,7 @@ namespace RabbitMQ.Client ///Start a Basic content-class consumer. [AmqpMethodDoNotImplement(null)] - string BasicConsume(ushort ticket, - string queue, + string BasicConsume(string queue, bool noAck, string consumerTag, bool noLocal, @@ -337,8 +303,7 @@ namespace RabbitMQ.Client ///The publication occurs with mandatory=false and immediate=false. /// [AmqpMethodDoNotImplement(null)] - void BasicPublish(ushort ticket, - PublicationAddress addr, + void BasicPublish(PublicationAddress addr, IBasicProperties basicProperties, byte[] body); @@ -347,8 +312,7 @@ namespace RabbitMQ.Client ///The publication occurs with mandatory=false and immediate=false. /// [AmqpMethodDoNotImplement(null)] - void BasicPublish(ushort ticket, - string exchange, + void BasicPublish(string exchange, string routingKey, IBasicProperties basicProperties, byte[] body); @@ -356,8 +320,7 @@ namespace RabbitMQ.Client ///(Spec method) Publish a message using the Basic ///content-class. [AmqpMethodDoNotImplement(null)] - void BasicPublish(ushort ticket, - string exchange, + void BasicPublish(string exchange, string routingKey, bool mandatory, bool immediate, @@ -380,8 +343,7 @@ namespace RabbitMQ.Client ///no messages are currently available. See also ///IModel.BasicAck. [AmqpMethodDoNotImplement(null)] - BasicGetResult BasicGet(ushort ticket, - string queue, + BasicGetResult BasicGet(string queue, bool noAck); ///(Spec method) Enable TX mode for this session. @@ -403,13 +365,55 @@ namespace RabbitMQ.Client ///Close this session. /// - /// If the session is already closed (or closing), then this - /// method does nothing but wait for the in-progress close - /// operation to complete. This method will not return to the - /// caller until the shutdown is complete. + ///If the session is already closed (or closing), then this + ///method does nothing but wait for the in-progress close + ///operation to complete. This method will not return to the + ///caller until the shutdown is complete. + /// + [AmqpMethodDoNotImplement(null)] + void Close(); + + ///Close this session. + /// + ///The method behaves in the same way as Close(), with the only + ///difference that the model is closed with the given model + ///close code and message. + /// + ///The close code (See under "Reply Codes" in the AMQP specification) + /// + /// + ///A message indicating the reason for closing the model + /// /// [AmqpMethodDoNotImplement(null)] void Close(ushort replyCode, string replyText); + + ///Abort this session. + /// + ///If the session is already closed (or closing), then this + ///method does nothing but wait for the in-progress close + ///operation to complete. This method will not return to the + ///caller until the shutdown is complete. + ///In comparison to normal Close() method, Abort() will not throw + ///AlreadyClosedException or IOException during closing model. + /// + [AmqpMethodDoNotImplement(null)] + void Abort(); + + ///Abort this session. + /// + ///The method behaves in the same way as Abort(), with the only + ///difference that the model is closed with the given model + ///close code and message. + /// + ///The close code (See under "Reply Codes" in the AMQP specification) + /// + /// + ///A message indicating the reason for closing the model + /// + /// + [AmqpMethodDoNotImplement(null)] + void Abort(ushort replyCode, string replyText); } ///Represents Basic.GetOk responses from the server. @@ -490,25 +494,11 @@ namespace RabbitMQ.Client.Impl /// public interface IFullModel : RabbitMQ.Client.IModel { - ///Used to send an Access.Request method. Called by - ///the public API after checking whether our peer's - ///implementation can actually handle access - ///requests. - [AmqpMethodMapping(null, "access", "request")] - [return: AmqpFieldMapping(null, "ticket")] - ushort _Private_AccessRequest(string realm, - bool exclusive, - bool passive, - bool active, - bool write, - bool read); - ///Used to send a Basic.Publish method. Called by the ///public publish method after potential null-reference issues ///have been rectified. [AmqpMethodMapping(null, "basic", "publish")] - void _Private_BasicPublish(ushort ticket, - string exchange, + void _Private_BasicPublish(string exchange, string routingKey, bool mandatory, bool immediate, @@ -522,8 +512,7 @@ namespace RabbitMQ.Client.Impl ///datastructures. [AmqpForceOneWay] [AmqpMethodMapping(null, "basic", "consume")] - void _Private_BasicConsume(ushort ticket, - string queue, + void _Private_BasicConsume(string queue, string consumerTag, bool noLocal, bool noAck, @@ -573,8 +562,7 @@ namespace RabbitMQ.Client.Impl ///required. [AmqpForceOneWay] [AmqpMethodMapping(null, "basic", "get")] - void _Private_BasicGet(ushort ticket, - string queue, + void _Private_BasicGet(string queue, bool noAck); ///Handle incoming Basic.GetOk methods. Routes the @@ -620,6 +608,15 @@ namespace RabbitMQ.Client.Impl IBasicProperties basicProperties, [AmqpContentBodyMapping] byte[] body); + + ///Used to send a Channel.FlowOk. Confirms that + ///Channel.Flow from the broker was processed. + [AmqpMethodMapping(null, "channel", "flow-ok")] + void _Private_ChannelFlowOk(); + + ///Handle incoming Channel.Flow methods. Either + ///stops or resumes sending the methods that have content. + void HandleChannelFlow(bool active); ///Handle an incoming Channel.Close. Shuts down the ///session and model. diff --git a/mcs/class/RabbitMQ.Client/src/client/api/IProtocol.cs b/mcs/class/RabbitMQ.Client/src/client/api/IProtocol.cs index ca47dc17205..c1f41a8dfc5 100644 --- a/mcs/class/RabbitMQ.Client/src/client/api/IProtocol.cs +++ b/mcs/class/RabbitMQ.Client/src/client/api/IProtocol.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // @@ -67,12 +73,6 @@ namespace RabbitMQ.Client ///Retrieve the protocol's default TCP port int DefaultPort { get; } - ///Returns false if this protocol variant defaults to - ///permitting Access.Requests to be sent to the peer, or true - ///if Access.Requests should be suppressed by - ///default. - bool DefaultSuppressAccessRequest { get; } - ///Construct a frame handler for a given endpoint. IFrameHandler CreateFrameHandler(AmqpTcpEndpoint endpoint); ///Construct a connection from a given set of diff --git a/mcs/class/RabbitMQ.Client/src/client/api/IStreamProperties.cs b/mcs/class/RabbitMQ.Client/src/client/api/IStreamProperties.cs index e400ec931a5..fd783319e39 100644 --- a/mcs/class/RabbitMQ.Client/src/client/api/IStreamProperties.cs +++ b/mcs/class/RabbitMQ.Client/src/client/api/IStreamProperties.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // diff --git a/mcs/class/RabbitMQ.Client/src/client/api/Protocols.cs b/mcs/class/RabbitMQ.Client/src/client/api/Protocols.cs index a0e1c11841f..69c5f3d741c 100644 --- a/mcs/class/RabbitMQ.Client/src/client/api/Protocols.cs +++ b/mcs/class/RabbitMQ.Client/src/client/api/Protocols.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // diff --git a/mcs/class/RabbitMQ.Client/src/client/api/PublicationAddress.cs b/mcs/class/RabbitMQ.Client/src/client/api/PublicationAddress.cs index 3f91b39ef64..f4f3d900418 100644 --- a/mcs/class/RabbitMQ.Client/src/client/api/PublicationAddress.cs +++ b/mcs/class/RabbitMQ.Client/src/client/api/PublicationAddress.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // diff --git a/mcs/class/RabbitMQ.Client/src/client/api/QueueingBasicConsumer.cs b/mcs/class/RabbitMQ.Client/src/client/api/QueueingBasicConsumer.cs index 8cc2f3832ef..a5c03479986 100644 --- a/mcs/class/RabbitMQ.Client/src/client/api/QueueingBasicConsumer.cs +++ b/mcs/class/RabbitMQ.Client/src/client/api/QueueingBasicConsumer.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // @@ -80,7 +86,7 @@ namespace RabbitMQ.Client /// /// IModel channel = ...; /// QueueingBasicConsumer consumer = new QueueingBasicConsumer(channel); - /// channel.BasicConsume(ticket, queueName, null, consumer); + /// channel.BasicConsume(queueName, null, consumer); /// /// // At this point, messages will be being asynchronously delivered, /// // and will be queueing up in consumer.Queue. diff --git a/mcs/class/RabbitMQ.Client/src/client/api/ShutdownEventArgs.cs b/mcs/class/RabbitMQ.Client/src/client/api/ShutdownEventArgs.cs index 7a23d2bda45..f9aec2029c7 100644 --- a/mcs/class/RabbitMQ.Client/src/client/api/ShutdownEventArgs.cs +++ b/mcs/class/RabbitMQ.Client/src/client/api/ShutdownEventArgs.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // diff --git a/mcs/class/RabbitMQ.Client/src/client/api/ShutdownInitiator.cs b/mcs/class/RabbitMQ.Client/src/client/api/ShutdownInitiator.cs index cdcc14fef17..f6c90457320 100644 --- a/mcs/class/RabbitMQ.Client/src/client/api/ShutdownInitiator.cs +++ b/mcs/class/RabbitMQ.Client/src/client/api/ShutdownInitiator.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // diff --git a/mcs/class/RabbitMQ.Client/src/client/api/ShutdownReportEntry.cs b/mcs/class/RabbitMQ.Client/src/client/api/ShutdownReportEntry.cs index c61836a9ab6..7fa9ba8c05f 100644 --- a/mcs/class/RabbitMQ.Client/src/client/api/ShutdownReportEntry.cs +++ b/mcs/class/RabbitMQ.Client/src/client/api/ShutdownReportEntry.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // diff --git a/mcs/class/RabbitMQ.Client/src/client/content/BasicMessageBuilder.cs b/mcs/class/RabbitMQ.Client/src/client/content/BasicMessageBuilder.cs index b02df62825c..72574172d5d 100644 --- a/mcs/class/RabbitMQ.Client/src/client/content/BasicMessageBuilder.cs +++ b/mcs/class/RabbitMQ.Client/src/client/content/BasicMessageBuilder.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // diff --git a/mcs/class/RabbitMQ.Client/src/client/content/BasicMessageReader.cs b/mcs/class/RabbitMQ.Client/src/client/content/BasicMessageReader.cs index a7830a9ab94..0874f28f506 100644 --- a/mcs/class/RabbitMQ.Client/src/client/content/BasicMessageReader.cs +++ b/mcs/class/RabbitMQ.Client/src/client/content/BasicMessageReader.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // diff --git a/mcs/class/RabbitMQ.Client/src/client/content/BytesMessageBuilder.cs b/mcs/class/RabbitMQ.Client/src/client/content/BytesMessageBuilder.cs index e01b3cfd084..7cd757483ec 100644 --- a/mcs/class/RabbitMQ.Client/src/client/content/BytesMessageBuilder.cs +++ b/mcs/class/RabbitMQ.Client/src/client/content/BytesMessageBuilder.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // diff --git a/mcs/class/RabbitMQ.Client/src/client/content/BytesMessageReader.cs b/mcs/class/RabbitMQ.Client/src/client/content/BytesMessageReader.cs index a8d920f8de1..2ce790fe9fd 100644 --- a/mcs/class/RabbitMQ.Client/src/client/content/BytesMessageReader.cs +++ b/mcs/class/RabbitMQ.Client/src/client/content/BytesMessageReader.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // diff --git a/mcs/class/RabbitMQ.Client/src/client/content/BytesWireFormatting.cs b/mcs/class/RabbitMQ.Client/src/client/content/BytesWireFormatting.cs index 750d73980da..7e051d0fb70 100644 --- a/mcs/class/RabbitMQ.Client/src/client/content/BytesWireFormatting.cs +++ b/mcs/class/RabbitMQ.Client/src/client/content/BytesWireFormatting.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // diff --git a/mcs/class/RabbitMQ.Client/src/client/content/IBytesMessageBuilder.cs b/mcs/class/RabbitMQ.Client/src/client/content/IBytesMessageBuilder.cs index 39252c66972..fcd62ffb531 100644 --- a/mcs/class/RabbitMQ.Client/src/client/content/IBytesMessageBuilder.cs +++ b/mcs/class/RabbitMQ.Client/src/client/content/IBytesMessageBuilder.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // diff --git a/mcs/class/RabbitMQ.Client/src/client/content/IBytesMessageReader.cs b/mcs/class/RabbitMQ.Client/src/client/content/IBytesMessageReader.cs index 51f9bcdcab1..74816f8816d 100644 --- a/mcs/class/RabbitMQ.Client/src/client/content/IBytesMessageReader.cs +++ b/mcs/class/RabbitMQ.Client/src/client/content/IBytesMessageReader.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // diff --git a/mcs/class/RabbitMQ.Client/src/client/content/IMapMessageBuilder.cs b/mcs/class/RabbitMQ.Client/src/client/content/IMapMessageBuilder.cs index b4e3028a587..42b7a9b91ee 100644 --- a/mcs/class/RabbitMQ.Client/src/client/content/IMapMessageBuilder.cs +++ b/mcs/class/RabbitMQ.Client/src/client/content/IMapMessageBuilder.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // diff --git a/mcs/class/RabbitMQ.Client/src/client/content/IMapMessageReader.cs b/mcs/class/RabbitMQ.Client/src/client/content/IMapMessageReader.cs index fccdca77c23..1dc14ccab7e 100644 --- a/mcs/class/RabbitMQ.Client/src/client/content/IMapMessageReader.cs +++ b/mcs/class/RabbitMQ.Client/src/client/content/IMapMessageReader.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // diff --git a/mcs/class/RabbitMQ.Client/src/client/content/IMessageBuilder.cs b/mcs/class/RabbitMQ.Client/src/client/content/IMessageBuilder.cs index 3311e1495a4..93a362a0c54 100644 --- a/mcs/class/RabbitMQ.Client/src/client/content/IMessageBuilder.cs +++ b/mcs/class/RabbitMQ.Client/src/client/content/IMessageBuilder.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // diff --git a/mcs/class/RabbitMQ.Client/src/client/content/IMessageReader.cs b/mcs/class/RabbitMQ.Client/src/client/content/IMessageReader.cs index b41967d7548..cda25b7c3da 100644 --- a/mcs/class/RabbitMQ.Client/src/client/content/IMessageReader.cs +++ b/mcs/class/RabbitMQ.Client/src/client/content/IMessageReader.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // diff --git a/mcs/class/RabbitMQ.Client/src/client/content/IStreamMessageBuilder.cs b/mcs/class/RabbitMQ.Client/src/client/content/IStreamMessageBuilder.cs index 0998f35c9dc..509491d4cbb 100644 --- a/mcs/class/RabbitMQ.Client/src/client/content/IStreamMessageBuilder.cs +++ b/mcs/class/RabbitMQ.Client/src/client/content/IStreamMessageBuilder.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // diff --git a/mcs/class/RabbitMQ.Client/src/client/content/IStreamMessageReader.cs b/mcs/class/RabbitMQ.Client/src/client/content/IStreamMessageReader.cs index 473149c4eb6..1c71ee983cf 100644 --- a/mcs/class/RabbitMQ.Client/src/client/content/IStreamMessageReader.cs +++ b/mcs/class/RabbitMQ.Client/src/client/content/IStreamMessageReader.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // diff --git a/mcs/class/RabbitMQ.Client/src/client/content/MapMessageBuilder.cs b/mcs/class/RabbitMQ.Client/src/client/content/MapMessageBuilder.cs index 9e44d4d20e9..e2243beff75 100644 --- a/mcs/class/RabbitMQ.Client/src/client/content/MapMessageBuilder.cs +++ b/mcs/class/RabbitMQ.Client/src/client/content/MapMessageBuilder.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // diff --git a/mcs/class/RabbitMQ.Client/src/client/content/MapMessageReader.cs b/mcs/class/RabbitMQ.Client/src/client/content/MapMessageReader.cs index 335b6c2ba8f..68cfcaa8f82 100644 --- a/mcs/class/RabbitMQ.Client/src/client/content/MapMessageReader.cs +++ b/mcs/class/RabbitMQ.Client/src/client/content/MapMessageReader.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // diff --git a/mcs/class/RabbitMQ.Client/src/client/content/MapWireFormatting.cs b/mcs/class/RabbitMQ.Client/src/client/content/MapWireFormatting.cs index ac42cff71d6..0f04d72acef 100644 --- a/mcs/class/RabbitMQ.Client/src/client/content/MapWireFormatting.cs +++ b/mcs/class/RabbitMQ.Client/src/client/content/MapWireFormatting.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // diff --git a/mcs/class/RabbitMQ.Client/src/client/content/PrimitiveParser.cs b/mcs/class/RabbitMQ.Client/src/client/content/PrimitiveParser.cs index 677c17f048c..71df96139d9 100644 --- a/mcs/class/RabbitMQ.Client/src/client/content/PrimitiveParser.cs +++ b/mcs/class/RabbitMQ.Client/src/client/content/PrimitiveParser.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // diff --git a/mcs/class/RabbitMQ.Client/src/client/content/StreamMessageBuilder.cs b/mcs/class/RabbitMQ.Client/src/client/content/StreamMessageBuilder.cs index 7f04db4d06a..7fd985d23a1 100644 --- a/mcs/class/RabbitMQ.Client/src/client/content/StreamMessageBuilder.cs +++ b/mcs/class/RabbitMQ.Client/src/client/content/StreamMessageBuilder.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // diff --git a/mcs/class/RabbitMQ.Client/src/client/content/StreamMessageReader.cs b/mcs/class/RabbitMQ.Client/src/client/content/StreamMessageReader.cs index 3d3c3c56b87..ed16e2af2ad 100644 --- a/mcs/class/RabbitMQ.Client/src/client/content/StreamMessageReader.cs +++ b/mcs/class/RabbitMQ.Client/src/client/content/StreamMessageReader.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // diff --git a/mcs/class/RabbitMQ.Client/src/client/content/StreamWireFormatting.cs b/mcs/class/RabbitMQ.Client/src/client/content/StreamWireFormatting.cs index a2b11ce5b7f..824378f65b0 100644 --- a/mcs/class/RabbitMQ.Client/src/client/content/StreamWireFormatting.cs +++ b/mcs/class/RabbitMQ.Client/src/client/content/StreamWireFormatting.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // diff --git a/mcs/class/RabbitMQ.Client/src/client/events/BasicDeliverEventArgs.cs b/mcs/class/RabbitMQ.Client/src/client/events/BasicDeliverEventArgs.cs index dbf6e889893..327d82397a7 100644 --- a/mcs/class/RabbitMQ.Client/src/client/events/BasicDeliverEventArgs.cs +++ b/mcs/class/RabbitMQ.Client/src/client/events/BasicDeliverEventArgs.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // diff --git a/mcs/class/RabbitMQ.Client/src/client/events/BasicDeliverEventHandler.cs b/mcs/class/RabbitMQ.Client/src/client/events/BasicDeliverEventHandler.cs index 15dd0115208..1af5bfcc4a9 100644 --- a/mcs/class/RabbitMQ.Client/src/client/events/BasicDeliverEventHandler.cs +++ b/mcs/class/RabbitMQ.Client/src/client/events/BasicDeliverEventHandler.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // diff --git a/mcs/class/RabbitMQ.Client/src/client/events/BasicReturnEventArgs.cs b/mcs/class/RabbitMQ.Client/src/client/events/BasicReturnEventArgs.cs index 96e761adabd..531cfc12459 100644 --- a/mcs/class/RabbitMQ.Client/src/client/events/BasicReturnEventArgs.cs +++ b/mcs/class/RabbitMQ.Client/src/client/events/BasicReturnEventArgs.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // diff --git a/mcs/class/RabbitMQ.Client/src/client/events/BasicReturnEventHandler.cs b/mcs/class/RabbitMQ.Client/src/client/events/BasicReturnEventHandler.cs index fb20794adf8..a9681e9dae5 100644 --- a/mcs/class/RabbitMQ.Client/src/client/events/BasicReturnEventHandler.cs +++ b/mcs/class/RabbitMQ.Client/src/client/events/BasicReturnEventHandler.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // diff --git a/mcs/class/RabbitMQ.Client/src/client/events/CallbackExceptionEventArgs.cs b/mcs/class/RabbitMQ.Client/src/client/events/CallbackExceptionEventArgs.cs index fc152827be6..f3b1b614198 100644 --- a/mcs/class/RabbitMQ.Client/src/client/events/CallbackExceptionEventArgs.cs +++ b/mcs/class/RabbitMQ.Client/src/client/events/CallbackExceptionEventArgs.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // diff --git a/mcs/class/RabbitMQ.Client/src/client/events/CallbackExceptionEventHandler.cs b/mcs/class/RabbitMQ.Client/src/client/events/CallbackExceptionEventHandler.cs index d5a681e1b12..b12acc4c9e2 100644 --- a/mcs/class/RabbitMQ.Client/src/client/events/CallbackExceptionEventHandler.cs +++ b/mcs/class/RabbitMQ.Client/src/client/events/CallbackExceptionEventHandler.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // diff --git a/mcs/class/RabbitMQ.Client/src/client/events/ConnectionShutdownEventHandler.cs b/mcs/class/RabbitMQ.Client/src/client/events/ConnectionShutdownEventHandler.cs index 61213a16a05..e20bf90271c 100644 --- a/mcs/class/RabbitMQ.Client/src/client/events/ConnectionShutdownEventHandler.cs +++ b/mcs/class/RabbitMQ.Client/src/client/events/ConnectionShutdownEventHandler.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // diff --git a/mcs/class/RabbitMQ.Client/src/client/events/ConsumerEventArgs.cs b/mcs/class/RabbitMQ.Client/src/client/events/ConsumerEventArgs.cs index b053aa8a753..995fbcd8665 100644 --- a/mcs/class/RabbitMQ.Client/src/client/events/ConsumerEventArgs.cs +++ b/mcs/class/RabbitMQ.Client/src/client/events/ConsumerEventArgs.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // diff --git a/mcs/class/RabbitMQ.Client/src/client/events/ConsumerEventHandler.cs b/mcs/class/RabbitMQ.Client/src/client/events/ConsumerEventHandler.cs index 6ab35db1e09..c232e8ba235 100644 --- a/mcs/class/RabbitMQ.Client/src/client/events/ConsumerEventHandler.cs +++ b/mcs/class/RabbitMQ.Client/src/client/events/ConsumerEventHandler.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // diff --git a/mcs/class/RabbitMQ.Client/src/client/events/ConsumerShutdownEventHandler.cs b/mcs/class/RabbitMQ.Client/src/client/events/ConsumerShutdownEventHandler.cs index 93379107e81..d4bbce34a25 100644 --- a/mcs/class/RabbitMQ.Client/src/client/events/ConsumerShutdownEventHandler.cs +++ b/mcs/class/RabbitMQ.Client/src/client/events/ConsumerShutdownEventHandler.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // diff --git a/mcs/class/RabbitMQ.Client/src/client/events/EventingBasicConsumer.cs b/mcs/class/RabbitMQ.Client/src/client/events/EventingBasicConsumer.cs index ce08cd84ff2..8ada4f5a682 100644 --- a/mcs/class/RabbitMQ.Client/src/client/events/EventingBasicConsumer.cs +++ b/mcs/class/RabbitMQ.Client/src/client/events/EventingBasicConsumer.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // diff --git a/mcs/class/RabbitMQ.Client/src/client/events/ModelShutdownEventHandler.cs b/mcs/class/RabbitMQ.Client/src/client/events/ModelShutdownEventHandler.cs index 82c32455a49..f37c8979975 100644 --- a/mcs/class/RabbitMQ.Client/src/client/events/ModelShutdownEventHandler.cs +++ b/mcs/class/RabbitMQ.Client/src/client/events/ModelShutdownEventHandler.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // diff --git a/mcs/class/RabbitMQ.Client/src/client/exceptions/AlreadyClosedException.cs b/mcs/class/RabbitMQ.Client/src/client/exceptions/AlreadyClosedException.cs index bc7d59f74c6..995506f2fd7 100644 --- a/mcs/class/RabbitMQ.Client/src/client/exceptions/AlreadyClosedException.cs +++ b/mcs/class/RabbitMQ.Client/src/client/exceptions/AlreadyClosedException.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // diff --git a/mcs/class/RabbitMQ.Client/src/client/exceptions/BrokerUnreachableException.cs b/mcs/class/RabbitMQ.Client/src/client/exceptions/BrokerUnreachableException.cs index 47eada98278..4b939a9292f 100644 --- a/mcs/class/RabbitMQ.Client/src/client/exceptions/BrokerUnreachableException.cs +++ b/mcs/class/RabbitMQ.Client/src/client/exceptions/BrokerUnreachableException.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // diff --git a/mcs/class/RabbitMQ.Client/src/client/exceptions/ChannelAllocationException.cs b/mcs/class/RabbitMQ.Client/src/client/exceptions/ChannelAllocationException.cs index 378fe74f6b0..995a135d65b 100644 --- a/mcs/class/RabbitMQ.Client/src/client/exceptions/ChannelAllocationException.cs +++ b/mcs/class/RabbitMQ.Client/src/client/exceptions/ChannelAllocationException.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // diff --git a/mcs/class/RabbitMQ.Client/src/client/exceptions/OperationInterruptedException.cs b/mcs/class/RabbitMQ.Client/src/client/exceptions/OperationInterruptedException.cs index ed756882886..a070f1c4c95 100644 --- a/mcs/class/RabbitMQ.Client/src/client/exceptions/OperationInterruptedException.cs +++ b/mcs/class/RabbitMQ.Client/src/client/exceptions/OperationInterruptedException.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // diff --git a/mcs/class/RabbitMQ.Client/src/client/exceptions/PacketNotRecognizedException.cs b/mcs/class/RabbitMQ.Client/src/client/exceptions/PacketNotRecognizedException.cs index 57fe4d87dc6..6cf85759a7a 100644 --- a/mcs/class/RabbitMQ.Client/src/client/exceptions/PacketNotRecognizedException.cs +++ b/mcs/class/RabbitMQ.Client/src/client/exceptions/PacketNotRecognizedException.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // diff --git a/mcs/class/RabbitMQ.Client/src/client/exceptions/ProtocolVersionMismatchException.cs b/mcs/class/RabbitMQ.Client/src/client/exceptions/ProtocolVersionMismatchException.cs index 44edc1158d6..7e60b8d6a3c 100644 --- a/mcs/class/RabbitMQ.Client/src/client/exceptions/ProtocolVersionMismatchException.cs +++ b/mcs/class/RabbitMQ.Client/src/client/exceptions/ProtocolVersionMismatchException.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // diff --git a/mcs/class/RabbitMQ.Client/src/client/exceptions/UnexpectedMethodException.cs b/mcs/class/RabbitMQ.Client/src/client/exceptions/UnexpectedMethodException.cs index 6bc3fa6e95d..9799b39bec6 100644 --- a/mcs/class/RabbitMQ.Client/src/client/exceptions/UnexpectedMethodException.cs +++ b/mcs/class/RabbitMQ.Client/src/client/exceptions/UnexpectedMethodException.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // diff --git a/mcs/class/RabbitMQ.Client/src/client/exceptions/UnsupportedMethodException.cs b/mcs/class/RabbitMQ.Client/src/client/exceptions/UnsupportedMethodException.cs index 9ced1a374ed..9d5df4af150 100644 --- a/mcs/class/RabbitMQ.Client/src/client/exceptions/UnsupportedMethodException.cs +++ b/mcs/class/RabbitMQ.Client/src/client/exceptions/UnsupportedMethodException.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // diff --git a/mcs/class/RabbitMQ.Client/src/client/exceptions/UnsupportedMethodFieldException.cs b/mcs/class/RabbitMQ.Client/src/client/exceptions/UnsupportedMethodFieldException.cs index b80531379eb..78db98bd364 100644 --- a/mcs/class/RabbitMQ.Client/src/client/exceptions/UnsupportedMethodFieldException.cs +++ b/mcs/class/RabbitMQ.Client/src/client/exceptions/UnsupportedMethodFieldException.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // diff --git a/mcs/class/RabbitMQ.Client/src/client/exceptions/WireFormattingException.cs b/mcs/class/RabbitMQ.Client/src/client/exceptions/WireFormattingException.cs index f75ec4375a0..75c44708bc6 100644 --- a/mcs/class/RabbitMQ.Client/src/client/exceptions/WireFormattingException.cs +++ b/mcs/class/RabbitMQ.Client/src/client/exceptions/WireFormattingException.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // diff --git a/mcs/class/RabbitMQ.Client/src/client/impl/AbstractProtocolBase.cs b/mcs/class/RabbitMQ.Client/src/client/impl/AbstractProtocolBase.cs index 241e67aa56c..9d2c14976b5 100644 --- a/mcs/class/RabbitMQ.Client/src/client/impl/AbstractProtocolBase.cs +++ b/mcs/class/RabbitMQ.Client/src/client/impl/AbstractProtocolBase.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // @@ -59,8 +65,6 @@ namespace RabbitMQ.Client.Impl { public abstract string ApiName { get; } public abstract int DefaultPort { get; } - public abstract bool DefaultSuppressAccessRequest { get; } - public abstract IFrameHandler CreateFrameHandler(AmqpTcpEndpoint endpoint); public abstract IConnection CreateConnection(ConnectionParameters parameters, bool insist, @@ -85,6 +89,10 @@ namespace RabbitMQ.Client.Impl { out Command request, out int replyClassId, out int replyMethodId); + + ///Used in the quiescing session to determine if the command + ///is allowed to be sent. + public abstract bool CanSendWhileClosed(Command cmd); public AmqpVersion Version { get { diff --git a/mcs/class/RabbitMQ.Client/src/client/impl/BasicProperties.cs b/mcs/class/RabbitMQ.Client/src/client/impl/BasicProperties.cs index f945fab2d06..a1a0f6567f6 100644 --- a/mcs/class/RabbitMQ.Client/src/client/impl/BasicProperties.cs +++ b/mcs/class/RabbitMQ.Client/src/client/impl/BasicProperties.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // diff --git a/mcs/class/RabbitMQ.Client/src/client/impl/BodyTooLongException.cs b/mcs/class/RabbitMQ.Client/src/client/impl/BodyTooLongException.cs index 0d708de90a1..59d8a6a146d 100644 --- a/mcs/class/RabbitMQ.Client/src/client/impl/BodyTooLongException.cs +++ b/mcs/class/RabbitMQ.Client/src/client/impl/BodyTooLongException.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // diff --git a/mcs/class/RabbitMQ.Client/src/client/impl/ChannelErrorException.cs b/mcs/class/RabbitMQ.Client/src/client/impl/ChannelErrorException.cs index aa8af31180d..a6a9e378e1c 100644 --- a/mcs/class/RabbitMQ.Client/src/client/impl/ChannelErrorException.cs +++ b/mcs/class/RabbitMQ.Client/src/client/impl/ChannelErrorException.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // diff --git a/mcs/class/RabbitMQ.Client/src/client/impl/Command.cs b/mcs/class/RabbitMQ.Client/src/client/impl/Command.cs index 9befdfa34d7..dd36e7e9384 100644 --- a/mcs/class/RabbitMQ.Client/src/client/impl/Command.cs +++ b/mcs/class/RabbitMQ.Client/src/client/impl/Command.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // diff --git a/mcs/class/RabbitMQ.Client/src/client/impl/CommandAssembler.cs b/mcs/class/RabbitMQ.Client/src/client/impl/CommandAssembler.cs index 3935bc2c57f..d0e6fa717c7 100644 --- a/mcs/class/RabbitMQ.Client/src/client/impl/CommandAssembler.cs +++ b/mcs/class/RabbitMQ.Client/src/client/impl/CommandAssembler.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // diff --git a/mcs/class/RabbitMQ.Client/src/client/impl/ConnectionBase.cs b/mcs/class/RabbitMQ.Client/src/client/impl/ConnectionBase.cs index 9c03dcdfb64..fddc530efbf 100644 --- a/mcs/class/RabbitMQ.Client/src/client/impl/ConnectionBase.cs +++ b/mcs/class/RabbitMQ.Client/src/client/impl/ConnectionBase.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // @@ -122,7 +128,7 @@ namespace RabbitMQ.Client.Impl m_sessionManager = new SessionManager(this); m_session0 = new MainSession(this); - m_session0.Handler = NotifyReceivedClose; + m_session0.Handler = new MainSession.SessionCloseDelegate(NotifyReceivedCloseOk); m_model0 = (ModelBase)Protocol.CreateModel(m_session0); StartMainLoop(); @@ -334,7 +340,16 @@ namespace RabbitMQ.Client.Impl void IDisposable.Dispose() { - Close(); + Abort(); + if (ShutdownReport.Count > 0) + { + foreach (ShutdownReportEntry entry in ShutdownReport) + { + if (entry.Exception != null) + throw entry.Exception; + } + throw new OperationInterruptedException(null); + } } ///API-side invocation of connection close. @@ -343,28 +358,40 @@ namespace RabbitMQ.Client.Impl Close(200, "Goodbye", Timeout.Infinite); } + ///API-side invocation of connection close. + public void Close(ushort reasonCode, string reasonText) + { + Close(reasonCode, reasonText, Timeout.Infinite); + } + ///API-side invocation of connection close with timeout. public void Close(int timeout) { Close(200, "Goodbye", timeout); } - - public void Close(ShutdownEventArgs reason) - { - Close(reason, false, Timeout.Infinite); - } + ///API-side invocation of connection close with timeout. public void Close(ushort reasonCode, string reasonText, int timeout) { Close(new ShutdownEventArgs(ShutdownInitiator.Application, reasonCode, reasonText), false, timeout); } - + + public void Close(ShutdownEventArgs reason) + { + Close(reason, false, Timeout.Infinite); + } ///API-side invocation of connection abort. public void Abort() { Abort(Timeout.Infinite); } + + ///API-side invocation of connection abort. + public void Abort(ushort reasonCode, string reasonText) + { + Abort(reasonCode, reasonText, Timeout.Infinite); + } ///API-side invocation of connection abort with timeout. public void Abort(int timeout) @@ -372,6 +399,7 @@ namespace RabbitMQ.Client.Impl Abort(200, "Connection close forced", timeout); } + ///API-side invocation of connection abort with timeout. public void Abort(ushort reasonCode, string reasonText, int timeout) { Abort(reasonCode, reasonText, ShutdownInitiator.Application, timeout); @@ -539,13 +567,12 @@ namespace RabbitMQ.Client.Impl FinishClose(); } - public void HandleHeartbeatFrame() + public void NotifyHeartbeatThread() { if (m_heartbeat == 0) { // Heartbeating not enabled for this connection. return; } - m_heartbeatRead.Set(); } @@ -601,11 +628,11 @@ namespace RabbitMQ.Client.Impl { Frame frame = m_frameHandler.ReadFrame(); + NotifyHeartbeatThread(); // We have received an actual frame. if (frame.Type == CommonFraming.Constants.FrameHeartbeat) { // Ignore it: we've already just reset the heartbeat // counter. - HandleHeartbeatFrame(); return; } @@ -650,7 +677,7 @@ namespace RabbitMQ.Client.Impl closed = true; m_heartbeatRead.Set(); m_heartbeatWrite.Set(); - + m_frameHandler.Close(); m_model0.SetCloseReason(m_closeReason); m_model0.FinishClose(); @@ -684,10 +711,10 @@ namespace RabbitMQ.Client.Impl /// public void ClosingLoop() { - m_frameHandler.Timeout = ConnectionCloseTimeout; - DateTime startTimeout = DateTime.Now; try { + m_frameHandler.Timeout = ConnectionCloseTimeout; + DateTime startTimeout = DateTime.Now; // Wait for response/socket closure or timeout while (!closed) { @@ -699,6 +726,11 @@ namespace RabbitMQ.Client.Impl MainLoopIteration(); } } + catch (ObjectDisposedException ode) + { + if (!closed) + LogCloseError("Connection didn't close cleanly", ode); + } catch (EndOfStreamException eose) { if (m_model0.CloseReason == null) @@ -716,10 +748,10 @@ namespace RabbitMQ.Client.Impl } } - public void NotifyReceivedClose() + public void NotifyReceivedCloseOk() { + TerminateMainloop(); closed = true; - m_frameHandler.Close(); } /// diff --git a/mcs/class/RabbitMQ.Client/src/client/impl/ConnectionStartDetails.cs b/mcs/class/RabbitMQ.Client/src/client/impl/ConnectionStartDetails.cs index a0aa9047655..a8ead25b1ee 100644 --- a/mcs/class/RabbitMQ.Client/src/client/impl/ConnectionStartDetails.cs +++ b/mcs/class/RabbitMQ.Client/src/client/impl/ConnectionStartDetails.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // diff --git a/mcs/class/RabbitMQ.Client/src/client/impl/ContentHeaderBase.cs b/mcs/class/RabbitMQ.Client/src/client/impl/ContentHeaderBase.cs index 6a8a0732640..0ddbffb4ad1 100644 --- a/mcs/class/RabbitMQ.Client/src/client/impl/ContentHeaderBase.cs +++ b/mcs/class/RabbitMQ.Client/src/client/impl/ContentHeaderBase.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // diff --git a/mcs/class/RabbitMQ.Client/src/client/impl/ContentHeaderPropertyReader.cs b/mcs/class/RabbitMQ.Client/src/client/impl/ContentHeaderPropertyReader.cs index e1f0226a4e6..d887a46148a 100644 --- a/mcs/class/RabbitMQ.Client/src/client/impl/ContentHeaderPropertyReader.cs +++ b/mcs/class/RabbitMQ.Client/src/client/impl/ContentHeaderPropertyReader.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // diff --git a/mcs/class/RabbitMQ.Client/src/client/impl/ContentHeaderPropertyWriter.cs b/mcs/class/RabbitMQ.Client/src/client/impl/ContentHeaderPropertyWriter.cs index 913d72efb78..003fdb01735 100644 --- a/mcs/class/RabbitMQ.Client/src/client/impl/ContentHeaderPropertyWriter.cs +++ b/mcs/class/RabbitMQ.Client/src/client/impl/ContentHeaderPropertyWriter.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // diff --git a/mcs/class/RabbitMQ.Client/src/client/impl/FileProperties.cs b/mcs/class/RabbitMQ.Client/src/client/impl/FileProperties.cs index 151a10f785f..af879d66a5a 100644 --- a/mcs/class/RabbitMQ.Client/src/client/impl/FileProperties.cs +++ b/mcs/class/RabbitMQ.Client/src/client/impl/FileProperties.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // diff --git a/mcs/class/RabbitMQ.Client/src/client/impl/Frame.cs b/mcs/class/RabbitMQ.Client/src/client/impl/Frame.cs index 113818fe824..9168f057530 100644 --- a/mcs/class/RabbitMQ.Client/src/client/impl/Frame.cs +++ b/mcs/class/RabbitMQ.Client/src/client/impl/Frame.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // diff --git a/mcs/class/RabbitMQ.Client/src/client/impl/HardProtocolException.cs b/mcs/class/RabbitMQ.Client/src/client/impl/HardProtocolException.cs index d57a8f92a84..20a3c9b9592 100644 --- a/mcs/class/RabbitMQ.Client/src/client/impl/HardProtocolException.cs +++ b/mcs/class/RabbitMQ.Client/src/client/impl/HardProtocolException.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // diff --git a/mcs/class/RabbitMQ.Client/src/client/impl/IFrameHandler.cs b/mcs/class/RabbitMQ.Client/src/client/impl/IFrameHandler.cs index 6f4bd7abc42..2da37714e69 100644 --- a/mcs/class/RabbitMQ.Client/src/client/impl/IFrameHandler.cs +++ b/mcs/class/RabbitMQ.Client/src/client/impl/IFrameHandler.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // diff --git a/mcs/class/RabbitMQ.Client/src/client/impl/IRpcContinuation.cs b/mcs/class/RabbitMQ.Client/src/client/impl/IRpcContinuation.cs index f83611c2940..b535d7787c1 100644 --- a/mcs/class/RabbitMQ.Client/src/client/impl/IRpcContinuation.cs +++ b/mcs/class/RabbitMQ.Client/src/client/impl/IRpcContinuation.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // diff --git a/mcs/class/RabbitMQ.Client/src/client/impl/ISession.cs b/mcs/class/RabbitMQ.Client/src/client/impl/ISession.cs index 809a04b20f1..0a393107c5a 100644 --- a/mcs/class/RabbitMQ.Client/src/client/impl/ISession.cs +++ b/mcs/class/RabbitMQ.Client/src/client/impl/ISession.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // @@ -63,11 +69,13 @@ namespace RabbitMQ.Client.Impl { event SessionShutdownEventHandler SessionShutdown; int ChannelNumber { get; } - IConnection Connection { get; } - ShutdownEventArgs CloseReason { get; } + IConnection Connection { get; } + ShutdownEventArgs CloseReason { get; } bool IsOpen { get; } void HandleFrame(Frame frame); void Transmit(Command cmd); void Close(ShutdownEventArgs reason); + void Close(ShutdownEventArgs reason, bool notify); + void Notify(); } } diff --git a/mcs/class/RabbitMQ.Client/src/client/impl/MainSession.cs b/mcs/class/RabbitMQ.Client/src/client/impl/MainSession.cs index 6a9f636125f..ef9b1a08663 100644 --- a/mcs/class/RabbitMQ.Client/src/client/impl/MainSession.cs +++ b/mcs/class/RabbitMQ.Client/src/client/impl/MainSession.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // @@ -110,7 +116,7 @@ namespace RabbitMQ.Client.Impl public SessionCloseDelegate Handler { get { return handler; } - set { handler = new SessionCloseDelegate(value); } + set { handler = value; } } public override void HandleFrame(Frame frame) diff --git a/mcs/class/RabbitMQ.Client/src/client/impl/MalformedFrameException.cs b/mcs/class/RabbitMQ.Client/src/client/impl/MalformedFrameException.cs index efcebeb70f2..98ee6058378 100644 --- a/mcs/class/RabbitMQ.Client/src/client/impl/MalformedFrameException.cs +++ b/mcs/class/RabbitMQ.Client/src/client/impl/MalformedFrameException.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // diff --git a/mcs/class/RabbitMQ.Client/src/client/impl/MethodArgumentReader.cs b/mcs/class/RabbitMQ.Client/src/client/impl/MethodArgumentReader.cs index 69f95ace6c8..1be72847c3a 100644 --- a/mcs/class/RabbitMQ.Client/src/client/impl/MethodArgumentReader.cs +++ b/mcs/class/RabbitMQ.Client/src/client/impl/MethodArgumentReader.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // diff --git a/mcs/class/RabbitMQ.Client/src/client/impl/MethodArgumentWriter.cs b/mcs/class/RabbitMQ.Client/src/client/impl/MethodArgumentWriter.cs index 16fc02e810f..e36a38281c6 100644 --- a/mcs/class/RabbitMQ.Client/src/client/impl/MethodArgumentWriter.cs +++ b/mcs/class/RabbitMQ.Client/src/client/impl/MethodArgumentWriter.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // diff --git a/mcs/class/RabbitMQ.Client/src/client/impl/MethodBase.cs b/mcs/class/RabbitMQ.Client/src/client/impl/MethodBase.cs index 6dddfc20ca5..fac81aeb85e 100644 --- a/mcs/class/RabbitMQ.Client/src/client/impl/MethodBase.cs +++ b/mcs/class/RabbitMQ.Client/src/client/impl/MethodBase.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // diff --git a/mcs/class/RabbitMQ.Client/src/client/impl/ModelBase.cs b/mcs/class/RabbitMQ.Client/src/client/impl/ModelBase.cs index 58e4313ff9d..38770f49358 100644 --- a/mcs/class/RabbitMQ.Client/src/client/impl/ModelBase.cs +++ b/mcs/class/RabbitMQ.Client/src/client/impl/ModelBase.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // @@ -76,6 +82,8 @@ namespace RabbitMQ.Client.Impl private readonly object m_eventLock = new object(); private BasicReturnEventHandler m_basicReturn; private CallbackExceptionEventHandler m_callbackException; + + public ManualResetEvent m_flowControlBlock = new ManualResetEvent(true); public event ModelShutdownEventHandler ModelShutdown { @@ -225,6 +233,7 @@ namespace RabbitMQ.Client.Impl } } } + m_flowControlBlock.Set(); } public virtual void OnBasicReturn(BasicReturnEventArgs args) @@ -318,6 +327,9 @@ namespace RabbitMQ.Client.Impl public void ModelSend(MethodBase method, ContentHeaderBase header, byte[] body) { + if (method.HasContent) { + m_flowControlBlock.WaitOne(); + } m_session.Transmit(new Command(method, header, body)); } @@ -381,6 +393,17 @@ namespace RabbitMQ.Client.Impl e.Body = body; OnBasicReturn(e); } + + public abstract void _Private_ChannelFlowOk(); + + public void HandleChannelFlow(bool active) + { + if (active) + m_flowControlBlock.Set(); + else + m_flowControlBlock.Reset(); + _Private_ChannelFlowOk(); + } public void HandleConnectionStart(byte versionMajor, byte versionMinor, @@ -444,8 +467,13 @@ namespace RabbitMQ.Client.Impl replyText, classId, methodId)); - FinishClose(); - _Private_ChannelCloseOk(); + + m_session.Close(m_closeReason, false); + try { + _Private_ChannelCloseOk(); + } finally { + m_session.Notify(); + } } public void FinishClose() @@ -464,95 +492,17 @@ namespace RabbitMQ.Client.Impl public abstract void ChannelFlow(bool active); - public ushort AccessRequest(string realm) - { - return AccessRequest(realm, false, true, true, true, true); - } - - public static AccessRequestConfig GetEnvironmentAccessRequestConfig() - { - string setting = Environment.GetEnvironmentVariable("AMQP_ACCESS_REQUEST"); - if (setting == null) - { - return AccessRequestConfig.UseDefault; - } - switch (setting) - { - case "ENABLE": return AccessRequestConfig.Enable; - case "SUPPRESS": return AccessRequestConfig.Suppress; - case "USE_DEFAULT": return AccessRequestConfig.UseDefault; - default: { - string message = string.Format("Unsupported AMQP_ACCESS_REQUEST setting: {0}", - setting); - throw new NotSupportedException(message); - } - } - } - - public static AccessRequestConfig Combine(AccessRequestConfig first, - AccessRequestConfig second) - { - return (first == AccessRequestConfig.UseDefault) ? second : first; - } - - public ushort AccessRequest(string realm, - bool exclusive, - bool passive, - bool active, - bool write, - bool read) - { - bool send; - switch (Combine(m_session.Connection.Parameters.AccessRequestConfig, - GetEnvironmentAccessRequestConfig())) - { - case AccessRequestConfig.Enable: - send = true; - break; - case AccessRequestConfig.Suppress: - send = false; - break; - case AccessRequestConfig.UseDefault: - send = !m_session.Connection.Protocol.DefaultSuppressAccessRequest; - break; - default: { - send = false; - - string message = string.Format("Illegal value for AccessRequestConfig: {0}", - (int) m_session.Connection.Parameters.AccessRequestConfig); - throw new ArgumentException(message); - } - } - if (send) - { - return _Private_AccessRequest(realm, exclusive, passive, active, write, read); - } - else - { - return 0; - } - } - - // TODO: Consider changing the access modifier or name, _Private => protected (?) - public abstract ushort _Private_AccessRequest(string realm, - bool exclusive, - bool passive, - bool active, - bool write, - bool read); - - public void ExchangeDeclare(ushort ticket, string exchange, string type, bool durable) + public void ExchangeDeclare(string exchange, string type, bool durable) { - ExchangeDeclare(ticket, exchange, type, false, durable, false, false, false, null); + ExchangeDeclare(exchange, type, false, durable, false, false, false, null); } - public void ExchangeDeclare(ushort ticket, string exchange, string type) + public void ExchangeDeclare(string exchange, string type) { - ExchangeDeclare(ticket, exchange, type, false, false, false, false, false, null); + ExchangeDeclare(exchange, type, false, false, false, false, false, null); } - public abstract void ExchangeDeclare(ushort ticket, - string exchange, + public abstract void ExchangeDeclare(string exchange, string type, bool passive, bool durable, @@ -561,31 +511,28 @@ namespace RabbitMQ.Client.Impl bool nowait, IDictionary arguments); - public abstract void ExchangeDelete(ushort ticket, - string exchange, + public abstract void ExchangeDelete(string exchange, bool ifUnused, bool nowait); //TODO: Mark these as virtual, maybe the model has an optimized way // of dealing with missing parameters. - - public string QueueDeclare(ushort ticket) + public string QueueDeclare() { - return QueueDeclare(ticket, "", false, false, true, true, false, null); + return QueueDeclare("", false, false, true, true, false, null); } - public string QueueDeclare(ushort ticket, string queue) + public string QueueDeclare(string queue) { - return QueueDeclare(ticket, queue, false); + return QueueDeclare(queue, false); } - public string QueueDeclare(ushort ticket, string queue, bool durable) + public string QueueDeclare(string queue, bool durable) { - return QueueDeclare(ticket, queue, false, durable, false, false, false, null); + return QueueDeclare(queue, false, durable, false, false, false, null); } - public abstract string QueueDeclare(ushort ticket, - string queue, + public abstract string QueueDeclare(string queue, bool passive, bool durable, bool exclusive, @@ -593,54 +540,47 @@ namespace RabbitMQ.Client.Impl bool nowait, IDictionary arguments); - public abstract void QueueBind(ushort ticket, - string queue, + public abstract void QueueBind(string queue, string exchange, string routingKey, bool nowait, IDictionary arguments); - public abstract void QueueUnbind(ushort ticket, - string queue, + public abstract void QueueUnbind(string queue, string exchange, string routingKey, IDictionary arguments); - public abstract uint QueuePurge(ushort ticket, - string queue, + public abstract uint QueuePurge(string queue, bool nowait); - public abstract uint QueueDelete(ushort ticket, - string queue, + public abstract uint QueueDelete(string queue, bool ifUnused, bool ifEmpty, bool nowait); - public string BasicConsume(ushort ticket, - string queue, + public string BasicConsume(string queue, IDictionary filter, IBasicConsumer consumer) { - return BasicConsume(ticket, queue, false, filter, consumer); + return BasicConsume(queue, false, filter, consumer); } - public string BasicConsume(ushort ticket, - string queue, + public string BasicConsume(string queue, bool noAck, IDictionary filter, IBasicConsumer consumer) { - return BasicConsume(ticket, queue, noAck, "", filter, consumer); + return BasicConsume(queue, noAck, "", filter, consumer); } - public string BasicConsume(ushort ticket, - string queue, + public string BasicConsume(string queue, bool noAck, string consumerTag, IDictionary filter, IBasicConsumer consumer) { - return BasicConsume(ticket, queue, noAck, consumerTag, false, false, filter, consumer); + return BasicConsume(queue, noAck, consumerTag, false, false, filter, consumer); } public class BasicConsumerRpcContinuation : SimpleBlockingRpcContinuation @@ -650,8 +590,7 @@ namespace RabbitMQ.Client.Impl public BasicConsumerRpcContinuation() { } } - public string BasicConsume(ushort ticket, - string queue, + public string BasicConsume(string queue, bool noAck, string consumerTag, bool noLocal, @@ -669,7 +608,7 @@ namespace RabbitMQ.Client.Impl // the RPC response, but a response is still expected. try { - _Private_BasicConsume(ticket, queue, consumerTag, noLocal, noAck, exclusive, + _Private_BasicConsume(queue, consumerTag, noLocal, noAck, exclusive, /*nowait:*/ false, filter); } catch (AlreadyClosedException) @@ -764,15 +703,14 @@ namespace RabbitMQ.Client.Impl public BasicGetRpcContinuation() { } } - public BasicGetResult BasicGet(ushort ticket, - string queue, + public BasicGetResult BasicGet(string queue, bool noAck) { BasicGetRpcContinuation k = new BasicGetRpcContinuation(); Enqueue(k); try { - _Private_BasicGet(ticket, queue, noAck); + _Private_BasicGet(queue, noAck); } catch (AlreadyClosedException) { @@ -788,8 +726,7 @@ namespace RabbitMQ.Client.Impl ushort prefetchCount, bool global); - public abstract void _Private_BasicConsume(ushort ticket, - string queue, + public abstract void _Private_BasicConsume(string queue, string consumerTag, bool noLocal, bool noAck, @@ -800,26 +737,22 @@ namespace RabbitMQ.Client.Impl public abstract void _Private_BasicCancel(string consumerTag, bool nowait); - public void BasicPublish(ushort ticket, - PublicationAddress addr, + public void BasicPublish(PublicationAddress addr, IBasicProperties basicProperties, byte[] body) { - BasicPublish(ticket, - addr.ExchangeName, + BasicPublish(addr.ExchangeName, addr.RoutingKey, basicProperties, body); } - public void BasicPublish(ushort ticket, - string exchange, + public void BasicPublish(string exchange, string routingKey, IBasicProperties basicProperties, byte[] body) { - BasicPublish(ticket, - exchange, + BasicPublish(exchange, routingKey, false, false, @@ -827,8 +760,7 @@ namespace RabbitMQ.Client.Impl body); } - public void BasicPublish(ushort ticket, - string exchange, + public void BasicPublish(string exchange, string routingKey, bool mandatory, bool immediate, @@ -839,8 +771,7 @@ namespace RabbitMQ.Client.Impl { basicProperties = CreateBasicProperties(); } - _Private_BasicPublish(ticket, - exchange, + _Private_BasicPublish(exchange, routingKey, mandatory, immediate, @@ -848,8 +779,7 @@ namespace RabbitMQ.Client.Impl body); } - public abstract void _Private_BasicPublish(ushort ticket, - string exchange, + public abstract void _Private_BasicPublish(string exchange, string routingKey, bool mandatory, bool immediate, @@ -873,22 +803,49 @@ namespace RabbitMQ.Client.Impl void IDisposable.Dispose() { - Close(200, ""); + Close(); + } + + public void Close() + { + Close(200, "Goodbye"); } - public void Close(ushort replyCode, string replyText) + public void Close(ushort replyCode, string replyText) + { + Close(replyCode, replyText, false); + } + + public void Abort() + { + Abort(200, "Goodbye"); + } + + public void Abort(ushort replyCode, string replyText) + { + Close(replyCode, replyText, true); + } + + public void Close(ushort replyCode, string replyText, bool abort) { ShutdownContinuation k = new ShutdownContinuation(); ModelShutdown += new ModelShutdownEventHandler(k.OnShutdown); - - if (SetCloseReason(new ShutdownEventArgs(ShutdownInitiator.Application, - replyCode, - replyText))) - { - _Private_ChannelClose(replyCode, replyText, 0, 0); + + try { + if (SetCloseReason(new ShutdownEventArgs(ShutdownInitiator.Application, + replyCode, + replyText))) + { + _Private_ChannelClose(replyCode, replyText, 0, 0); + } + k.Wait(); + } catch (AlreadyClosedException ace) { + if (!abort) + throw ace; + } catch (IOException ioe) { + if (!abort) + throw ioe; } - - k.Wait(); } public void HandleChannelCloseOk() @@ -905,8 +862,7 @@ namespace RabbitMQ.Client.Impl public abstract void _Private_ChannelCloseOk(); - public abstract void _Private_BasicGet(ushort ticket, - string queue, + public abstract void _Private_BasicGet(string queue, bool noAck); public void HandleBasicGetOk(ulong deliveryTag, diff --git a/mcs/class/RabbitMQ.Client/src/client/impl/ProtocolException.cs b/mcs/class/RabbitMQ.Client/src/client/impl/ProtocolException.cs index 454113701d8..df688b237ff 100644 --- a/mcs/class/RabbitMQ.Client/src/client/impl/ProtocolException.cs +++ b/mcs/class/RabbitMQ.Client/src/client/impl/ProtocolException.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // diff --git a/mcs/class/RabbitMQ.Client/src/client/impl/QuiescingSession.cs b/mcs/class/RabbitMQ.Client/src/client/impl/QuiescingSession.cs index 7aa86731347..889a2fa1f9b 100644 --- a/mcs/class/RabbitMQ.Client/src/client/impl/QuiescingSession.cs +++ b/mcs/class/RabbitMQ.Client/src/client/impl/QuiescingSession.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // diff --git a/mcs/class/RabbitMQ.Client/src/client/impl/RedirectException.cs b/mcs/class/RabbitMQ.Client/src/client/impl/RedirectException.cs index d24a6a098bb..74b28c1a4a8 100644 --- a/mcs/class/RabbitMQ.Client/src/client/impl/RedirectException.cs +++ b/mcs/class/RabbitMQ.Client/src/client/impl/RedirectException.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // diff --git a/mcs/class/RabbitMQ.Client/src/client/impl/RpcContinuationQueue.cs b/mcs/class/RabbitMQ.Client/src/client/impl/RpcContinuationQueue.cs index e23e64024f9..2263536b6f4 100644 --- a/mcs/class/RabbitMQ.Client/src/client/impl/RpcContinuationQueue.cs +++ b/mcs/class/RabbitMQ.Client/src/client/impl/RpcContinuationQueue.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // diff --git a/mcs/class/RabbitMQ.Client/src/client/impl/Session.cs b/mcs/class/RabbitMQ.Client/src/client/impl/Session.cs index 9be97452f46..fdc280851fc 100644 --- a/mcs/class/RabbitMQ.Client/src/client/impl/Session.cs +++ b/mcs/class/RabbitMQ.Client/src/client/impl/Session.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // diff --git a/mcs/class/RabbitMQ.Client/src/client/impl/SessionBase.cs b/mcs/class/RabbitMQ.Client/src/client/impl/SessionBase.cs index 24887094176..b30d33ecd10 100644 --- a/mcs/class/RabbitMQ.Client/src/client/impl/SessionBase.cs +++ b/mcs/class/RabbitMQ.Client/src/client/impl/SessionBase.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // @@ -165,7 +171,8 @@ namespace RabbitMQ.Client.Impl { if (m_closeReason != null) { - throw new AlreadyClosedException(m_closeReason); + if (!m_connection.Protocol.CanSendWhileClosed(cmd)) + throw new AlreadyClosedException(m_closeReason); } // We transmit *inside* the lock to avoid interleaving // of frames within a channel. @@ -174,6 +181,11 @@ namespace RabbitMQ.Client.Impl } public void Close(ShutdownEventArgs reason) + { + Close(reason, true); + } + + public void Close(ShutdownEventArgs reason, bool notify) { lock (m_shutdownLock) { @@ -182,7 +194,19 @@ namespace RabbitMQ.Client.Impl m_closeReason = reason; } } - + if (notify) + OnSessionShutdown(m_closeReason); + } + + public void Notify() + { + // Ensure that we notify only when session is already closed + // If not, throw exception, since this is a serious bug in the library + lock (m_shutdownLock) + { + if (m_closeReason == null) + throw new Exception("Internal Error in Session.Close"); + } OnSessionShutdown(m_closeReason); } } diff --git a/mcs/class/RabbitMQ.Client/src/client/impl/SessionManager.cs b/mcs/class/RabbitMQ.Client/src/client/impl/SessionManager.cs index 5ac3100a10b..f8e52853469 100644 --- a/mcs/class/RabbitMQ.Client/src/client/impl/SessionManager.cs +++ b/mcs/class/RabbitMQ.Client/src/client/impl/SessionManager.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // diff --git a/mcs/class/RabbitMQ.Client/src/client/impl/ShutdownContinuation.cs b/mcs/class/RabbitMQ.Client/src/client/impl/ShutdownContinuation.cs index 44d5e14e45e..2604a03f4e6 100644 --- a/mcs/class/RabbitMQ.Client/src/client/impl/ShutdownContinuation.cs +++ b/mcs/class/RabbitMQ.Client/src/client/impl/ShutdownContinuation.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // diff --git a/mcs/class/RabbitMQ.Client/src/client/impl/SimpleBlockingRpcContinuation.cs b/mcs/class/RabbitMQ.Client/src/client/impl/SimpleBlockingRpcContinuation.cs index 923fb3ad0c2..dde577a71a6 100644 --- a/mcs/class/RabbitMQ.Client/src/client/impl/SimpleBlockingRpcContinuation.cs +++ b/mcs/class/RabbitMQ.Client/src/client/impl/SimpleBlockingRpcContinuation.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // diff --git a/mcs/class/RabbitMQ.Client/src/client/impl/SocketFrameHandler_0_9.cs b/mcs/class/RabbitMQ.Client/src/client/impl/SocketFrameHandler_0_9.cs index 96614656269..9d37bc7c772 100644 --- a/mcs/class/RabbitMQ.Client/src/client/impl/SocketFrameHandler_0_9.cs +++ b/mcs/class/RabbitMQ.Client/src/client/impl/SocketFrameHandler_0_9.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // @@ -72,6 +78,8 @@ namespace RabbitMQ.Client.Impl m_endpoint = endpoint; m_socket = new TcpClient(); m_socket.Connect(endpoint.HostName, endpoint.Port); + // disable Nagle's algorithm, for more consistently low latency + m_socket.NoDelay = true; Stream netstream = m_socket.GetStream(); m_reader = new NetworkBinaryReader(netstream); diff --git a/mcs/class/RabbitMQ.Client/src/client/impl/SoftProtocolException.cs b/mcs/class/RabbitMQ.Client/src/client/impl/SoftProtocolException.cs index 34e08267a8f..88f2ad41590 100644 --- a/mcs/class/RabbitMQ.Client/src/client/impl/SoftProtocolException.cs +++ b/mcs/class/RabbitMQ.Client/src/client/impl/SoftProtocolException.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // diff --git a/mcs/class/RabbitMQ.Client/src/client/impl/StreamProperties.cs b/mcs/class/RabbitMQ.Client/src/client/impl/StreamProperties.cs index 170920de361..5bb70bf2813 100644 --- a/mcs/class/RabbitMQ.Client/src/client/impl/StreamProperties.cs +++ b/mcs/class/RabbitMQ.Client/src/client/impl/StreamProperties.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // diff --git a/mcs/class/RabbitMQ.Client/src/client/impl/SyntaxError.cs b/mcs/class/RabbitMQ.Client/src/client/impl/SyntaxError.cs index 300844e626d..ebcac39153f 100644 --- a/mcs/class/RabbitMQ.Client/src/client/impl/SyntaxError.cs +++ b/mcs/class/RabbitMQ.Client/src/client/impl/SyntaxError.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // diff --git a/mcs/class/RabbitMQ.Client/src/client/impl/UnexpectedFrameException.cs b/mcs/class/RabbitMQ.Client/src/client/impl/UnexpectedFrameException.cs index a1c36aa4885..86bbb6a0446 100644 --- a/mcs/class/RabbitMQ.Client/src/client/impl/UnexpectedFrameException.cs +++ b/mcs/class/RabbitMQ.Client/src/client/impl/UnexpectedFrameException.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // diff --git a/mcs/class/RabbitMQ.Client/src/client/impl/UnknownClassOrMethodException.cs b/mcs/class/RabbitMQ.Client/src/client/impl/UnknownClassOrMethodException.cs index bf2d8e5ddc8..0428408840c 100644 --- a/mcs/class/RabbitMQ.Client/src/client/impl/UnknownClassOrMethodException.cs +++ b/mcs/class/RabbitMQ.Client/src/client/impl/UnknownClassOrMethodException.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // diff --git a/mcs/class/RabbitMQ.Client/src/client/impl/WireFormatting.cs b/mcs/class/RabbitMQ.Client/src/client/impl/WireFormatting.cs index 691d9402a2e..0defc4ea62c 100644 --- a/mcs/class/RabbitMQ.Client/src/client/impl/WireFormatting.cs +++ b/mcs/class/RabbitMQ.Client/src/client/impl/WireFormatting.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // diff --git a/mcs/class/RabbitMQ.Client/src/client/impl/v0_8/Connection.cs b/mcs/class/RabbitMQ.Client/src/client/impl/v0_8/Connection.cs index ba6a8f3eeaf..1fdbe83fe81 100644 --- a/mcs/class/RabbitMQ.Client/src/client/impl/v0_8/Connection.cs +++ b/mcs/class/RabbitMQ.Client/src/client/impl/v0_8/Connection.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // diff --git a/mcs/class/RabbitMQ.Client/src/client/impl/v0_8/ProtocolBase.cs b/mcs/class/RabbitMQ.Client/src/client/impl/v0_8/ProtocolBase.cs index 5f95f92781b..71a1e977aba 100644 --- a/mcs/class/RabbitMQ.Client/src/client/impl/v0_8/ProtocolBase.cs +++ b/mcs/class/RabbitMQ.Client/src/client/impl/v0_8/ProtocolBase.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // @@ -54,7 +60,6 @@ using RabbitMQ.Util; namespace RabbitMQ.Client.Framing.Impl.v0_8 { public abstract class ProtocolBase: AbstractProtocolBase { - public override bool DefaultSuppressAccessRequest { get { return false; } } public override IFrameHandler CreateFrameHandler(AmqpTcpEndpoint endpoint) { return new SocketFrameHandler_0_9(endpoint); @@ -96,5 +101,10 @@ namespace RabbitMQ.Client.Framing.Impl.v0_8 { replyClassId = RabbitMQ.Client.Framing.Impl.v0_8.ChannelCloseOk.ClassId; replyMethodId = RabbitMQ.Client.Framing.Impl.v0_8.ChannelCloseOk.MethodId; } + + public override bool CanSendWhileClosed(Command cmd) + { + return cmd.m_method is RabbitMQ.Client.Framing.Impl.v0_8.ChannelCloseOk; + } } } diff --git a/mcs/class/RabbitMQ.Client/src/client/impl/v0_8qpid/Connection.cs b/mcs/class/RabbitMQ.Client/src/client/impl/v0_8qpid/Connection.cs index cb612a93cb7..22280b26bad 100644 --- a/mcs/class/RabbitMQ.Client/src/client/impl/v0_8qpid/Connection.cs +++ b/mcs/class/RabbitMQ.Client/src/client/impl/v0_8qpid/Connection.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // diff --git a/mcs/class/RabbitMQ.Client/src/client/impl/v0_8qpid/ProtocolBase.cs b/mcs/class/RabbitMQ.Client/src/client/impl/v0_8qpid/ProtocolBase.cs index 9e4a88ea508..550951a559d 100644 --- a/mcs/class/RabbitMQ.Client/src/client/impl/v0_8qpid/ProtocolBase.cs +++ b/mcs/class/RabbitMQ.Client/src/client/impl/v0_8qpid/ProtocolBase.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // @@ -54,7 +60,6 @@ using RabbitMQ.Util; namespace RabbitMQ.Client.Framing.Impl.v0_8qpid { public abstract class ProtocolBase: AbstractProtocolBase { - public override bool DefaultSuppressAccessRequest { get { return true; } } public override IFrameHandler CreateFrameHandler(AmqpTcpEndpoint endpoint) { return new SocketFrameHandler_0_9(endpoint); @@ -96,5 +101,10 @@ namespace RabbitMQ.Client.Framing.Impl.v0_8qpid { replyClassId = RabbitMQ.Client.Framing.Impl.v0_8qpid.ChannelCloseOk.ClassId; replyMethodId = RabbitMQ.Client.Framing.Impl.v0_8qpid.ChannelCloseOk.MethodId; } + + public override bool CanSendWhileClosed(Command cmd) + { + return cmd.m_method is RabbitMQ.Client.Framing.Impl.v0_8qpid.ChannelCloseOk; + } } } diff --git a/mcs/class/RabbitMQ.Client/src/client/impl/v0_9/Connection.cs b/mcs/class/RabbitMQ.Client/src/client/impl/v0_9/Connection.cs index e094362927a..b30b01f94c5 100644 --- a/mcs/class/RabbitMQ.Client/src/client/impl/v0_9/Connection.cs +++ b/mcs/class/RabbitMQ.Client/src/client/impl/v0_9/Connection.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // diff --git a/mcs/class/RabbitMQ.Client/src/client/impl/v0_9/ProtocolBase.cs b/mcs/class/RabbitMQ.Client/src/client/impl/v0_9/ProtocolBase.cs index 4bbfae07f9b..bc6a01049da 100644 --- a/mcs/class/RabbitMQ.Client/src/client/impl/v0_9/ProtocolBase.cs +++ b/mcs/class/RabbitMQ.Client/src/client/impl/v0_9/ProtocolBase.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // @@ -54,7 +60,6 @@ using RabbitMQ.Util; namespace RabbitMQ.Client.Framing.Impl.v0_9 { public abstract class ProtocolBase: AbstractProtocolBase { - public override bool DefaultSuppressAccessRequest { get { return false; } } public override IFrameHandler CreateFrameHandler(AmqpTcpEndpoint endpoint) { return new SocketFrameHandler_0_9(endpoint); @@ -96,5 +101,10 @@ namespace RabbitMQ.Client.Framing.Impl.v0_9 { replyClassId = RabbitMQ.Client.Framing.Impl.v0_9.ChannelCloseOk.ClassId; replyMethodId = RabbitMQ.Client.Framing.Impl.v0_9.ChannelCloseOk.MethodId; } + + public override bool CanSendWhileClosed(Command cmd) + { + return cmd.m_method is RabbitMQ.Client.Framing.Impl.v0_9.ChannelCloseOk; + } } } diff --git a/mcs/class/RabbitMQ.Client/src/client/messagepatterns/SimpleRpcClient.cs b/mcs/class/RabbitMQ.Client/src/client/messagepatterns/SimpleRpcClient.cs index 8d2bb10c316..c1cb54fa9a1 100644 --- a/mcs/class/RabbitMQ.Client/src/client/messagepatterns/SimpleRpcClient.cs +++ b/mcs/class/RabbitMQ.Client/src/client/messagepatterns/SimpleRpcClient.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // @@ -78,9 +84,8 @@ namespace RabbitMQ.Client.MessagePatterns { /// using (IConnection conn = new ConnectionFactory() /// .CreateConnection(serverAddress)) { /// using (IModel ch = conn.CreateModel()) { - /// ushort ticket = ch.AccessRequest("/data"); /// SimpleRpcClient client = - /// new SimpleRpcClient(ch, ticket, queueName); + /// new SimpleRpcClient(ch, queueName); /// client.TimeoutMilliseconds = 5000; // optional /// /// /// ... make use of the various Call() overloads @@ -125,15 +130,12 @@ namespace RabbitMQ.Client.MessagePatterns { public event EventHandler Disconnected; protected IModel m_model; - protected ushort m_ticket; protected Subscription m_subscription; private PublicationAddress m_address; private int m_timeout; ///Retrieve the IModel this instance uses to communicate. public IModel Model { get { return m_model; } } - ///Retrieve the ticket this instance uses to take AMQP actions. - public ushort Ticket { get { return m_ticket; } } ///Retrieve the Subscription that is used to receive ///RPC replies corresponding to Call() RPC requests. May be @@ -185,29 +187,28 @@ namespace RabbitMQ.Client.MessagePatterns { ///Construct an instance with no configured ///Address. The Address property must be set before Call() or ///Cast() are called. - public SimpleRpcClient(IModel model, ushort ticket) - : this(model, ticket, (PublicationAddress) null) {} + public SimpleRpcClient(IModel model) + : this(model, (PublicationAddress) null) {} ///Construct an instance that will deliver to the ///default exchange (""), with routing key equal to the passed ///in queueName, thereby delivering directly to a named queue ///on the AMQP server. - public SimpleRpcClient(IModel model, ushort ticket, string queueName) - : this(model, ticket, new PublicationAddress(ExchangeType.Direct, "", queueName)) {} + public SimpleRpcClient(IModel model, string queueName) + : this(model, new PublicationAddress(ExchangeType.Direct, "", queueName)) {} ///Construct an instance that will deliver to the ///named and typed exchange, with the given routing ///key. - public SimpleRpcClient(IModel model, ushort ticket, - string exchange, string exchangeType, string routingKey) - : this(model, ticket, new PublicationAddress(exchangeType, exchange, routingKey)) {} + public SimpleRpcClient(IModel model, string exchange, + string exchangeType, string routingKey) + : this(model, new PublicationAddress(exchangeType, exchange, routingKey)) {} ///Construct an instance that will deliver to the ///given address. - public SimpleRpcClient(IModel model, ushort ticket, PublicationAddress address) + public SimpleRpcClient(IModel model, PublicationAddress address) { m_model = model; - m_ticket = ticket; m_address = address; m_subscription = null; m_timeout = Timeout.Infinite; @@ -234,7 +235,7 @@ namespace RabbitMQ.Client.MessagePatterns { protected virtual void EnsureSubscription() { if (m_subscription == null) { - m_subscription = new Subscription(m_model, m_ticket); + m_subscription = new Subscription(m_model); } } @@ -426,8 +427,7 @@ namespace RabbitMQ.Client.MessagePatterns { public virtual void Cast(IBasicProperties requestProperties, byte[] body) { - m_model.BasicPublish(m_ticket, - Address, + m_model.BasicPublish(Address, requestProperties, body); } diff --git a/mcs/class/RabbitMQ.Client/src/client/messagepatterns/SimpleRpcServer.cs b/mcs/class/RabbitMQ.Client/src/client/messagepatterns/SimpleRpcServer.cs index 63b94089b9d..baaf8fb8455 100644 --- a/mcs/class/RabbitMQ.Client/src/client/messagepatterns/SimpleRpcServer.cs +++ b/mcs/class/RabbitMQ.Client/src/client/messagepatterns/SimpleRpcServer.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // @@ -75,8 +81,7 @@ namespace RabbitMQ.Client.MessagePatterns { /// using (IConnection conn = new ConnectionFactory() /// .CreateConnection(serverAddress)) { /// using (IModel ch = conn.CreateModel()) { - /// ushort ticket = ch.AccessRequest("/data"); - /// Subscription sub = new Subscription(ch, ticket, queueName); + /// Subscription sub = new Subscription(ch, queueName); /// new MySimpleRpcServerSubclass(sub).MainLoop(); /// } /// } @@ -256,8 +261,7 @@ namespace RabbitMQ.Client.MessagePatterns { } replyProperties.CorrelationId = properties.CorrelationId; - m_subscription.Model.BasicPublish(m_subscription.Ticket, - replyAddress, + m_subscription.Model.BasicPublish(replyAddress, replyProperties, reply); } else { @@ -269,23 +273,23 @@ namespace RabbitMQ.Client.MessagePatterns { ///Called by HandleCall and HandleCast when a ///"jms/stream-message" request is received. /// - /// - /// The args array contains the values decoded by HandleCall - /// or HandleCast. - /// - /// - /// The replyWriter parameter will be null if we were called - /// from HandleCast, in which case a reply is not expected or - /// possible, or non-null if we were called from - /// HandleCall. Use the methods of replyWriter in this case to - /// assemble your reply, which will be sent back to the remote - /// caller. - /// - /// - /// This default implementation does nothing, which - /// effectively sends back an empty reply to any and all - /// remote callers. - /// + /// + /// The args array contains the values decoded by HandleCall + /// or HandleCast. + /// + /// + /// The replyWriter parameter will be null if we were called + /// from HandleCast, in which case a reply is not expected or + /// possible, or non-null if we were called from + /// HandleCall. Use the methods of replyWriter in this case to + /// assemble your reply, which will be sent back to the remote + /// caller. + /// + /// + /// This default implementation does nothing, which + /// effectively sends back an empty reply to any and all + /// remote callers. + /// /// public virtual void HandleStreamMessageCall(IStreamMessageBuilder replyWriter, bool isRedelivered, @@ -298,29 +302,29 @@ namespace RabbitMQ.Client.MessagePatterns { ///Called by ProcessRequest(), this is the most ///general method that handles RPC-style requests. /// - /// - /// This method should map requestProperties and body to - /// replyProperties and the returned byte array. - /// - /// - /// The default implementation checks - /// requestProperties.ContentType, and if it is - /// "jms/stream-message" (i.e. the current value of - /// StreamMessageBuilder.MimeType), parses it using - /// StreamMessageReader and delegates to - /// HandleStreamMessageCall before encoding and returning the - /// reply. If the ContentType is any other value, the request - /// is passed to HandleSimpleCall instead. - /// - /// - /// The isRedelivered flag is true when the server knows for - /// sure that it has tried to send this request previously - /// (although not necessarily to this application). It is not - /// a reliable indicator of previous receipt, however - the - /// only claim it makes is that a delivery attempt was made, - /// not that the attempt succeeded. Be careful if you choose - /// to use the isRedelivered flag. - /// + /// + /// This method should map requestProperties and body to + /// replyProperties and the returned byte array. + /// + /// + /// The default implementation checks + /// requestProperties.ContentType, and if it is + /// "jms/stream-message" (i.e. the current value of + /// StreamMessageBuilder.MimeType), parses it using + /// StreamMessageReader and delegates to + /// HandleStreamMessageCall before encoding and returning the + /// reply. If the ContentType is any other value, the request + /// is passed to HandleSimpleCall instead. + /// + /// + /// The isRedelivered flag is true when the server knows for + /// sure that it has tried to send this request previously + /// (although not necessarily to this application). It is not + /// a reliable indicator of previous receipt, however - the + /// only claim it makes is that a delivery attempt was made, + /// not that the attempt succeeded. Be careful if you choose + /// to use the isRedelivered flag. + /// /// public virtual byte[] HandleCall(bool isRedelivered, IBasicProperties requestProperties, @@ -347,13 +351,13 @@ namespace RabbitMQ.Client.MessagePatterns { ///Called by the default HandleCall() implementation ///as a fallback. /// - /// If the MIME ContentType of the request did not match any - /// of the types specially recognised - /// (e.g. "jms/stream-message"), this method is called instead - /// with the raw bytes of the request. It should fill in - /// replyProperties (or set it to null) and return a byte - /// array to send back to the remote caller as a reply - /// message. + /// If the MIME ContentType of the request did not match any + /// of the types specially recognised + /// (e.g. "jms/stream-message"), this method is called instead + /// with the raw bytes of the request. It should fill in + /// replyProperties (or set it to null) and return a byte + /// array to send back to the remote caller as a reply + /// message. /// public virtual byte[] HandleSimpleCall(bool isRedelivered, IBasicProperties requestProperties, @@ -369,26 +373,26 @@ namespace RabbitMQ.Client.MessagePatterns { ///general method that handles asynchronous, one-way ///requests. /// - /// - /// The default implementation checks - /// requestProperties.ContentType, and if it is - /// "jms/stream-message" (i.e. the current value of - /// StreamMessageBuilder.MimeType), parses it using - /// StreamMessageReader and delegates to - /// HandleStreamMessageCall, passing in null as the - /// replyWriter parameter to indicate that no reply is desired - /// or possible. If the ContentType is any other value, the - /// request is passed to HandleSimpleCast instead. - /// - /// - /// The isRedelivered flag is true when the server knows for - /// sure that it has tried to send this request previously - /// (although not necessarily to this application). It is not - /// a reliable indicator of previous receipt, however - the - /// only claim it makes is that a delivery attempt was made, - /// not that the attempt succeeded. Be careful if you choose - /// to use the isRedelivered flag. - /// + /// + /// The default implementation checks + /// requestProperties.ContentType, and if it is + /// "jms/stream-message" (i.e. the current value of + /// StreamMessageBuilder.MimeType), parses it using + /// StreamMessageReader and delegates to + /// HandleStreamMessageCall, passing in null as the + /// replyWriter parameter to indicate that no reply is desired + /// or possible. If the ContentType is any other value, the + /// request is passed to HandleSimpleCast instead. + /// + /// + /// The isRedelivered flag is true when the server knows for + /// sure that it has tried to send this request previously + /// (although not necessarily to this application). It is not + /// a reliable indicator of previous receipt, however - the + /// only claim it makes is that a delivery attempt was made, + /// not that the attempt succeeded. Be careful if you choose + /// to use the isRedelivered flag. + /// /// public virtual void HandleCast(bool isRedelivered, IBasicProperties requestProperties, @@ -410,10 +414,10 @@ namespace RabbitMQ.Client.MessagePatterns { ///Called by the default HandleCast() implementation ///as a fallback. /// - /// If the MIME ContentType of the request did not match any - /// of the types specially recognised - /// (e.g. "jms/stream-message"), this method is called instead - /// with the raw bytes of the request. + /// If the MIME ContentType of the request did not match any + /// of the types specially recognised + /// (e.g. "jms/stream-message"), this method is called instead + /// with the raw bytes of the request. /// public virtual void HandleSimpleCast(bool isRedelivered, IBasicProperties requestProperties, diff --git a/mcs/class/RabbitMQ.Client/src/client/messagepatterns/Subscription.cs b/mcs/class/RabbitMQ.Client/src/client/messagepatterns/Subscription.cs index 202c14a9ec3..956fb360ecd 100644 --- a/mcs/class/RabbitMQ.Client/src/client/messagepatterns/Subscription.cs +++ b/mcs/class/RabbitMQ.Client/src/client/messagepatterns/Subscription.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // @@ -87,12 +93,9 @@ namespace RabbitMQ.Client.MessagePatterns { /// public class Subscription: IEnumerable, IEnumerator, IDisposable { protected IModel m_model; - protected ushort m_ticket; ///Retrieve the IModel our subscription is carried by. public IModel Model { get { return m_model; } } - ///Retrieve the ticket we use for all our server operations. - public ushort Ticket { get { return m_ticket; } } protected string m_queueName; protected QueueingBasicConsumer m_consumer; @@ -135,9 +138,9 @@ namespace RabbitMQ.Client.MessagePatterns { ///property of the Subscription. After creating the queue, the ///queue is bound to the named exchange, using Bind() with the ///given routingKey bind parameter. - public Subscription(IModel model, ushort ticket, - string exchangeName, string exchangeType, string routingKey) - : this(model, ticket) + public Subscription(IModel model, string exchangeName, + string exchangeType, string routingKey) + : this(model) { Bind(exchangeName, exchangeType, routingKey); } @@ -146,8 +149,8 @@ namespace RabbitMQ.Client.MessagePatterns { ///consuming from a fresh, autodelete, anonymous queue. The ///name of the queue can be retrieved using the QueueName ///property of the Subscription. - public Subscription(IModel model, ushort ticket) - : this(model, ticket, null) {} + public Subscription(IModel model) + : this(model, null) {} ///Creates a new Subscription in "noAck" mode, ///consuming from a named queue. If the queueName parameter is @@ -157,9 +160,9 @@ namespace RabbitMQ.Client.MessagePatterns { ///called. After declaring the queue and starting the ///consumer, the queue is bound to the named exchange, using ///Bind() with the given routingKey bind parameter. - public Subscription(IModel model, ushort ticket, string queueName, - string exchangeName, string exchangeType, string routingKey) - : this(model, ticket, queueName) + public Subscription(IModel model, string queueName, string exchangeName, + string exchangeType, string routingKey) + : this(model, queueName) { Bind(exchangeName, exchangeType, routingKey); } @@ -170,8 +173,8 @@ namespace RabbitMQ.Client.MessagePatterns { ///anonymous queue; otherwise, the queue is declared using ///IModel.QueueDeclare() before IModel.BasicConsume() is ///called. - public Subscription(IModel model, ushort ticket, string queueName) - : this(model, ticket, queueName, true) {} + public Subscription(IModel model, string queueName) + : this(model, queueName, true) {} ///Creates a new Subscription, with full control over ///both "noAck" mode and the name of the queue (which, if null @@ -180,9 +183,9 @@ namespace RabbitMQ.Client.MessagePatterns { ///queue and starting the consumer, the queue is bound to the ///named exchange, using Bind() with the given routingKey bind ///parameter. - public Subscription(IModel model, ushort ticket, string queueName, bool noAck, + public Subscription(IModel model, string queueName, bool noAck, string exchangeName, string exchangeType, string routingKey) - : this(model, ticket, queueName, noAck) + : this(model, queueName, noAck) { Bind(exchangeName, exchangeType, routingKey); } @@ -191,19 +194,18 @@ namespace RabbitMQ.Client.MessagePatterns { ///both "noAck" mode and the name of the queue (which, if null ///or the empty-string, will be a fresh autodelete queue, as ///for the other constructor overloads). - public Subscription(IModel model, ushort ticket, string queueName, bool noAck) + public Subscription(IModel model, string queueName, bool noAck) { m_model = model; - m_ticket = ticket; if (queueName == null || queueName.Equals("")) { - m_queueName = m_model.QueueDeclare(ticket); + m_queueName = m_model.QueueDeclare(); m_shouldDelete = true; } else { - m_queueName = m_model.QueueDeclare(ticket, queueName); + m_queueName = m_model.QueueDeclare(queueName); m_shouldDelete = false; } m_consumer = new QueueingBasicConsumer(m_model); - m_consumerTag = m_model.BasicConsume(m_ticket, m_queueName, m_noAck, null, m_consumer); + m_consumerTag = m_model.BasicConsume(m_queueName, m_noAck, null, m_consumer); m_latestEvent = null; } @@ -225,7 +227,7 @@ namespace RabbitMQ.Client.MessagePatterns { // We set m_shouldDelete false before attempting // the delete, because trying twice is worse than // trying once and failing. - m_model.QueueDelete(m_ticket, m_queueName, false, false, false); + m_model.QueueDelete(m_queueName, false, false, false); } } catch (OperationInterruptedException) { // We don't mind, here. @@ -254,8 +256,8 @@ namespace RabbitMQ.Client.MessagePatterns { /// public void Bind(string exchangeName, string exchangeType, string routingKey) { - m_model.ExchangeDeclare(m_ticket, exchangeName, exchangeType); - m_model.QueueBind(m_ticket, m_queueName, exchangeName, routingKey, false, null); + m_model.ExchangeDeclare(exchangeName, exchangeType); + m_model.QueueBind(m_queueName, exchangeName, routingKey, false, null); } ///If LatestEvent is non-null, passes it to @@ -296,22 +298,22 @@ namespace RabbitMQ.Client.MessagePatterns { ///Retrieves the next incoming delivery in our ///subscription queue. - /// - /// - /// Returns null when the end of the stream is reached and on + /// + /// + /// Returns null when the end of the stream is reached and on /// every subsequent call. End-of-stream can arise through the /// action of the Subscription.Close() method, or through the /// closure of the IModel or its underlying IConnection. - /// - /// - /// Updates LatestEvent to the value returned. - /// - /// - /// Does not acknowledge any deliveries at all (but in "noAck" + /// + /// + /// Updates LatestEvent to the value returned. + /// + /// + /// Does not acknowledge any deliveries at all (but in "noAck" /// mode, the server will have auto-acknowledged each event /// before it is even sent across the wire to us). - /// - /// + /// + /// public BasicDeliverEventArgs Next() { try { @@ -323,54 +325,53 @@ namespace RabbitMQ.Client.MessagePatterns { } catch (EndOfStreamException) { m_latestEvent = null; } - return m_latestEvent; + return m_latestEvent; } ///Retrieves the next incoming delivery in our ///subscription queue, or times out after a specified number ///of milliseconds. - - /// - /// - /// Returns false only if the timeout expires before either a - /// delivery appears or the end-of-stream is reached. If false - /// is returned, the out parameter "result" is set to null, - /// but LatestEvent is not updated. - /// - /// - /// Returns true to indicate a delivery or the end-of-stream. - /// - /// - /// If a delivery is already waiting in the queue, or one - /// arrives before the timeout expires, it is removed from the - /// queue and placed in the "result" out parameter. If the - /// end-of-stream is detected before the timeout expires, - /// "result" is set to null. - /// - /// - /// Whenever this method returns true, it updates LatestEvent - /// to the value placed in "result" before returning. - /// - /// - /// End-of-stream can arise through the action of the - /// Subscription.Close() method, or through the closure of the - /// IModel or its underlying IConnection. - /// - /// - /// This method does not acknowledge any deliveries at all + /// + /// + /// Returns false only if the timeout expires before either a + /// delivery appears or the end-of-stream is reached. If false + /// is returned, the out parameter "result" is set to null, + /// but LatestEvent is not updated. + /// + /// + /// Returns true to indicate a delivery or the end-of-stream. + /// + /// + /// If a delivery is already waiting in the queue, or one + /// arrives before the timeout expires, it is removed from the + /// queue and placed in the "result" out parameter. If the + /// end-of-stream is detected before the timeout expires, + /// "result" is set to null. + /// + /// + /// Whenever this method returns true, it updates LatestEvent + /// to the value placed in "result" before returning. + /// + /// + /// End-of-stream can arise through the action of the + /// Subscription.Close() method, or through the closure of the + /// IModel or its underlying IConnection. + /// + /// + /// This method does not acknowledge any deliveries at all /// (but in "noAck" mode, the server will have /// auto-acknowledged each event before it is even sent across /// the wire to us). - /// + /// /// - /// A timeout of -1 (i.e. System.Threading.Timeout.Infinite) - /// will be interpreted as a command to wait for an - /// indefinitely long period of time for an item or the end of - /// the stream to become available. Usage of such a timeout is - /// equivalent to calling Next() with no arguments (modulo - /// predictable method signature differences). + /// A timeout of -1 (i.e. System.Threading.Timeout.Infinite) + /// will be interpreted as a command to wait for an + /// indefinitely long period of time for an item or the end of + /// the stream to become available. Usage of such a timeout is + /// equivalent to calling Next() with no arguments (modulo + /// predictable method signature differences). /// - /// + /// public bool Next(int millisecondsTimeout, out BasicDeliverEventArgs result) { try { @@ -378,17 +379,17 @@ namespace RabbitMQ.Client.MessagePatterns { // Closed! throw new InvalidOperationException(); } - object qValue; - if (!m_consumer.Queue.Dequeue(millisecondsTimeout, out qValue)) { - result = null; - return false; - } + object qValue; + if (!m_consumer.Queue.Dequeue(millisecondsTimeout, out qValue)) { + result = null; + return false; + } m_latestEvent = (BasicDeliverEventArgs) qValue; } catch (EndOfStreamException) { m_latestEvent = null; } - result = m_latestEvent; - return true; + result = m_latestEvent; + return true; } ///Implementation of the IEnumerable interface, for diff --git a/mcs/class/RabbitMQ.Client/src/examples/AddClient.cs b/mcs/class/RabbitMQ.Client/src/examples/AddClient.cs index 00b03103b22..361e8b161b2 100644 --- a/mcs/class/RabbitMQ.Client/src/examples/AddClient.cs +++ b/mcs/class/RabbitMQ.Client/src/examples/AddClient.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // @@ -68,14 +74,13 @@ namespace RabbitMQ.Client.Examples { using (IConnection conn = new ConnectionFactory().CreateConnection(args[0])) { using (IModel ch = conn.CreateModel()) { - ushort ticket = ch.AccessRequest("/data"); object[] addends = new object[args.Length - 1]; for (int i = 0; i < args.Length - 1; i++) { addends[i] = double.Parse(args[i + 1]); } - SimpleRpcClient client = new SimpleRpcClient(ch, ticket, "AddServer"); + SimpleRpcClient client = new SimpleRpcClient(ch, "AddServer"); client.TimeoutMilliseconds = 5000; client.TimedOut += new EventHandler(TimedOutHandler); client.Disconnected += new EventHandler(DisconnectedHandler); diff --git a/mcs/class/RabbitMQ.Client/src/examples/AddServer.cs b/mcs/class/RabbitMQ.Client/src/examples/AddServer.cs index a2c3c8f66a1..1bb8fb3f1b4 100644 --- a/mcs/class/RabbitMQ.Client/src/examples/AddServer.cs +++ b/mcs/class/RabbitMQ.Client/src/examples/AddServer.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // @@ -69,8 +75,7 @@ namespace RabbitMQ.Client.Examples { using (IConnection conn = new ConnectionFactory().CreateConnection(args[0])) { using (IModel ch = conn.CreateModel()) { - ushort ticket = ch.AccessRequest("/data"); - Subscription sub = new Subscription(ch, ticket, "AddServer"); + Subscription sub = new Subscription(ch, "AddServer"); new AddServer(sub).MainLoop(); } } diff --git a/mcs/class/RabbitMQ.Client/src/examples/DeclareQueue.cs b/mcs/class/RabbitMQ.Client/src/examples/DeclareQueue.cs index a291bdf89bf..4f80a5224dc 100644 --- a/mcs/class/RabbitMQ.Client/src/examples/DeclareQueue.cs +++ b/mcs/class/RabbitMQ.Client/src/examples/DeclareQueue.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // @@ -49,6 +55,7 @@ // //--------------------------------------------------------------------------- using System; +using System.Collections; using System.IO; using System.Text; @@ -64,9 +71,17 @@ namespace RabbitMQ.Client.Examples { int optionIndex = 0; bool durable = false; bool delete = false; + IDictionary arguments = null; while (optionIndex < args.Length) { if (args[optionIndex] == "/durable") { durable = true; } else if (args[optionIndex] == "/delete") { delete = true; } + else if (args[optionIndex].StartsWith("/arg:")) { + if (arguments == null) { arguments = new Hashtable(); } + string[] pieces = args[optionIndex].Split(new Char[] { ':' }); + if (pieces.Length >= 3) { + arguments[pieces[1]] = pieces[2]; + } + } else { break; } optionIndex++; } @@ -79,6 +94,7 @@ namespace RabbitMQ.Client.Examples { Console.Error.WriteLine("Available options:"); Console.Error.WriteLine(" /durable declare a durable queue"); Console.Error.WriteLine(" /delete delete after declaring"); + Console.Error.WriteLine(" /arg:KEY:VAL add longstr entry to arguments table"); return 1; } @@ -88,20 +104,21 @@ namespace RabbitMQ.Client.Examples { using (IConnection conn = new ConnectionFactory().CreateConnection(serverAddress)) { using (IModel ch = conn.CreateModel()) { - ushort ticket = ch.AccessRequest("/data"); - string finalName = ch.QueueDeclare(ticket, inputQueueName, durable); + string finalName = ch.QueueDeclare(inputQueueName, false, + durable, false, false, + false, arguments); Console.WriteLine("{0}\t{1}", finalName, durable); while ((optionIndex + 1) < args.Length) { string exchange = args[optionIndex++]; string routingKey = args[optionIndex++]; - ch.QueueBind(ticket, finalName, exchange, routingKey, false, null); + ch.QueueBind(finalName, exchange, routingKey, false, null); Console.WriteLine("{0}\t{1}\t{2}", finalName, exchange, routingKey); } if (delete) { - ch.QueueDelete(ticket, finalName, false, false, false); + ch.QueueDelete(finalName, false, false, false); } return 0; diff --git a/mcs/class/RabbitMQ.Client/src/examples/ExceptionTest.cs b/mcs/class/RabbitMQ.Client/src/examples/ExceptionTest.cs index da6d7d5459a..ec83bfc6b64 100644 --- a/mcs/class/RabbitMQ.Client/src/examples/ExceptionTest.cs +++ b/mcs/class/RabbitMQ.Client/src/examples/ExceptionTest.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // @@ -82,12 +88,11 @@ namespace RabbitMQ.Client.Examples { ch.ModelShutdown += new ModelShutdownEventHandler(Second); ch.CallbackException += new CallbackExceptionEventHandler(OnCallbackException); - ushort ticket = ch.AccessRequest("/data"); - string queueName = ch.QueueDeclare(ticket); + string queueName = ch.QueueDeclare(); ThrowingConsumer consumer = new ThrowingConsumer(ch); - string consumerTag = ch.BasicConsume(ticket, queueName, null, consumer); - ch.BasicPublish(ticket, "", queueName, null, Encoding.UTF8.GetBytes("test")); + string consumerTag = ch.BasicConsume(queueName, null, consumer); + ch.BasicPublish("", queueName, null, Encoding.UTF8.GetBytes("test")); ch.BasicCancel(consumerTag); return 0; } diff --git a/mcs/class/RabbitMQ.Client/src/examples/LogTail.cs b/mcs/class/RabbitMQ.Client/src/examples/LogTail.cs index 8c829dfb07a..036ce3f12f2 100644 --- a/mcs/class/RabbitMQ.Client/src/examples/LogTail.cs +++ b/mcs/class/RabbitMQ.Client/src/examples/LogTail.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // @@ -78,13 +84,11 @@ namespace RabbitMQ.Client.Examples { using (IConnection conn = new ConnectionFactory().CreateConnection(serverAddress)) { using (IModel ch = conn.CreateModel()) { - ushort ticket = ch.AccessRequest("/data"); - Subscription sub; if (exchange == "") { - sub = new Subscription(ch, ticket, routingKey); + sub = new Subscription(ch, routingKey); } else { - sub = new Subscription(ch, ticket, exchange, exchangeType, routingKey); + sub = new Subscription(ch, exchange, exchangeType, routingKey); } Console.WriteLine("Consumer tag: " + sub.ConsumerTag); diff --git a/mcs/class/RabbitMQ.Client/src/examples/SendMap.cs b/mcs/class/RabbitMQ.Client/src/examples/SendMap.cs index 6c7661942c1..c6c2732494a 100644 --- a/mcs/class/RabbitMQ.Client/src/examples/SendMap.cs +++ b/mcs/class/RabbitMQ.Client/src/examples/SendMap.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // @@ -96,12 +102,11 @@ namespace RabbitMQ.Client.Examples { Console.Error.WriteLine(" /persist send message in 'persistent' mode"); return 1; } - - Uri uri = new Uri(args[optionIndex++]); + + Uri uri = new Uri(args[optionIndex++]); string exchange = uri.Segments[1].TrimEnd(new char[] { '/' }); - string exchangeType = - uri.Query.StartsWith("?type=") ? uri.Query.Substring(6) : null; - string routingKey = uri.Segments.Length > 2 ? uri.Segments[2] : ""; + string exchangeType = uri.Query.StartsWith("?type=") ? uri.Query.Substring(6) : null; + string routingKey = uri.Segments.Length > 2 ? uri.Segments[2] : ""; if (exchange == "amq.default") { exchange = ""; @@ -110,10 +115,9 @@ namespace RabbitMQ.Client.Examples { using (IConnection conn = new ConnectionFactory().CreateConnection(uri)) { using (IModel ch = conn.CreateModel()) { - ushort ticket = ch.AccessRequest("/data"); if (exchangeType != null) { - ch.ExchangeDeclare(ticket, exchange, exchangeType); + ch.ExchangeDeclare(exchange, exchangeType); } IMapMessageBuilder b = new MapMessageBuilder(ch); @@ -182,8 +186,7 @@ namespace RabbitMQ.Client.Examples { if (persistMode) { ((IBasicProperties) b.GetContentHeader()).DeliveryMode = 2; } - ch.BasicPublish(ticket, - exchange, + ch.BasicPublish(exchange, routingKey, (IBasicProperties) b.GetContentHeader(), b.GetContentBody()); diff --git a/mcs/class/RabbitMQ.Client/src/examples/SendString.cs b/mcs/class/RabbitMQ.Client/src/examples/SendString.cs index 3d5106a5453..4098c169d57 100644 --- a/mcs/class/RabbitMQ.Client/src/examples/SendString.cs +++ b/mcs/class/RabbitMQ.Client/src/examples/SendString.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // @@ -72,13 +78,11 @@ namespace RabbitMQ.Client.Examples { using (IConnection conn = new ConnectionFactory().CreateConnection(serverAddress)) { using (IModel ch = conn.CreateModel()) { - ushort ticket = ch.AccessRequest("/data"); if (exchange != "") { - ch.ExchangeDeclare(ticket, exchange, exchangeType); + ch.ExchangeDeclare(exchange, exchangeType); } - ch.BasicPublish(ticket, - exchange, + ch.BasicPublish(exchange, routingKey, null, Encoding.UTF8.GetBytes(message)); diff --git a/mcs/class/RabbitMQ.Client/src/examples/SingleGet.cs b/mcs/class/RabbitMQ.Client/src/examples/SingleGet.cs index b3f1778b045..26bb43e895c 100644 --- a/mcs/class/RabbitMQ.Client/src/examples/SingleGet.cs +++ b/mcs/class/RabbitMQ.Client/src/examples/SingleGet.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // @@ -74,10 +80,9 @@ namespace RabbitMQ.Client.Examples { using (IModel ch = conn.CreateModel()) { conn.AutoClose = true; - ushort ticket = ch.AccessRequest("/data"); - ch.QueueDeclare(ticket, queueName); - BasicGetResult result = ch.BasicGet(ticket, queueName, false); + ch.QueueDeclare(queueName); + BasicGetResult result = ch.BasicGet(queueName, false); if (result == null) { Console.WriteLine("No message available."); } else { diff --git a/mcs/class/RabbitMQ.Client/src/util/BlockingCell.cs b/mcs/class/RabbitMQ.Client/src/util/BlockingCell.cs index 0bde4a6328c..be2b64c9300 100644 --- a/mcs/class/RabbitMQ.Client/src/util/BlockingCell.cs +++ b/mcs/class/RabbitMQ.Client/src/util/BlockingCell.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // diff --git a/mcs/class/RabbitMQ.Client/src/util/DebugUtil.cs b/mcs/class/RabbitMQ.Client/src/util/DebugUtil.cs index 8330066eef7..56b49565885 100644 --- a/mcs/class/RabbitMQ.Client/src/util/DebugUtil.cs +++ b/mcs/class/RabbitMQ.Client/src/util/DebugUtil.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // diff --git a/mcs/class/RabbitMQ.Client/src/util/Either.cs b/mcs/class/RabbitMQ.Client/src/util/Either.cs index 5bf6d9fa990..492fb30dd4b 100644 --- a/mcs/class/RabbitMQ.Client/src/util/Either.cs +++ b/mcs/class/RabbitMQ.Client/src/util/Either.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // diff --git a/mcs/class/RabbitMQ.Client/src/util/NetworkBinaryReader.cs b/mcs/class/RabbitMQ.Client/src/util/NetworkBinaryReader.cs index ca9470628fe..5d247a06119 100644 --- a/mcs/class/RabbitMQ.Client/src/util/NetworkBinaryReader.cs +++ b/mcs/class/RabbitMQ.Client/src/util/NetworkBinaryReader.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // diff --git a/mcs/class/RabbitMQ.Client/src/util/NetworkBinaryWriter.cs b/mcs/class/RabbitMQ.Client/src/util/NetworkBinaryWriter.cs index 17963d63140..2e1399142a8 100644 --- a/mcs/class/RabbitMQ.Client/src/util/NetworkBinaryWriter.cs +++ b/mcs/class/RabbitMQ.Client/src/util/NetworkBinaryWriter.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // diff --git a/mcs/class/RabbitMQ.Client/src/util/Semaphore.cs b/mcs/class/RabbitMQ.Client/src/util/Semaphore.cs index f13968a39f4..9195a900a2c 100644 --- a/mcs/class/RabbitMQ.Client/src/util/Semaphore.cs +++ b/mcs/class/RabbitMQ.Client/src/util/Semaphore.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // diff --git a/mcs/class/RabbitMQ.Client/src/util/SharedQueue.cs b/mcs/class/RabbitMQ.Client/src/util/SharedQueue.cs index 14fe3f16c74..1d45d968bc3 100644 --- a/mcs/class/RabbitMQ.Client/src/util/SharedQueue.cs +++ b/mcs/class/RabbitMQ.Client/src/util/SharedQueue.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // diff --git a/mcs/class/RabbitMQ.Client/src/util/XmlUtil.cs b/mcs/class/RabbitMQ.Client/src/util/XmlUtil.cs index 540d2425fd5..576c2933a37 100644 --- a/mcs/class/RabbitMQ.Client/src/util/XmlUtil.cs +++ b/mcs/class/RabbitMQ.Client/src/util/XmlUtil.cs @@ -4,7 +4,7 @@ // The APL v2.0: // //--------------------------------------------------------------------------- -// Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial +// Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial // Technologies LLC., and Rabbit Technologies Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,13 +35,19 @@ // // The Original Code is The RabbitMQ .NET Client. // -// The Initial Developers of the Original Code are LShift Ltd., -// Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +// The Initial Developers of the Original Code are LShift Ltd, +// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. // -// Portions created by LShift Ltd., Cohesive Financial Technologies -// LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008 -// LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -// Technologies Ltd.; +// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +// Technologies LLC, and Rabbit Technologies Ltd. +// +// Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +// Ltd. Portions created by Cohesive Financial Technologies LLC are +// Copyright (C) 2007-2009 Cohesive Financial Technologies +// LLC. Portions created by Rabbit Technologies Ltd are Copyright +// (C) 2007-2009 Rabbit Technologies Ltd. // // All Rights Reserved. // -- 2.25.1