From 47a327ab83779698d68055d2600af3ed088ef48f Mon Sep 17 00:00:00 2001 From: "Hiram R. Chirino" Date: Sun, 5 Mar 2006 08:28:53 +0000 Subject: [PATCH] Some more refactors: Moving the jms type interfaces to the JMS namespace, hopefully this will be come a standardized set of interfaces for dotnet in the furture. git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@383295 13f79535-47bb-0310-9956-ffa450edef68 --- .../src/ActiveMQ/BrokerException.cs | 53 - .../Commands/ActiveMQBytesMessage.cs | 68 +- .../Commands/ActiveMQDestination.cs | 1058 +++++++++-------- .../Commands/ActiveMQMapMessage.cs | 131 +- .../Commands/ActiveMQMessage.cs | 626 +++++----- .../Commands/ActiveMQObjectMessage.cs | 110 +- .../{OpenWire => }/Commands/ActiveMQQueue.cs | 114 +- .../Commands/ActiveMQStreamMessage.cs | 86 +- .../Commands/ActiveMQTempDestination.cs | 24 +- .../Commands/ActiveMQTempQueue.cs | 116 +- .../Commands/ActiveMQTempTopic.cs | 116 +- .../Commands/ActiveMQTextMessage.cs | 185 +-- .../{OpenWire => }/Commands/ActiveMQTopic.cs | 114 +- .../{OpenWire => }/Commands/BaseCommand.cs | 100 +- .../{OpenWire => }/Commands/BrokerId.cs | 170 +-- .../{OpenWire => }/Commands/BrokerInfo.cs | 190 +-- .../Commands/ConnectionError.cs | 142 +-- .../{OpenWire => }/Commands/ConnectionId.cs | 170 +-- .../{OpenWire => }/Commands/ConnectionInfo.cs | 190 +-- .../{OpenWire => }/Commands/ConsumerId.cs | 210 ++-- .../{OpenWire => }/Commands/ConsumerInfo.cs | 334 +++--- .../{OpenWire => }/Commands/ControlCommand.cs | 126 +- .../Commands/DataArrayResponse.cs | 126 +- .../{OpenWire => }/Commands/DataResponse.cs | 126 +- .../Commands/DestinationInfo.cs | 190 +-- .../{OpenWire => }/Commands/DiscoveryEvent.cs | 142 +-- .../Commands/ExceptionResponse.cs | 126 +- .../{OpenWire => }/Commands/FlushCommand.cs | 110 +- .../Commands/IntegerResponse.cs | 126 +- .../Commands/JournalQueueAck.cs | 142 +-- .../Commands/JournalTopicAck.cs | 206 ++-- .../{OpenWire => }/Commands/JournalTrace.cs | 126 +- .../Commands/JournalTransaction.cs | 158 +-- .../{OpenWire => }/Commands/KeepAliveInfo.cs | 110 +- .../Commands/LocalTransactionId.cs | 190 +-- .../{OpenWire => }/Commands/Message.cs | 510 ++++---- .../{OpenWire => }/Commands/MessageAck.cs | 222 ++-- .../Commands/MessageDispatch.cs | 174 +-- .../Commands/MessageDispatchNotification.cs | 4 +- .../{OpenWire => }/Commands/MessageId.cs | 210 ++-- .../{OpenWire => }/Commands/ProducerId.cs | 210 ++-- .../{OpenWire => }/Commands/ProducerInfo.cs | 158 +-- .../{OpenWire => }/Commands/RemoveInfo.cs | 126 +- .../Commands/RemoveSubscriptionInfo.cs | 158 +-- .../{OpenWire => }/Commands/Response.cs | 126 +- .../{OpenWire => }/Commands/SessionId.cs | 190 +-- .../{OpenWire => }/Commands/SessionInfo.cs | 126 +- .../{OpenWire => }/Commands/ShutdownInfo.cs | 110 +- .../Commands/SubscriptionInfo.cs | 174 +-- .../{OpenWire => }/Commands/TransactionId.cs | 150 +-- .../Commands/TransactionInfo.cs | 158 +-- .../{OpenWire => }/Commands/WireFormatInfo.cs | 222 ++-- .../Commands/XATransactionId.cs | 210 ++-- openwire-dotnet/src/ActiveMQ/Connection.cs | 8 +- .../src/ActiveMQ/ConnectionClosedException.cs | 1 - .../src/ActiveMQ/ConnectionFactory.cs | 7 +- .../src/ActiveMQ/ConsumerClosedException.cs | 1 - .../src/ActiveMQ/DestinationFilter.cs | 4 +- .../src/ActiveMQ/MessageConsumer.cs | 8 +- .../src/ActiveMQ/MessageProducer.cs | 6 +- .../src/ActiveMQ/OpenWire/AbstractCommand.cs | 3 +- .../OpenWire/BaseDataStreamMarshaller.cs | 9 +- .../src/ActiveMQ/OpenWire/BooleanStream.cs | 1 - .../ActiveMQ/OpenWire/DataStructureSupport.cs | 1 - .../src/ActiveMQ/OpenWire/Dispatcher.cs | 6 +- .../src/ActiveMQ/OpenWire/FutureResponse.cs | 3 +- .../OpenWire/MessagePropertyHelper.cs | 4 +- .../src/ActiveMQ/OpenWire/OpenWireFormat.cs | 5 +- .../src/ActiveMQ/OpenWire/PrimitiveMap.cs | 1 + .../V1/ActiveMQBytesMessageMarshaller.cs | 2 +- .../V1/ActiveMQDestinationMarshaller.cs | 2 +- .../V1/ActiveMQMapMessageMarshaller.cs | 2 +- .../OpenWire/V1/ActiveMQMessageMarshaller.cs | 2 +- .../V1/ActiveMQObjectMessageMarshaller.cs | 2 +- .../OpenWire/V1/ActiveMQQueueMarshaller.cs | 2 +- .../V1/ActiveMQStreamMessageMarshaller.cs | 2 +- .../V1/ActiveMQTempDestinationMarshaller.cs | 2 +- .../V1/ActiveMQTempQueueMarshaller.cs | 2 +- .../V1/ActiveMQTempTopicMarshaller.cs | 2 +- .../V1/ActiveMQTextMessageMarshaller.cs | 2 +- .../OpenWire/V1/ActiveMQTopicMarshaller.cs | 2 +- .../OpenWire/V1/BaseCommandMarshaller.cs | 2 +- .../OpenWire/V1/BrokerIdMarshaller.cs | 2 +- .../OpenWire/V1/BrokerInfoMarshaller.cs | 2 +- .../OpenWire/V1/ConnectionErrorMarshaller.cs | 2 +- .../OpenWire/V1/ConnectionIdMarshaller.cs | 2 +- .../OpenWire/V1/ConnectionInfoMarshaller.cs | 2 +- .../OpenWire/V1/ConsumerIdMarshaller.cs | 2 +- .../OpenWire/V1/ConsumerInfoMarshaller.cs | 2 +- .../OpenWire/V1/ControlCommandMarshaller.cs | 2 +- .../V1/DataArrayResponseMarshaller.cs | 2 +- .../OpenWire/V1/DataResponseMarshaller.cs | 2 +- .../V1/DataStructureSupportMarshaller.cs | 1 - .../OpenWire/V1/DestinationInfoMarshaller.cs | 2 +- .../OpenWire/V1/DiscoveryEventMarshaller.cs | 2 +- .../V1/ExceptionResponseMarshaller.cs | 2 +- .../OpenWire/V1/FlushCommandMarshaller.cs | 2 +- .../OpenWire/V1/IntegerResponseMarshaller.cs | 2 +- .../OpenWire/V1/JournalQueueAckMarshaller.cs | 2 +- .../OpenWire/V1/JournalTopicAckMarshaller.cs | 2 +- .../OpenWire/V1/JournalTraceMarshaller.cs | 2 +- .../V1/JournalTransactionMarshaller.cs | 2 +- .../OpenWire/V1/KeepAliveInfoMarshaller.cs | 2 +- .../V1/LocalTransactionIdMarshaller.cs | 2 +- .../ActiveMQ/OpenWire/V1/MarshallerFactory.cs | 180 +-- .../OpenWire/V1/MessageAckMarshaller.cs | 2 +- .../OpenWire/V1/MessageDispatchMarshaller.cs | 2 +- .../MessageDispatchNotificationMarshaller.cs | 2 +- .../OpenWire/V1/MessageIdMarshaller.cs | 2 +- .../ActiveMQ/OpenWire/V1/MessageMarshaller.cs | 2 +- .../OpenWire/V1/ProducerIdMarshaller.cs | 2 +- .../OpenWire/V1/ProducerInfoMarshaller.cs | 2 +- .../OpenWire/V1/RemoveInfoMarshaller.cs | 2 +- .../V1/RemoveSubscriptionInfoMarshaller.cs | 2 +- .../OpenWire/V1/ResponseMarshaller.cs | 2 +- .../OpenWire/V1/SessionIdMarshaller.cs | 2 +- .../OpenWire/V1/SessionInfoMarshaller.cs | 2 +- .../OpenWire/V1/ShutdownInfoMarshaller.cs | 2 +- .../OpenWire/V1/SubscriptionInfoMarshaller.cs | 2 +- .../OpenWire/V1/TransactionIdMarshaller.cs | 2 +- .../OpenWire/V1/TransactionInfoMarshaller.cs | 2 +- .../OpenWire/V1/WireFormatInfoMarshaller.cs | 2 +- .../OpenWire/V1/XATransactionIdMarshaller.cs | 2 +- openwire-dotnet/src/ActiveMQ/Session.cs | 5 +- .../{OpenWire => }/TransactionContext.cs | 28 +- .../{OpenWire => Transport}/ITransport.cs | 29 +- .../SocketTransport.cs | 17 +- .../src/{ActiveMQ => JMS}/IBytesMessage.cs | 16 +- .../src/{ActiveMQ => JMS}/IConnection.cs | 122 +- .../{ActiveMQ => JMS}/IConnectionFactory.cs | 77 +- .../src/{ActiveMQ => JMS}/IDestination.cs | 55 +- .../src/{ActiveMQ => JMS}/IMapMessage.cs | 21 +- .../src/{ActiveMQ => JMS}/IMessage.cs | 335 +++--- .../src/{ActiveMQ => JMS}/IMessageConsumer.cs | 104 +- .../src/{ActiveMQ => JMS}/IMessageProducer.cs | 138 +-- .../src/{ActiveMQ => JMS}/IPrimitiveMap.cs | 17 +- .../src/{ActiveMQ => JMS}/IQueue.cs | 65 +- .../src/{ActiveMQ => JMS}/ISession.cs | 249 ++-- .../src/{ActiveMQ => JMS}/IStartable.cs | 6 +- openwire-dotnet/src/JMS/IStoppable.cs | 23 + .../src/{ActiveMQ => JMS}/ITemporaryQueue.cs | 55 +- .../src/{ActiveMQ => JMS}/ITemporaryTopic.cs | 55 +- .../src/{ActiveMQ => JMS}/ITextMessage.cs | 68 +- .../src/{ActiveMQ => JMS}/ITopic.cs | 65 +- openwire-dotnet/src/src.csproj | 143 +-- .../tests/ActiveMQ/AsyncConsumeTest.cs | 91 -- .../tests/ActiveMQ/BadConsumeTest.cs | 49 - .../ActiveMQ/{ => Commands}/CommandTest.cs | 8 +- .../ActiveMQ/OpenWire/BooleanStreamTest.cs | 6 +- .../ActiveMQ/{ => OpenWire}/EndianTest.cs | 8 +- openwire-dotnet/tests/ActiveMQ/TestMain.cs | 6 +- openwire-dotnet/tests/ActiveMQ/TestSupport.cs | 95 -- openwire-dotnet/tests/JMS/AsyncConsumeTest.cs | 89 ++ openwire-dotnet/tests/JMS/BadConsumeTest.cs | 56 + .../{ActiveMQ => JMS}/BytesMessageTest.cs | 31 +- .../tests/{ActiveMQ => JMS}/ConsumerTest.cs | 68 +- .../{ActiveMQ => JMS}/JMSPropertyTest.cs | 28 +- openwire-dotnet/tests/JMS/JMSTestSupport.cs | 174 +++ .../tests/{ActiveMQ => JMS}/MapMessageTest.cs | 31 +- .../ClientTest.cs => JMS/TextMessage.cs} | 115 +- .../{ActiveMQ => JMS}/TransactionTest.cs | 74 +- openwire-dotnet/tests/tests.csproj | 22 +- 162 files changed, 6352 insertions(+), 6194 deletions(-) delete mode 100755 openwire-dotnet/src/ActiveMQ/BrokerException.cs rename openwire-dotnet/src/ActiveMQ/{OpenWire => }/Commands/ActiveMQBytesMessage.cs (83%) rename openwire-dotnet/src/ActiveMQ/{OpenWire => }/Commands/ActiveMQDestination.cs (95%) mode change 100755 => 100644 rename openwire-dotnet/src/ActiveMQ/{OpenWire => }/Commands/ActiveMQMapMessage.cs (89%) rename openwire-dotnet/src/ActiveMQ/{OpenWire => }/Commands/ActiveMQMessage.cs (91%) rename openwire-dotnet/src/ActiveMQ/{OpenWire => }/Commands/ActiveMQObjectMessage.cs (92%) rename openwire-dotnet/src/ActiveMQ/{OpenWire => }/Commands/ActiveMQQueue.cs (84%) mode change 100755 => 100644 rename openwire-dotnet/src/ActiveMQ/{OpenWire => }/Commands/ActiveMQStreamMessage.cs (75%) rename openwire-dotnet/src/ActiveMQ/{OpenWire => }/Commands/ActiveMQTempDestination.cs (69%) rename openwire-dotnet/src/ActiveMQ/{OpenWire => }/Commands/ActiveMQTempQueue.cs (84%) mode change 100755 => 100644 rename openwire-dotnet/src/ActiveMQ/{OpenWire => }/Commands/ActiveMQTempTopic.cs (84%) mode change 100755 => 100644 rename openwire-dotnet/src/ActiveMQ/{OpenWire => }/Commands/ActiveMQTextMessage.cs (91%) rename openwire-dotnet/src/ActiveMQ/{OpenWire => }/Commands/ActiveMQTopic.cs (84%) mode change 100755 => 100644 rename openwire-dotnet/src/ActiveMQ/{OpenWire => }/Commands/BaseCommand.cs (87%) rename openwire-dotnet/src/ActiveMQ/{OpenWire => }/Commands/BrokerId.cs (93%) rename openwire-dotnet/src/ActiveMQ/{OpenWire => }/Commands/BrokerInfo.cs (94%) rename openwire-dotnet/src/ActiveMQ/{OpenWire => }/Commands/ConnectionError.cs (93%) rename openwire-dotnet/src/ActiveMQ/{OpenWire => }/Commands/ConnectionId.cs (93%) rename openwire-dotnet/src/ActiveMQ/{OpenWire => }/Commands/ConnectionInfo.cs (94%) rename openwire-dotnet/src/ActiveMQ/{OpenWire => }/Commands/ConsumerId.cs (94%) rename openwire-dotnet/src/ActiveMQ/{OpenWire => }/Commands/ConsumerInfo.cs (95%) rename openwire-dotnet/src/ActiveMQ/{OpenWire => }/Commands/ControlCommand.cs (92%) rename openwire-dotnet/src/ActiveMQ/{OpenWire => }/Commands/DataArrayResponse.cs (93%) rename openwire-dotnet/src/ActiveMQ/{OpenWire => }/Commands/DataResponse.cs (92%) rename openwire-dotnet/src/ActiveMQ/{OpenWire => }/Commands/DestinationInfo.cs (94%) rename openwire-dotnet/src/ActiveMQ/{OpenWire => }/Commands/DiscoveryEvent.cs (93%) rename openwire-dotnet/src/ActiveMQ/{OpenWire => }/Commands/ExceptionResponse.cs (93%) rename openwire-dotnet/src/ActiveMQ/{OpenWire => }/Commands/FlushCommand.cs (92%) rename openwire-dotnet/src/ActiveMQ/{OpenWire => }/Commands/IntegerResponse.cs (92%) rename openwire-dotnet/src/ActiveMQ/{OpenWire => }/Commands/JournalQueueAck.cs (93%) rename openwire-dotnet/src/ActiveMQ/{OpenWire => }/Commands/JournalTopicAck.cs (94%) rename openwire-dotnet/src/ActiveMQ/{OpenWire => }/Commands/JournalTrace.cs (92%) rename openwire-dotnet/src/ActiveMQ/{OpenWire => }/Commands/JournalTransaction.cs (93%) rename openwire-dotnet/src/ActiveMQ/{OpenWire => }/Commands/KeepAliveInfo.cs (92%) rename openwire-dotnet/src/ActiveMQ/{OpenWire => }/Commands/LocalTransactionId.cs (94%) rename openwire-dotnet/src/ActiveMQ/{OpenWire => }/Commands/Message.cs (95%) rename openwire-dotnet/src/ActiveMQ/{OpenWire => }/Commands/MessageAck.cs (94%) rename openwire-dotnet/src/ActiveMQ/{OpenWire => }/Commands/MessageDispatch.cs (94%) rename openwire-dotnet/src/ActiveMQ/{OpenWire => }/Commands/MessageDispatchNotification.cs (93%) rename openwire-dotnet/src/ActiveMQ/{OpenWire => }/Commands/MessageId.cs (94%) rename openwire-dotnet/src/ActiveMQ/{OpenWire => }/Commands/ProducerId.cs (94%) rename openwire-dotnet/src/ActiveMQ/{OpenWire => }/Commands/ProducerInfo.cs (93%) rename openwire-dotnet/src/ActiveMQ/{OpenWire => }/Commands/RemoveInfo.cs (92%) rename openwire-dotnet/src/ActiveMQ/{OpenWire => }/Commands/RemoveSubscriptionInfo.cs (94%) rename openwire-dotnet/src/ActiveMQ/{OpenWire => }/Commands/Response.cs (93%) rename openwire-dotnet/src/ActiveMQ/{OpenWire => }/Commands/SessionId.cs (94%) rename openwire-dotnet/src/ActiveMQ/{OpenWire => }/Commands/SessionInfo.cs (93%) rename openwire-dotnet/src/ActiveMQ/{OpenWire => }/Commands/ShutdownInfo.cs (92%) rename openwire-dotnet/src/ActiveMQ/{OpenWire => }/Commands/SubscriptionInfo.cs (94%) rename openwire-dotnet/src/ActiveMQ/{OpenWire => }/Commands/TransactionId.cs (92%) rename openwire-dotnet/src/ActiveMQ/{OpenWire => }/Commands/TransactionInfo.cs (93%) rename openwire-dotnet/src/ActiveMQ/{OpenWire => }/Commands/WireFormatInfo.cs (94%) rename openwire-dotnet/src/ActiveMQ/{OpenWire => }/Commands/XATransactionId.cs (94%) rename openwire-dotnet/src/ActiveMQ/{OpenWire => }/TransactionContext.cs (89%) rename openwire-dotnet/src/ActiveMQ/{OpenWire => Transport}/ITransport.cs (67%) rename openwire-dotnet/src/ActiveMQ/{OpenWire => Transport}/SocketTransport.cs (96%) rename openwire-dotnet/src/{ActiveMQ => JMS}/IBytesMessage.cs (79%) rename openwire-dotnet/src/{ActiveMQ => JMS}/IConnection.cs (83%) mode change 100755 => 100644 rename openwire-dotnet/src/{ActiveMQ => JMS}/IConnectionFactory.cs (54%) mode change 100755 => 100644 rename openwire-dotnet/src/{ActiveMQ => JMS}/IDestination.cs (79%) mode change 100755 => 100644 rename openwire-dotnet/src/{ActiveMQ => JMS}/IMapMessage.cs (70%) rename openwire-dotnet/src/{ActiveMQ => JMS}/IMessage.cs (91%) mode change 100755 => 100644 rename openwire-dotnet/src/{ActiveMQ => JMS}/IMessageConsumer.cs (84%) mode change 100755 => 100644 rename openwire-dotnet/src/{ActiveMQ => JMS}/IMessageProducer.cs (82%) mode change 100755 => 100644 rename openwire-dotnet/src/{ActiveMQ => JMS}/IPrimitiveMap.cs (85%) rename openwire-dotnet/src/{ActiveMQ => JMS}/IQueue.cs (73%) mode change 100755 => 100644 rename openwire-dotnet/src/{ActiveMQ => JMS}/ISession.cs (91%) mode change 100755 => 100644 rename openwire-dotnet/src/{ActiveMQ => JMS}/IStartable.cs (90%) create mode 100644 openwire-dotnet/src/JMS/IStoppable.cs rename openwire-dotnet/src/{ActiveMQ => JMS}/ITemporaryQueue.cs (77%) mode change 100755 => 100644 rename openwire-dotnet/src/{ActiveMQ => JMS}/ITemporaryTopic.cs (77%) mode change 100755 => 100644 rename openwire-dotnet/src/{ActiveMQ => JMS}/ITextMessage.cs (81%) mode change 100755 => 100644 rename openwire-dotnet/src/{ActiveMQ => JMS}/ITopic.cs (73%) mode change 100755 => 100644 delete mode 100644 openwire-dotnet/tests/ActiveMQ/AsyncConsumeTest.cs delete mode 100644 openwire-dotnet/tests/ActiveMQ/BadConsumeTest.cs rename openwire-dotnet/tests/ActiveMQ/{ => Commands}/CommandTest.cs (92%) rename openwire-dotnet/tests/ActiveMQ/{ => OpenWire}/EndianTest.cs (93%) delete mode 100644 openwire-dotnet/tests/ActiveMQ/TestSupport.cs create mode 100644 openwire-dotnet/tests/JMS/AsyncConsumeTest.cs create mode 100644 openwire-dotnet/tests/JMS/BadConsumeTest.cs rename openwire-dotnet/tests/{ActiveMQ => JMS}/BytesMessageTest.cs (79%) rename openwire-dotnet/tests/{ActiveMQ => JMS}/ConsumerTest.cs (63%) rename openwire-dotnet/tests/{ActiveMQ => JMS}/JMSPropertyTest.cs (91%) create mode 100644 openwire-dotnet/tests/JMS/JMSTestSupport.cs rename openwire-dotnet/tests/{ActiveMQ => JMS}/MapMessageTest.cs (88%) rename openwire-dotnet/tests/{ActiveMQ/ClientTest.cs => JMS/TextMessage.cs} (77%) rename openwire-dotnet/tests/{ActiveMQ => JMS}/TransactionTest.cs (83%) diff --git a/openwire-dotnet/src/ActiveMQ/BrokerException.cs b/openwire-dotnet/src/ActiveMQ/BrokerException.cs deleted file mode 100755 index e2f270fba3..0000000000 --- a/openwire-dotnet/src/ActiveMQ/BrokerException.cs +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright 2006 The Apache Software Foundation or its licensors, as - * applicable. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -using System; -using System.Collections; - -using ActiveMQ.OpenWire; -using ActiveMQ.OpenWire.Commands; - -namespace ActiveMQ -{ - /// - /// Exception thrown when the broker returns an error - /// - public class BrokerException : OpenWireException - { - - private BrokerError brokerError; - - public BrokerException(BrokerError brokerError) : base( - brokerError.ExceptionClass + " : " + brokerError.Message) - { - this.brokerError = brokerError; - } - - public BrokerError BrokerError { - get { - return brokerError; - } - } - - public virtual string JavaStackTrace - { - get { - return brokerError.StackTrace; - } - } - - } -} diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ActiveMQBytesMessage.cs b/openwire-dotnet/src/ActiveMQ/Commands/ActiveMQBytesMessage.cs similarity index 83% rename from openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ActiveMQBytesMessage.cs rename to openwire-dotnet/src/ActiveMQ/Commands/ActiveMQBytesMessage.cs index 142cac7b08..b0eb6f049d 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ActiveMQBytesMessage.cs +++ b/openwire-dotnet/src/ActiveMQ/Commands/ActiveMQBytesMessage.cs @@ -1,34 +1,34 @@ -/* - * Copyright 2006 The Apache Software Foundation or its licensors, as - * applicable. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -using System; -using System.Collections; - -using ActiveMQ; - -namespace ActiveMQ.OpenWire.Commands -{ - public class ActiveMQBytesMessage : ActiveMQMessage, IBytesMessage - { - public const byte ID_ActiveMQBytesMessage = 24; - - - public override byte GetDataStructureType() - { - return ID_ActiveMQBytesMessage; - } - } -} +/* + * Copyright 2006 The Apache Software Foundation or its licensors, as + * applicable. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +using ActiveMQ.Commands; +using JMS; + + +namespace ActiveMQ.Commands +{ + public class ActiveMQBytesMessage : ActiveMQMessage, IBytesMessage + { + public const byte ID_ActiveMQBytesMessage = 24; + + + public override byte GetDataStructureType() + { + return ID_ActiveMQBytesMessage; + } + } +} + diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ActiveMQDestination.cs b/openwire-dotnet/src/ActiveMQ/Commands/ActiveMQDestination.cs old mode 100755 new mode 100644 similarity index 95% rename from openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ActiveMQDestination.cs rename to openwire-dotnet/src/ActiveMQ/Commands/ActiveMQDestination.cs index ca71008895..7519f88553 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ActiveMQDestination.cs +++ b/openwire-dotnet/src/ActiveMQ/Commands/ActiveMQDestination.cs @@ -1,526 +1,532 @@ -/* - * Copyright 2006 The Apache Software Foundation or its licensors, as - * applicable. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -using System; - -namespace ActiveMQ.OpenWire.Commands -{ - - /// - /// Summary description for ActiveMQDestination. - /// - public abstract class ActiveMQDestination : AbstractCommand, IDestination - { - - /** - * Topic Destination object - */ - public const int ACTIVEMQ_TOPIC = 1; - /** - * Temporary Topic Destination object - */ - public const int ACTIVEMQ_TEMPORARY_TOPIC = 2; - - /** - * Queue Destination object - */ - public const int ACTIVEMQ_QUEUE = 3; - /** - * Temporary Queue Destination object - */ - public const int ACTIVEMQ_TEMPORARY_QUEUE = 4; - - /** - * prefix for Advisory message destinations - */ - public const String ADVISORY_PREFIX = "ActiveMQ.Advisory."; - - /** - * prefix for consumer advisory destinations - */ - public const String CONSUMER_ADVISORY_PREFIX = ADVISORY_PREFIX + "Consumers."; - - /** - * prefix for producer advisory destinations - */ - public const String PRODUCER_ADVISORY_PREFIX = ADVISORY_PREFIX + "Producers."; - - /** - * prefix for connection advisory destinations - */ - public const String CONNECTION_ADVISORY_PREFIX = ADVISORY_PREFIX + "Connections."; - - /** - * The default target for ordered destinations - */ - public const String DEFAULT_ORDERED_TARGET = "coordinator"; - - private const int NULL_DESTINATION = 10; - - private const String TEMP_PREFIX = "{TD{"; - private const String TEMP_POSTFIX = "}TD}"; - private const String COMPOSITE_SEPARATOR = ","; - private const String QUEUE_PREFIX = "queue://"; - private const String TOPIC_PREFIX = "topic://"; - - - private String physicalName = ""; - - // Cached transient data - private bool exclusive; - private bool ordered; - private bool advisory; - private String orderedTarget = DEFAULT_ORDERED_TARGET; - - - /** - * The Default Constructor - */ - protected ActiveMQDestination() - { - } - - /** - * Construct the Destination with a defined physical name; - * - * @param name - */ - protected ActiveMQDestination(String name) - { - this.physicalName = name; - this.advisory = name != null && name.StartsWith(ADVISORY_PREFIX); - } - - - - /** - * @return Returns the advisory. - */ - public bool IsAdvisory() - { - return advisory; - } - /** - * @param advisory The advisory to set. - */ - public void SetAdvisory(bool advisory) - { - this.advisory = advisory; - } - - /** - * @return true if this is a destination for Consumer advisories - */ - public bool IsConsumerAdvisory() - { - return IsAdvisory() && physicalName.StartsWith(CONSUMER_ADVISORY_PREFIX); - } - - /** - * @return true if this is a destination for Producer advisories - */ - public bool IsProducerAdvisory() - { - return IsAdvisory() && physicalName.StartsWith(PRODUCER_ADVISORY_PREFIX); - } - - /** - * @return true if this is a destination for Connection advisories - */ - public bool IsConnectionAdvisory() - { - return IsAdvisory() && physicalName.StartsWith(CONNECTION_ADVISORY_PREFIX); - } - - /** - * @return Returns the exclusive. - */ - public bool IsExclusive() - { - return exclusive; - } - /** - * @param exclusive The exclusive to set. - */ - public void SetExclusive(bool exclusive) - { - this.exclusive = exclusive; - } - /** - * @return Returns the ordered. - */ - public bool IsOrdered() - { - return ordered; - } - /** - * @param ordered The ordered to set. - */ - public void SetOrdered(bool ordered) - { - this.ordered = ordered; - } - /** - * @return Returns the orderedTarget. - */ - public String GetOrderedTarget() - { - return orderedTarget; - } - /** - * @param orderedTarget The orderedTarget to set. - */ - public void SetOrderedTarget(String orderedTarget) - { - this.orderedTarget = orderedTarget; - } - /** - * A helper method to return a descriptive string for the topic or queue - * @param destination - * - * @return a descriptive string for this queue or topic - */ - public static String Inspect(ActiveMQDestination destination) - { - if (destination is ITopic) - { - return "Topic(" + destination.ToString() + ")"; - } - else - { - return "Queue(" + destination.ToString() + ")"; - } - } - - /** - * @param destination - * @return @throws JMSException - * @throws javax.jms.JMSException - */ - public static ActiveMQDestination Transform(IDestination destination) - { - ActiveMQDestination result = null; - if (destination != null) - { - if (destination is ActiveMQDestination) - { - result = (ActiveMQDestination) destination; - } - else - { - if (destination is ITemporaryQueue) - { - result = new ActiveMQTempQueue(((IQueue) destination).QueueName); - } - else if (destination is ITemporaryTopic) - { - result = new ActiveMQTempTopic(((ITopic) destination).TopicName); - } - else if (destination is IQueue) - { - result = new ActiveMQQueue(((IQueue) destination).QueueName); - } - else if (destination is ITopic) - { - result = new ActiveMQTopic(((ITopic) destination).TopicName); - } - } - } - return result; - } - - /** - * Create a Destination - * @param type - * @param pyhsicalName - * @return - */ - public static ActiveMQDestination CreateDestination(int type, String pyhsicalName) - { - ActiveMQDestination result = null; - if (type == ACTIVEMQ_TOPIC) - { - result = new ActiveMQTopic(pyhsicalName); - } - else if (type == ACTIVEMQ_TEMPORARY_TOPIC) - { - result = new ActiveMQTempTopic(pyhsicalName); - } - else if (type == ACTIVEMQ_QUEUE) - { - result = new ActiveMQQueue(pyhsicalName); - } - else - { - result = new ActiveMQTempQueue(pyhsicalName); - } - return result; - } - - /** - * Create a temporary name from the clientId - * - * @param clientId - * @return - */ - public static String CreateTemporaryName(String clientId) - { - return TEMP_PREFIX + clientId + TEMP_POSTFIX; - } - - /** - * From a temporary destination find the clientId of the Connection that created it - * - * @param destination - * @return the clientId or null if not a temporary destination - */ - public static String GetClientId(ActiveMQDestination destination) - { - String answer = null; - if (destination != null && destination.IsTemporary()) - { - String name = destination.PhysicalName; - int start = name.IndexOf(TEMP_PREFIX); - if (start >= 0) - { - start += TEMP_PREFIX.Length; - int stop = name.LastIndexOf(TEMP_POSTFIX); - if (stop > start && stop < name.Length) - { - answer = name.Substring(start, stop); - } - } - } - return answer; - } - - - /** - * @param o object to compare - * @return 1 if this is less than o else 0 if they are equal or -1 if this is less than o - */ - public int CompareTo(Object o) - { - if (o is ActiveMQDestination) - { - return CompareTo((ActiveMQDestination) o); - } - return -1; - } - - /** - * Lets sort by name first then lets sort topics greater than queues - * - * @param that another destination to compare against - * @return 1 if this is less than o else 0 if they are equal or -1 if this is less than o - */ - public int CompareTo(ActiveMQDestination that) - { - int answer = 0; - if (physicalName != that.physicalName) - { - if (physicalName == null) - { - return -1; - } - else if (that.physicalName == null) - { - return 1; - } - answer = physicalName.CompareTo(that.physicalName); - } - if (answer == 0) - { - if (IsTopic()) - { - if (that.IsQueue()) - { - return 1; - } - } - else - { - if (that.IsTopic()) - { - return -1; - } - } - } - return answer; - } - - - /** - * @return Returns the Destination type - */ - - public abstract int GetDestinationType(); - - - public String PhysicalName - { - get { return this.physicalName; } - set { this.physicalName = value; } - } - - /** - * Returns true if a temporary Destination - * - * @return true/false - */ - - public bool IsTemporary() - { - return GetDestinationType() == ACTIVEMQ_TEMPORARY_TOPIC - || GetDestinationType() == ACTIVEMQ_TEMPORARY_QUEUE; - } - - /** - * Returns true if a Topic Destination - * - * @return true/false - */ - - public bool IsTopic() - { - return GetDestinationType() == ACTIVEMQ_TOPIC - || GetDestinationType() == ACTIVEMQ_TEMPORARY_TOPIC; - } - - /** - * Returns true if a Queue Destination - * - * @return true/false - */ - public bool IsQueue() - { - return !IsTopic(); - } - - /** - * Returns true if this destination represents a collection of - * destinations; allowing a set of destinations to be published to or subscribed - * from in one JMS operation. - *

- * If this destination is a composite then you can call {@link #getChildDestinations()} - * to return the list of child destinations. - * - * @return true if this destination represents a collection of child destinations. - */ - public bool IsComposite() - { - return physicalName.IndexOf(COMPOSITE_SEPARATOR) > 0; - } - - /* - * Returns a list of child destinations if this destination represents a composite - * destination. - * - * @return - */ - /*public List GetChildDestinations() { - List answer = new ArrayList(); - StringTokenizer iter = new StringTokenizer(physicalName, COMPOSITE_SEPARATOR); - while (iter.hasMoreTokens()) { - String name = iter.nextToken(); - Destination child = null; - if (name.StartsWith(QUEUE_PREFIX)) { - child = new ActiveMQQueue(name.Substring(QUEUE_PREFIX.Length)); - } - else if (name.StartsWith(TOPIC_PREFIX)) { - child = new ActiveMQTopic(name.Substring(TOPIC_PREFIX.Length)); - } - else { - child = createDestination(name); - } - answer.add(child); - } - if (answer.size() == 1) { - // lets put ourselves inside the collection - // as we are not really a composite destination - answer.set(0, this); - } - return answer; - }*/ - - /** - * @return string representation of this instance - */ - - public override String ToString() - { - return this.physicalName; - } - - /** - * @return hashCode for this instance - */ - public override int GetHashCode() - { - int answer = 37; - - if (this.physicalName != null) - { - answer = physicalName.GetHashCode(); - } - if (IsTopic()) - { - answer ^= 0xfabfab; - } - return answer; - } - - /** - * if the object passed in is equivalent, return true - * - * @param obj the object to compare - * @return true if this instance and obj are equivalent - */ - public override bool Equals(Object obj) - { - bool result = this == obj; - if (!result && obj != null && obj is ActiveMQDestination) - { - ActiveMQDestination other = (ActiveMQDestination) obj; - result = this.GetDestinationType() == other.GetDestinationType() - && this.physicalName.Equals(other.physicalName); - } - return result; - } - - - /** - * @return true if the destination matches multiple possible destinations - */ - public bool IsWildcard() - { - if (physicalName != null) - { - return physicalName.IndexOf(DestinationFilter.ANY_CHILD) >= 0 - || physicalName.IndexOf(DestinationFilter.ANY_DESCENDENT) >= 0; - } - return false; - } - - - /** - * Factory method to create a child destination if this destination is a composite - * @param name - * @return the created Destination - */ - public abstract ActiveMQDestination CreateDestination(String name); - } -} +/* + * Copyright 2006 The Apache Software Foundation or its licensors, as + * applicable. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +using ActiveMQ; +using ActiveMQ.Commands; +using ActiveMQ.OpenWire; +using JMS; +using System; + + + +///

+/// Summary description for ActiveMQDestination. +/// +namespace ActiveMQ.Commands +{ + public abstract class ActiveMQDestination : AbstractCommand, IDestination + { + + /** + * Topic Destination object + */ + public const int ACTIVEMQ_TOPIC = 1; + /** + * Temporary Topic Destination object + */ + public const int ACTIVEMQ_TEMPORARY_TOPIC = 2; + + /** + * Queue Destination object + */ + public const int ACTIVEMQ_QUEUE = 3; + /** + * Temporary Queue Destination object + */ + public const int ACTIVEMQ_TEMPORARY_QUEUE = 4; + + /** + * prefix for Advisory message destinations + */ + public const String ADVISORY_PREFIX = "ActiveMQ.Advisory."; + + /** + * prefix for consumer advisory destinations + */ + public const String CONSUMER_ADVISORY_PREFIX = ADVISORY_PREFIX + "Consumers."; + + /** + * prefix for producer advisory destinations + */ + public const String PRODUCER_ADVISORY_PREFIX = ADVISORY_PREFIX + "Producers."; + + /** + * prefix for connection advisory destinations + */ + public const String CONNECTION_ADVISORY_PREFIX = ADVISORY_PREFIX + "Connections."; + + /** + * The default target for ordered destinations + */ + public const String DEFAULT_ORDERED_TARGET = "coordinator"; + + private const int NULL_DESTINATION = 10; + + private const String TEMP_PREFIX = "{TD{"; + private const String TEMP_POSTFIX = "}TD}"; + private const String COMPOSITE_SEPARATOR = ","; + private const String QUEUE_PREFIX = "queue://"; + private const String TOPIC_PREFIX = "topic://"; + + + private String physicalName = ""; + + // Cached transient data + private bool exclusive; + private bool ordered; + private bool advisory; + private String orderedTarget = DEFAULT_ORDERED_TARGET; + + + /** + * The Default Constructor + */ + protected ActiveMQDestination() + { + } + + /** + * Construct the Destination with a defined physical name; + * + * @param name + */ + protected ActiveMQDestination(String name) + { + this.physicalName = name; + this.advisory = name != null && name.StartsWith(ADVISORY_PREFIX); + } + + + + /** + * @return Returns the advisory. + */ + public bool IsAdvisory() + { + return advisory; + } + /** + * @param advisory The advisory to set. + */ + public void SetAdvisory(bool advisory) + { + this.advisory = advisory; + } + + /** + * @return true if this is a destination for Consumer advisories + */ + public bool IsConsumerAdvisory() + { + return IsAdvisory() && physicalName.StartsWith(CONSUMER_ADVISORY_PREFIX); + } + + /** + * @return true if this is a destination for Producer advisories + */ + public bool IsProducerAdvisory() + { + return IsAdvisory() && physicalName.StartsWith(PRODUCER_ADVISORY_PREFIX); + } + + /** + * @return true if this is a destination for Connection advisories + */ + public bool IsConnectionAdvisory() + { + return IsAdvisory() && physicalName.StartsWith(CONNECTION_ADVISORY_PREFIX); + } + + /** + * @return Returns the exclusive. + */ + public bool IsExclusive() + { + return exclusive; + } + /** + * @param exclusive The exclusive to set. + */ + public void SetExclusive(bool exclusive) + { + this.exclusive = exclusive; + } + /** + * @return Returns the ordered. + */ + public bool IsOrdered() + { + return ordered; + } + /** + * @param ordered The ordered to set. + */ + public void SetOrdered(bool ordered) + { + this.ordered = ordered; + } + /** + * @return Returns the orderedTarget. + */ + public String GetOrderedTarget() + { + return orderedTarget; + } + /** + * @param orderedTarget The orderedTarget to set. + */ + public void SetOrderedTarget(String orderedTarget) + { + this.orderedTarget = orderedTarget; + } + /** + * A helper method to return a descriptive string for the topic or queue + * @param destination + * + * @return a descriptive string for this queue or topic + */ + public static String Inspect(ActiveMQDestination destination) + { + if (destination is ITopic) + { + return "Topic(" + destination.ToString() + ")"; + } + else + { + return "Queue(" + destination.ToString() + ")"; + } + } + + /** + * @param destination + * @return @throws JMSException + * @throws javax.jms.JMSException + */ + public static ActiveMQDestination Transform(IDestination destination) + { + ActiveMQDestination result = null; + if (destination != null) + { + if (destination is ActiveMQDestination) + { + result = (ActiveMQDestination) destination; + } + else + { + if (destination is ITemporaryQueue) + { + result = new ActiveMQTempQueue(((IQueue) destination).QueueName); + } + else if (destination is ITemporaryTopic) + { + result = new ActiveMQTempTopic(((ITopic) destination).TopicName); + } + else if (destination is IQueue) + { + result = new ActiveMQQueue(((IQueue) destination).QueueName); + } + else if (destination is ITopic) + { + result = new ActiveMQTopic(((ITopic) destination).TopicName); + } + } + } + return result; + } + + /** + * Create a Destination + * @param type + * @param pyhsicalName + * @return + */ + public static ActiveMQDestination CreateDestination(int type, String pyhsicalName) + { + ActiveMQDestination result = null; + if (type == ACTIVEMQ_TOPIC) + { + result = new ActiveMQTopic(pyhsicalName); + } + else if (type == ACTIVEMQ_TEMPORARY_TOPIC) + { + result = new ActiveMQTempTopic(pyhsicalName); + } + else if (type == ACTIVEMQ_QUEUE) + { + result = new ActiveMQQueue(pyhsicalName); + } + else + { + result = new ActiveMQTempQueue(pyhsicalName); + } + return result; + } + + /** + * Create a temporary name from the clientId + * + * @param clientId + * @return + */ + public static String CreateTemporaryName(String clientId) + { + return TEMP_PREFIX + clientId + TEMP_POSTFIX; + } + + /** + * From a temporary destination find the clientId of the Connection that created it + * + * @param destination + * @return the clientId or null if not a temporary destination + */ + public static String GetClientId(ActiveMQDestination destination) + { + String answer = null; + if (destination != null && destination.IsTemporary()) + { + String name = destination.PhysicalName; + int start = name.IndexOf(TEMP_PREFIX); + if (start >= 0) + { + start += TEMP_PREFIX.Length; + int stop = name.LastIndexOf(TEMP_POSTFIX); + if (stop > start && stop < name.Length) + { + answer = name.Substring(start, stop); + } + } + } + return answer; + } + + + /** + * @param o object to compare + * @return 1 if this is less than o else 0 if they are equal or -1 if this is less than o + */ + public int CompareTo(Object o) + { + if (o is ActiveMQDestination) + { + return CompareTo((ActiveMQDestination) o); + } + return -1; + } + + /** + * Lets sort by name first then lets sort topics greater than queues + * + * @param that another destination to compare against + * @return 1 if this is less than o else 0 if they are equal or -1 if this is less than o + */ + public int CompareTo(ActiveMQDestination that) + { + int answer = 0; + if (physicalName != that.physicalName) + { + if (physicalName == null) + { + return -1; + } + else if (that.physicalName == null) + { + return 1; + } + answer = physicalName.CompareTo(that.physicalName); + } + if (answer == 0) + { + if (IsTopic()) + { + if (that.IsQueue()) + { + return 1; + } + } + else + { + if (that.IsTopic()) + { + return -1; + } + } + } + return answer; + } + + + /** + * @return Returns the Destination type + */ + + public abstract int GetDestinationType(); + + + public String PhysicalName + { + get { return this.physicalName; } + set { this.physicalName = value; } + } + + /** + * Returns true if a temporary Destination + * + * @return true/false + */ + + public bool IsTemporary() + { + return GetDestinationType() == ACTIVEMQ_TEMPORARY_TOPIC + || GetDestinationType() == ACTIVEMQ_TEMPORARY_QUEUE; + } + + /** + * Returns true if a Topic Destination + * + * @return true/false + */ + + public bool IsTopic() + { + return GetDestinationType() == ACTIVEMQ_TOPIC + || GetDestinationType() == ACTIVEMQ_TEMPORARY_TOPIC; + } + + /** + * Returns true if a Queue Destination + * + * @return true/false + */ + public bool IsQueue() + { + return !IsTopic(); + } + + /** + * Returns true if this destination represents a collection of + * destinations; allowing a set of destinations to be published to or subscribed + * from in one JMS operation. + *

+ * If this destination is a composite then you can call {@link #getChildDestinations()} + * to return the list of child destinations. + * + * @return true if this destination represents a collection of child destinations. + */ + public bool IsComposite() + { + return physicalName.IndexOf(COMPOSITE_SEPARATOR) > 0; + } + + /* + * Returns a list of child destinations if this destination represents a composite + * destination. + * + * @return + */ + /*public List GetChildDestinations() { + List answer = new ArrayList(); + StringTokenizer iter = new StringTokenizer(physicalName, COMPOSITE_SEPARATOR); + while (iter.hasMoreTokens()) { + String name = iter.nextToken(); + Destination child = null; + if (name.StartsWith(QUEUE_PREFIX)) { + child = new ActiveMQQueue(name.Substring(QUEUE_PREFIX.Length)); + } + else if (name.StartsWith(TOPIC_PREFIX)) { + child = new ActiveMQTopic(name.Substring(TOPIC_PREFIX.Length)); + } + else { + child = createDestination(name); + } + answer.add(child); + } + if (answer.size() == 1) { + // lets put ourselves inside the collection + // as we are not really a composite destination + answer.set(0, this); + } + return answer; + }*/ + + /** + * @return string representation of this instance + */ + + public override String ToString() + { + return this.physicalName; + } + + /** + * @return hashCode for this instance + */ + public override int GetHashCode() + { + int answer = 37; + + if (this.physicalName != null) + { + answer = physicalName.GetHashCode(); + } + if (IsTopic()) + { + answer ^= 0xfabfab; + } + return answer; + } + + /** + * if the object passed in is equivalent, return true + * + * @param obj the object to compare + * @return true if this instance and obj are equivalent + */ + public override bool Equals(Object obj) + { + bool result = this == obj; + if (!result && obj != null && obj is ActiveMQDestination) + { + ActiveMQDestination other = (ActiveMQDestination) obj; + result = this.GetDestinationType() == other.GetDestinationType() + && this.physicalName.Equals(other.physicalName); + } + return result; + } + + + /** + * @return true if the destination matches multiple possible destinations + */ + public bool IsWildcard() + { + if (physicalName != null) + { + return physicalName.IndexOf(DestinationFilter.ANY_CHILD) >= 0 + || physicalName.IndexOf(DestinationFilter.ANY_DESCENDENT) >= 0; + } + return false; + } + + + /** + * Factory method to create a child destination if this destination is a composite + * @param name + * @return the created Destination + */ + public abstract ActiveMQDestination CreateDestination(String name); + } +} + diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ActiveMQMapMessage.cs b/openwire-dotnet/src/ActiveMQ/Commands/ActiveMQMapMessage.cs similarity index 89% rename from openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ActiveMQMapMessage.cs rename to openwire-dotnet/src/ActiveMQ/Commands/ActiveMQMapMessage.cs index b7cc998391..1c4c6be8be 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ActiveMQMapMessage.cs +++ b/openwire-dotnet/src/ActiveMQ/Commands/ActiveMQMapMessage.cs @@ -1,65 +1,66 @@ -/* - * Copyright 2006 The Apache Software Foundation or its licensors, as - * applicable. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -using System; -using System.Collections; - -using ActiveMQ; -using ActiveMQ.OpenWire; - -namespace ActiveMQ.OpenWire.Commands -{ - public class ActiveMQMapMessage : ActiveMQMessage, IMapMessage - { - public const byte ID_ActiveMQMapMessage = 25; - - private PrimitiveMap body; - - - public override byte GetDataStructureType() - { - return ID_ActiveMQMapMessage; - } - - public IPrimitiveMap Body - { - get { - if (body == null) - { - body = PrimitiveMap.Unmarshal(Content); - } - return body; - } - } - - public override void BeforeMarshall(OpenWireFormat wireFormat) - { - if (body == null) - { - Content = null; - } - else - { - Content = body.Marshal(); - } - - Console.WriteLine("BeforeMarshalling, content is: " + Content); - - base.BeforeMarshall(wireFormat); - } - - } -} +/* + * Copyright 2006 The Apache Software Foundation or its licensors, as + * applicable. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +using ActiveMQ.Commands; +using ActiveMQ.OpenWire; +using JMS; +using System; + + +namespace ActiveMQ.Commands +{ + public class ActiveMQMapMessage : ActiveMQMessage, IMapMessage + { + public const byte ID_ActiveMQMapMessage = 25; + + private PrimitiveMap body; + + + public override byte GetDataStructureType() + { + return ID_ActiveMQMapMessage; + } + + public IPrimitiveMap Body + { + get { + if (body == null) + { + body = PrimitiveMap.Unmarshal(Content); + } + return body; + } + } + + public override void BeforeMarshall(OpenWireFormat wireFormat) + { + if (body == null) + { + Content = null; + } + else + { + Content = body.Marshal(); + } + + Console.WriteLine("BeforeMarshalling, content is: " + Content); + + base.BeforeMarshall(wireFormat); + } + + } +} + diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ActiveMQMessage.cs b/openwire-dotnet/src/ActiveMQ/Commands/ActiveMQMessage.cs similarity index 91% rename from openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ActiveMQMessage.cs rename to openwire-dotnet/src/ActiveMQ/Commands/ActiveMQMessage.cs index 9d7b42ade1..e270773fad 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ActiveMQMessage.cs +++ b/openwire-dotnet/src/ActiveMQ/Commands/ActiveMQMessage.cs @@ -1,308 +1,318 @@ -/* - * Copyright 2006 The Apache Software Foundation or its licensors, as - * applicable. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -using System; -using System.Collections; - -namespace ActiveMQ.OpenWire.Commands -{ - public delegate void AcknowledgeHandler(ActiveMQMessage message); - - public class ActiveMQMessage : Message, IMessage, MarshallAware - { - public const byte ID_ActiveMQMessage = 23; - - protected static MessagePropertyHelper propertyHelper = new MessagePropertyHelper(); - - private PrimitiveMap properties; - - public event AcknowledgeHandler Acknowledger; - - public static ActiveMQMessage Transform(IMessage message) - { - return (ActiveMQMessage) message; - } - - // TODO generate Equals method - // TODO generate GetHashCode method - - - public override byte GetDataStructureType() - { - return ID_ActiveMQMessage; - } - - public void Acknowledge() - { - if (Acknowledger == null){ - throw new OpenWireException("No Acknowledger has been associated with this message: " + this);} - else { - Acknowledger(this); - } - } - - - // Properties - - public IPrimitiveMap Properties - { - get { - if (properties == null) - { - properties = PrimitiveMap.Unmarshal(MarshalledProperties); - } - return properties; - } - } - - public IDestination FromDestination - { - get { return Destination; } - set { this.Destination = ActiveMQDestination.Transform(value); } - } - - - // IMessage interface - - // JMS headers - - ///

- /// The correlation ID used to correlate messages with conversations or long running business processes - /// - public string JMSCorrelationID - { - get { - return CorrelationId; - } - set { - CorrelationId = value; - } - } - - /// - /// The destination of the message - /// - public IDestination JMSDestination - { - get { - return OriginalDestination; - } - } - - /// - /// The time in milliseconds that this message should expire in - /// - public long JMSExpiration - { - get { - return Expiration; - } - set { - Expiration = value; - } - } - - /// - /// The message ID which is set by the provider - /// - public string JMSMessageId - { - get { - return BaseDataStreamMarshaller.ToString(MessageId); - } - } - - /// - /// Whether or not this message is persistent - /// - public bool JMSPersistent - { - get { - return Persistent; - } - set { - Persistent = value; - } - } - - /// - /// The Priority on this message - /// - public byte JMSPriority - { - get { - return Priority; - } - set { - Priority = value; - } - } - - /// - /// Returns true if this message has been redelivered to this or another consumer before being acknowledged successfully. - /// - public bool JMSRedelivered - { - get { - return RedeliveryCounter > 0; - } - } - - - /// - /// The destination that the consumer of this message should send replies to - /// - public IDestination JMSReplyTo - { - get { - return ReplyTo; - } - set { - ReplyTo = ActiveMQDestination.Transform(value); - } - } - - - /// - /// The timestamp the broker added to the message - /// - public long JMSTimestamp - { - get { - return Timestamp; - } - } - - /// - /// The type name of this message - /// - public string JMSType - { - get { - return Type; - } - set { - Type = value; - } - } - - - // JMS Extension headers - - /// - /// Returns the number of times this message has been redelivered to other consumers without being acknowledged successfully. - /// - public int JMSXDeliveryCount - { - get { - return RedeliveryCounter + 1; - } - } - - - /// - /// The Message Group ID used to group messages together to the same consumer for the same group ID value - /// - public string JMSXGroupID - { - get { - return GroupID; - } - set { - GroupID = value; - } - } - /// - /// The Message Group Sequence counter to indicate the position in a group - /// - public int JMSXGroupSeq - { - get { - return GroupSequence; - } - set { - GroupSequence = value; - } - } - - /// - /// Returns the ID of the producers transaction - /// - public string JMSXProducerTXID - { - get { - TransactionId txnId = OriginalTransactionId; - if (txnId == null) - { - txnId = TransactionId; - } - if (txnId != null) - { - return BaseDataStreamMarshaller.ToString(txnId); - } - return null; - } - } - - public object GetObjectProperty(string name) - { - return propertyHelper.GetObjectProperty(this, name); - } - - public void SetObjectProperty(string name, object value) - { - propertyHelper.SetObjectProperty(this, name, value); - } - - // MarshallAware interface - - public override bool IsMarshallAware() - { - return true; - } - - public virtual void BeforeMarshall(OpenWireFormat wireFormat) - { - MarshalledProperties = null; - if (properties != null) - { - MarshalledProperties = properties.Marshal(); - } - } - - public virtual void AfterMarshall(OpenWireFormat wireFormat) - { - } - - public virtual void BeforeUnmarshall(OpenWireFormat wireFormat) - { - } - - public virtual void AfterUnmarshall(OpenWireFormat wireFormat) - { - } - - public virtual void SetMarshalledForm(OpenWireFormat wireFormat, byte[] data) - { - } - - public virtual byte[] GetMarshalledForm(OpenWireFormat wireFormat) - { - return null; - } - - } -} +/* + * Copyright 2006 The Apache Software Foundation or its licensors, as + * applicable. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +using ActiveMQ; +using ActiveMQ.Commands; +using ActiveMQ.OpenWire; +using JMS; + + +namespace ActiveMQ.Commands +{ + public delegate void AcknowledgeHandler(ActiveMQMessage message); +} + +namespace ActiveMQ.Commands +{ + public class ActiveMQMessage : Message, IMessage, MarshallAware + { + public const byte ID_ActiveMQMessage = 23; + + protected static MessagePropertyHelper propertyHelper = new MessagePropertyHelper(); + + private PrimitiveMap properties; + + public event AcknowledgeHandler Acknowledger; + + public static ActiveMQMessage Transform(IMessage message) + { + return (ActiveMQMessage) message; + } + + // TODO generate Equals method + // TODO generate GetHashCode method + + + public override byte GetDataStructureType() + { + return ID_ActiveMQMessage; + } + + public void Acknowledge() + { + if (Acknowledger == null) + { + throw new OpenWireException("No Acknowledger has been associated with this message: " + this); + } + else + { + Acknowledger(this); + } + } + + + // Properties + + public IPrimitiveMap Properties + { + get { + if (properties == null) + { + properties = PrimitiveMap.Unmarshal(MarshalledProperties); + } + return properties; + } + } + + public IDestination FromDestination + { + get { return Destination; } + set { this.Destination = ActiveMQDestination.Transform(value); } + } + + + // IMessage interface + + // JMS headers + + /// + /// The correlation ID used to correlate messages with conversations or long running business processes + /// + public string JMSCorrelationID + { + get { + return CorrelationId; + } + set { + CorrelationId = value; + } + } + + /// + /// The destination of the message + /// + public IDestination JMSDestination + { + get { + return OriginalDestination; + } + } + + /// + /// The time in milliseconds that this message should expire in + /// + public long JMSExpiration + { + get { + return Expiration; + } + set { + Expiration = value; + } + } + + /// + /// The message ID which is set by the provider + /// + public string JMSMessageId + { + get { + return BaseDataStreamMarshaller.ToString(MessageId); + } + } + + /// + /// Whether or not this message is persistent + /// + public bool JMSPersistent + { + get { + return Persistent; + } + set { + Persistent = value; + } + } + + /// + /// The Priority on this message + /// + public byte JMSPriority + { + get { + return Priority; + } + set { + Priority = value; + } + } + + /// + /// Returns true if this message has been redelivered to this or another consumer before being acknowledged successfully. + /// + public bool JMSRedelivered + { + get { + return RedeliveryCounter > 0; + } + } + + + /// + /// The destination that the consumer of this message should send replies to + /// + public IDestination JMSReplyTo + { + get { + return ReplyTo; + } + set { + ReplyTo = ActiveMQDestination.Transform(value); + } + } + + + /// + /// The timestamp the broker added to the message + /// + public long JMSTimestamp + { + get { + return Timestamp; + } + } + + /// + /// The type name of this message + /// + public string JMSType + { + get { + return Type; + } + set { + Type = value; + } + } + + + // JMS Extension headers + + /// + /// Returns the number of times this message has been redelivered to other consumers without being acknowledged successfully. + /// + public int JMSXDeliveryCount + { + get { + return RedeliveryCounter + 1; + } + } + + + /// + /// The Message Group ID used to group messages together to the same consumer for the same group ID value + /// + public string JMSXGroupID + { + get { + return GroupID; + } + set { + GroupID = value; + } + } + /// + /// The Message Group Sequence counter to indicate the position in a group + /// + public int JMSXGroupSeq + { + get { + return GroupSequence; + } + set { + GroupSequence = value; + } + } + + /// + /// Returns the ID of the producers transaction + /// + public string JMSXProducerTXID + { + get { + TransactionId txnId = OriginalTransactionId; + if (txnId == null) + { + txnId = TransactionId; + } + if (txnId != null) + { + return BaseDataStreamMarshaller.ToString(txnId); + } + return null; + } + } + + public object GetObjectProperty(string name) + { + return propertyHelper.GetObjectProperty(this, name); + } + + public void SetObjectProperty(string name, object value) + { + propertyHelper.SetObjectProperty(this, name, value); + } + + // MarshallAware interface + + public override bool IsMarshallAware() + { + return true; + } + + public virtual void BeforeMarshall(OpenWireFormat wireFormat) + { + MarshalledProperties = null; + if (properties != null) + { + MarshalledProperties = properties.Marshal(); + } + } + + public virtual void AfterMarshall(OpenWireFormat wireFormat) + { + } + + public virtual void BeforeUnmarshall(OpenWireFormat wireFormat) + { + } + + public virtual void AfterUnmarshall(OpenWireFormat wireFormat) + { + } + + public virtual void SetMarshalledForm(OpenWireFormat wireFormat, byte[] data) + { + } + + public virtual byte[] GetMarshalledForm(OpenWireFormat wireFormat) + { + return null; + } + + } +} + diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ActiveMQObjectMessage.cs b/openwire-dotnet/src/ActiveMQ/Commands/ActiveMQObjectMessage.cs similarity index 92% rename from openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ActiveMQObjectMessage.cs rename to openwire-dotnet/src/ActiveMQ/Commands/ActiveMQObjectMessage.cs index faa62fc095..25d32eaf14 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ActiveMQObjectMessage.cs +++ b/openwire-dotnet/src/ActiveMQ/Commands/ActiveMQObjectMessage.cs @@ -1,55 +1,55 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -using System; -using System.Collections; - -using ActiveMQ.OpenWire; -using ActiveMQ.OpenWire.Commands; - -namespace ActiveMQ.OpenWire.Commands -{ - // - // Marshalling code for Open Wire Format for ActiveMQObjectMessage - // - // - // NOTE!: This file is autogenerated - do not modify! - // if you need to make a change, please see the Groovy scripts in the - // activemq-core module - // - public class ActiveMQObjectMessage : ActiveMQMessage - { - public const byte ID_ActiveMQObjectMessage = 26; - - - public override string ToString() { - return GetType().Name + "[" - + " ]"; - - } - - - - public override byte GetDataStructureType() { - return ID_ActiveMQObjectMessage; - } - - - // Properties - - } -} +/* +* Copyright 2006 The Apache Software Foundation or its licensors, as +* applicable. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + +using System; +using System.Collections; + +using ActiveMQ.OpenWire; +using ActiveMQ.Commands; + +namespace ActiveMQ.Commands +{ + // + // Marshalling code for Open Wire Format for ActiveMQObjectMessage + // + // + // NOTE!: This file is autogenerated - do not modify! + // if you need to make a change, please see the Groovy scripts in the + // activemq-core module + // + public class ActiveMQObjectMessage : ActiveMQMessage + { + public const byte ID_ActiveMQObjectMessage = 26; + + + public override string ToString() { + return GetType().Name + "[" + + " ]"; + + } + + + + public override byte GetDataStructureType() { + return ID_ActiveMQObjectMessage; + } + + + // Properties + + } +} diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ActiveMQQueue.cs b/openwire-dotnet/src/ActiveMQ/Commands/ActiveMQQueue.cs old mode 100755 new mode 100644 similarity index 84% rename from openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ActiveMQQueue.cs rename to openwire-dotnet/src/ActiveMQ/Commands/ActiveMQQueue.cs index 25674f66cc..0031fb27b1 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ActiveMQQueue.cs +++ b/openwire-dotnet/src/ActiveMQ/Commands/ActiveMQQueue.cs @@ -1,55 +1,59 @@ -/* - * Copyright 2006 The Apache Software Foundation or its licensors, as - * applicable. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -using System; - -namespace ActiveMQ.OpenWire.Commands -{ - /// - /// Summary description for ActiveMQQueue. - /// - public class ActiveMQQueue : ActiveMQDestination, IQueue - { - public const byte ID_ActiveMQQueue = 100; - - public ActiveMQQueue() : base() - { - } - public ActiveMQQueue(String name) : base(name) - { - } - - public String QueueName - { - get { return PhysicalName; } - } - - public override byte GetDataStructureType() - { - return ID_ActiveMQQueue; - } - - public override int GetDestinationType() - { - return ACTIVEMQ_QUEUE; - } - - public override ActiveMQDestination CreateDestination(String name) - { - return new ActiveMQQueue(name); - } - } -} +/* + * Copyright 2006 The Apache Software Foundation or its licensors, as + * applicable. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +using ActiveMQ.Commands; +using JMS; +using System; + + +/// +/// Summary description for ActiveMQQueue. +/// +namespace ActiveMQ.Commands +{ + public class ActiveMQQueue : ActiveMQDestination, IQueue + { + public const byte ID_ActiveMQQueue = 100; + + public ActiveMQQueue() : base() + { + } + public ActiveMQQueue(String name) : base(name) + { + } + + public String QueueName + { + get { return PhysicalName; } + } + + public override byte GetDataStructureType() + { + return ID_ActiveMQQueue; + } + + public override int GetDestinationType() + { + return ACTIVEMQ_QUEUE; + } + + public override ActiveMQDestination CreateDestination(String name) + { + return new ActiveMQQueue(name); + } + } +} + diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ActiveMQStreamMessage.cs b/openwire-dotnet/src/ActiveMQ/Commands/ActiveMQStreamMessage.cs similarity index 75% rename from openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ActiveMQStreamMessage.cs rename to openwire-dotnet/src/ActiveMQ/Commands/ActiveMQStreamMessage.cs index 8e42bd8606..9efcd481cb 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ActiveMQStreamMessage.cs +++ b/openwire-dotnet/src/ActiveMQ/Commands/ActiveMQStreamMessage.cs @@ -1,42 +1,44 @@ -/* - * Copyright 2006 The Apache Software Foundation or its licensors, as - * applicable. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -using System; -using System.Collections; - -namespace ActiveMQ.OpenWire.Commands -{ - public class ActiveMQStreamMessage : ActiveMQMessage - { - public const byte ID_ActiveMQStreamMessage = 27; - - - - - // TODO generate Equals method - // TODO generate GetHashCode method - // TODO generate ToString method - - - public override byte GetDataStructureType() { - return ID_ActiveMQStreamMessage; - } - - - // Properties - - } -} +/* + * Copyright 2006 The Apache Software Foundation or its licensors, as + * applicable. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +using ActiveMQ.Commands; + + +namespace ActiveMQ.Commands +{ + public class ActiveMQStreamMessage : ActiveMQMessage + { + public const byte ID_ActiveMQStreamMessage = 27; + + + + + // TODO generate Equals method + // TODO generate GetHashCode method + // TODO generate ToString method + + + public override byte GetDataStructureType() + { + return ID_ActiveMQStreamMessage; + } + + + // Properties + + } +} + diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ActiveMQTempDestination.cs b/openwire-dotnet/src/ActiveMQ/Commands/ActiveMQTempDestination.cs similarity index 69% rename from openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ActiveMQTempDestination.cs rename to openwire-dotnet/src/ActiveMQ/Commands/ActiveMQTempDestination.cs index a9d6ddfc23..19b50460e4 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ActiveMQTempDestination.cs +++ b/openwire-dotnet/src/ActiveMQ/Commands/ActiveMQTempDestination.cs @@ -15,20 +15,21 @@ * limitations under the License. */ +using ActiveMQ.Commands; using System; -using System.Collections; -namespace ActiveMQ.OpenWire.Commands + +// +// Marshalling code for Open Wire Format for ActiveMQTempDestination +// +// +// NOTE!: This file is autogenerated - do not modify! +// if you need to make a change, please see the Groovy scripts in the +// activemq-core module +// +namespace ActiveMQ.Commands { - // - // Marshalling code for Open Wire Format for ActiveMQTempDestination - // - // - // NOTE!: This file is autogenerated - do not modify! - // if you need to make a change, please see the Groovy scripts in the - // activemq-core module - // - public abstract class ActiveMQTempDestination : ActiveMQDestination + public abstract class ActiveMQTempDestination : ActiveMQDestination { public const byte ID_ActiveMQTempDestination = 0; @@ -46,3 +47,4 @@ namespace ActiveMQ.OpenWire.Commands } } } + diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ActiveMQTempQueue.cs b/openwire-dotnet/src/ActiveMQ/Commands/ActiveMQTempQueue.cs old mode 100755 new mode 100644 similarity index 84% rename from openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ActiveMQTempQueue.cs rename to openwire-dotnet/src/ActiveMQ/Commands/ActiveMQTempQueue.cs index e444048952..02e393705b --- a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ActiveMQTempQueue.cs +++ b/openwire-dotnet/src/ActiveMQ/Commands/ActiveMQTempQueue.cs @@ -1,56 +1,60 @@ -/* - * Copyright 2006 The Apache Software Foundation or its licensors, as - * applicable. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -using System; - -namespace ActiveMQ.OpenWire.Commands -{ - /// - /// A Temporary Queue - /// - public class ActiveMQTempQueue : ActiveMQTempDestination, ITemporaryQueue - { - public const byte ID_ActiveMQTempQueue = 102; - - public ActiveMQTempQueue() : base() - { - } - - public ActiveMQTempQueue(String name) : base(name) - { - } - - public String GetQueueName() - { - return PhysicalName; - } - - public override byte GetDataStructureType() - { - return ID_ActiveMQTempQueue; - } - - public override int GetDestinationType() - { - return ACTIVEMQ_QUEUE; - } - - public override ActiveMQDestination CreateDestination(String name) - { - return new ActiveMQTempQueue(name); - } - } -} +/* + * Copyright 2006 The Apache Software Foundation or its licensors, as + * applicable. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +using ActiveMQ.Commands; +using JMS; +using System; + + +/// +/// A Temporary Queue +/// +namespace ActiveMQ.Commands +{ + public class ActiveMQTempQueue : ActiveMQTempDestination, ITemporaryQueue + { + public const byte ID_ActiveMQTempQueue = 102; + + public ActiveMQTempQueue() : base() + { + } + + public ActiveMQTempQueue(String name) : base(name) + { + } + + public String GetQueueName() + { + return PhysicalName; + } + + public override byte GetDataStructureType() + { + return ID_ActiveMQTempQueue; + } + + public override int GetDestinationType() + { + return ACTIVEMQ_QUEUE; + } + + public override ActiveMQDestination CreateDestination(String name) + { + return new ActiveMQTempQueue(name); + } + } +} + diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ActiveMQTempTopic.cs b/openwire-dotnet/src/ActiveMQ/Commands/ActiveMQTempTopic.cs old mode 100755 new mode 100644 similarity index 84% rename from openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ActiveMQTempTopic.cs rename to openwire-dotnet/src/ActiveMQ/Commands/ActiveMQTempTopic.cs index cf741d9900..ad531887cf --- a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ActiveMQTempTopic.cs +++ b/openwire-dotnet/src/ActiveMQ/Commands/ActiveMQTempTopic.cs @@ -1,56 +1,60 @@ -/* - * Copyright 2006 The Apache Software Foundation or its licensors, as - * applicable. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -using System; - -namespace ActiveMQ.OpenWire.Commands -{ - /// - /// A Temporary Topic - /// - public class ActiveMQTempTopic : ActiveMQTempDestination, ITemporaryTopic - { - public const byte ID_ActiveMQTempTopic = 103; - - public ActiveMQTempTopic() : base() - { - } - - public ActiveMQTempTopic(String name) : base(name) - { - } - - public String GetTopicName() - { - return PhysicalName; - } - - public override byte GetDataStructureType() - { - return ID_ActiveMQTempTopic; - } - - public override int GetDestinationType() - { - return ACTIVEMQ_TOPIC; - } - - public override ActiveMQDestination CreateDestination(String name) - { - return new ActiveMQTempTopic(name); - } - } -} +/* + * Copyright 2006 The Apache Software Foundation or its licensors, as + * applicable. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +using ActiveMQ.Commands; +using JMS; +using System; + + +/// +/// A Temporary Topic +/// +namespace ActiveMQ.Commands +{ + public class ActiveMQTempTopic : ActiveMQTempDestination, ITemporaryTopic + { + public const byte ID_ActiveMQTempTopic = 103; + + public ActiveMQTempTopic() : base() + { + } + + public ActiveMQTempTopic(String name) : base(name) + { + } + + public String GetTopicName() + { + return PhysicalName; + } + + public override byte GetDataStructureType() + { + return ID_ActiveMQTempTopic; + } + + public override int GetDestinationType() + { + return ACTIVEMQ_TOPIC; + } + + public override ActiveMQDestination CreateDestination(String name) + { + return new ActiveMQTempTopic(name); + } + } +} + diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ActiveMQTextMessage.cs b/openwire-dotnet/src/ActiveMQ/Commands/ActiveMQTextMessage.cs similarity index 91% rename from openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ActiveMQTextMessage.cs rename to openwire-dotnet/src/ActiveMQ/Commands/ActiveMQTextMessage.cs index b8ebf54af0..ab0010db9e 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ActiveMQTextMessage.cs +++ b/openwire-dotnet/src/ActiveMQ/Commands/ActiveMQTextMessage.cs @@ -1,91 +1,94 @@ -/* - * Copyright 2006 The Apache Software Foundation or its licensors, as - * applicable. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -using System; -using System.Collections; - -namespace ActiveMQ.OpenWire.Commands -{ - public class ActiveMQTextMessage : ActiveMQMessage, ITextMessage - { - public const byte ID_ActiveMQTextMessage = 28; - - private String text; - - public ActiveMQTextMessage() - { - } - - public ActiveMQTextMessage(String text) - { - this.Text = text; - } - - // TODO generate Equals method - // TODO generate GetHashCode method - // TODO generate ToString method - - - public override byte GetDataStructureType() - { - return ID_ActiveMQTextMessage; - } - - - // Properties - - public string Text - { - get { - if (text == null) - { - // now lets read the content - - byte[] data = this.Content; - if (data != null) - { - // TODO assume that the text is ASCII - char[] chars = new char[data.Length]; - for (int i = 0; i < chars.Length; i++) - { - chars[i] = (char) data[i]; - } - text = new String(chars); - } - } - return text; - } - - set { - this.text = value; - byte[] data = null; - if (text != null) - { - // TODO assume that the text is ASCII - data = new byte[text.Length]; - - // now lets write the bytes - char[] chars = text.ToCharArray(); - for (int i = 0; i < chars.Length; i++) - { - data[i] = (byte) chars[i]; - } - } - this.Content = data; - } - } - } -} +/* + * Copyright 2006 The Apache Software Foundation or its licensors, as + * applicable. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +using ActiveMQ.Commands; +using JMS; +using System; + + +namespace ActiveMQ.Commands +{ + public class ActiveMQTextMessage : ActiveMQMessage, ITextMessage + { + public const byte ID_ActiveMQTextMessage = 28; + + private String text; + + public ActiveMQTextMessage() + { + } + + public ActiveMQTextMessage(String text) + { + this.Text = text; + } + + // TODO generate Equals method + // TODO generate GetHashCode method + // TODO generate ToString method + + + public override byte GetDataStructureType() + { + return ID_ActiveMQTextMessage; + } + + + // Properties + + public string Text + { + get { + if (text == null) + { + // now lets read the content + + byte[] data = this.Content; + if (data != null) + { + // TODO assume that the text is ASCII + char[] chars = new char[data.Length]; + for (int i = 0; i < chars.Length; i++) + { + chars[i] = (char) data[i]; + } + text = new String(chars); + } + } + return text; + } + + set { + this.text = value; + byte[] data = null; + if (text != null) + { + // TODO assume that the text is ASCII + data = new byte[text.Length]; + + // now lets write the bytes + char[] chars = text.ToCharArray(); + for (int i = 0; i < chars.Length; i++) + { + data[i] = (byte) chars[i]; + } + } + this.Content = data; + } + } + } +} + diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ActiveMQTopic.cs b/openwire-dotnet/src/ActiveMQ/Commands/ActiveMQTopic.cs old mode 100755 new mode 100644 similarity index 84% rename from openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ActiveMQTopic.cs rename to openwire-dotnet/src/ActiveMQ/Commands/ActiveMQTopic.cs index d0f3a16799..43679681b0 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ActiveMQTopic.cs +++ b/openwire-dotnet/src/ActiveMQ/Commands/ActiveMQTopic.cs @@ -1,55 +1,59 @@ -/* - * Copyright 2006 The Apache Software Foundation or its licensors, as - * applicable. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -using System; - -namespace ActiveMQ.OpenWire.Commands -{ - /// - /// Summary description for ActiveMQTopic. - /// - public class ActiveMQTopic : ActiveMQDestination, ITopic - { - public const byte ID_ActiveMQTopic = 101; - - public ActiveMQTopic() : base() - { - } - public ActiveMQTopic(String name) : base(name) - { - } - - public String TopicName - { - get { return PhysicalName; } - } - - public override byte GetDataStructureType() - { - return ID_ActiveMQTopic; - } - - public override int GetDestinationType() - { - return ACTIVEMQ_TOPIC; - } - - public override ActiveMQDestination CreateDestination(String name) - { - return new ActiveMQTopic(name); - } - } -} +/* + * Copyright 2006 The Apache Software Foundation or its licensors, as + * applicable. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +using ActiveMQ.Commands; +using JMS; +using System; + + +/// +/// Summary description for ActiveMQTopic. +/// +namespace ActiveMQ.Commands +{ + public class ActiveMQTopic : ActiveMQDestination, ITopic + { + public const byte ID_ActiveMQTopic = 101; + + public ActiveMQTopic() : base() + { + } + public ActiveMQTopic(String name) : base(name) + { + } + + public String TopicName + { + get { return PhysicalName; } + } + + public override byte GetDataStructureType() + { + return ID_ActiveMQTopic; + } + + public override int GetDestinationType() + { + return ACTIVEMQ_TOPIC; + } + + public override ActiveMQDestination CreateDestination(String name) + { + return new ActiveMQTopic(name); + } + } +} + diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/BaseCommand.cs b/openwire-dotnet/src/ActiveMQ/Commands/BaseCommand.cs similarity index 87% rename from openwire-dotnet/src/ActiveMQ/OpenWire/Commands/BaseCommand.cs rename to openwire-dotnet/src/ActiveMQ/Commands/BaseCommand.cs index 01990c1374..a7def4d08c 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/BaseCommand.cs +++ b/openwire-dotnet/src/ActiveMQ/Commands/BaseCommand.cs @@ -1,50 +1,50 @@ -// -// Marshalling code for Open Wire Format for BaseCommand -// -// -// NOTE!: This file is autogenerated - do not modify! -// if you need to make a change, please see the Groovy scripts in the -// activemq-openwire module -// - -using System; -using System.Collections; - -using ActiveMQ.OpenWire; -using ActiveMQ.OpenWire.Commands; - -namespace ActiveMQ.OpenWire.Commands -{ - - public abstract class BaseCommand : AbstractCommand - { - - public override int GetHashCode() - { - return (CommandId * 37) + GetDataStructureType(); - } - - public override bool Equals(Object that) - { - if (that is BaseCommand) - { - BaseCommand thatCommand = (BaseCommand) that; - return this.GetDataStructureType() == thatCommand.GetDataStructureType() - && this.CommandId == thatCommand.CommandId; - } - return false; - } - - public override String ToString() - { - string answer = GetDataStructureTypeAsString(GetDataStructureType()); - if (answer.Length == 0) - { - answer = base.ToString(); - } - return answer + ": id = " + CommandId; - } - - - } -} +// +// Marshalling code for Open Wire Format for BaseCommand +// +// +// NOTE!: This file is autogenerated - do not modify! +// if you need to make a change, please see the Groovy scripts in the +// activemq-openwire module +// + +using ActiveMQ.Commands; +using ActiveMQ.OpenWire; +using System; + + + +namespace ActiveMQ.Commands +{ + public abstract class BaseCommand : AbstractCommand + { + + public override int GetHashCode() + { + return (CommandId * 37) + GetDataStructureType(); + } + + public override bool Equals(Object that) + { + if (that is BaseCommand) + { + BaseCommand thatCommand = (BaseCommand) that; + return this.GetDataStructureType() == thatCommand.GetDataStructureType() + && this.CommandId == thatCommand.CommandId; + } + return false; + } + + public override String ToString() + { + string answer = GetDataStructureTypeAsString(GetDataStructureType()); + if (answer.Length == 0) + { + answer = base.ToString(); + } + return answer + ": id = " + CommandId; + } + + + } +} + diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/BrokerId.cs b/openwire-dotnet/src/ActiveMQ/Commands/BrokerId.cs similarity index 93% rename from openwire-dotnet/src/ActiveMQ/OpenWire/Commands/BrokerId.cs rename to openwire-dotnet/src/ActiveMQ/Commands/BrokerId.cs index 3b3809eaf6..eee48782cb 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/BrokerId.cs +++ b/openwire-dotnet/src/ActiveMQ/Commands/BrokerId.cs @@ -1,85 +1,85 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -using System; -using System.Collections; - -using ActiveMQ.OpenWire; -using ActiveMQ.OpenWire.Commands; - -namespace ActiveMQ.OpenWire.Commands -{ - // - // Marshalling code for Open Wire Format for BrokerId - // - // - // NOTE!: This file is autogenerated - do not modify! - // if you need to make a change, please see the Groovy scripts in the - // activemq-core module - // - public class BrokerId : AbstractCommand - { - public const byte ID_BrokerId = 124; - - string value; - - public override int GetHashCode() { - int answer = 0; - answer = (answer * 37) + HashCode(Value); - return answer; - - } - - - public override bool Equals(object that) { - if (that is BrokerId) { - return Equals((BrokerId) that); - } - return false; - } - - public virtual bool Equals(BrokerId that) { - if (! Equals(this.Value, that.Value)) return false; - return true; - - } - - - public override string ToString() { - return GetType().Name + "[" - + " Value=" + Value - + " ]"; - - } - - - - public override byte GetDataStructureType() { - return ID_BrokerId; - } - - - // Properties - - public string Value - { - get { return value; } - set { this.value = value; } - } - - } -} +/* +* Copyright 2006 The Apache Software Foundation or its licensors, as +* applicable. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + +using System; +using System.Collections; + +using ActiveMQ.OpenWire; +using ActiveMQ.Commands; + +namespace ActiveMQ.Commands +{ + // + // Marshalling code for Open Wire Format for BrokerId + // + // + // NOTE!: This file is autogenerated - do not modify! + // if you need to make a change, please see the Groovy scripts in the + // activemq-core module + // + public class BrokerId : AbstractCommand + { + public const byte ID_BrokerId = 124; + + string value; + + public override int GetHashCode() { + int answer = 0; + answer = (answer * 37) + HashCode(Value); + return answer; + + } + + + public override bool Equals(object that) { + if (that is BrokerId) { + return Equals((BrokerId) that); + } + return false; + } + + public virtual bool Equals(BrokerId that) { + if (! Equals(this.Value, that.Value)) return false; + return true; + + } + + + public override string ToString() { + return GetType().Name + "[" + + " Value=" + Value + + " ]"; + + } + + + + public override byte GetDataStructureType() { + return ID_BrokerId; + } + + + // Properties + + public string Value + { + get { return value; } + set { this.value = value; } + } + + } +} diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/BrokerInfo.cs b/openwire-dotnet/src/ActiveMQ/Commands/BrokerInfo.cs similarity index 94% rename from openwire-dotnet/src/ActiveMQ/OpenWire/Commands/BrokerInfo.cs rename to openwire-dotnet/src/ActiveMQ/Commands/BrokerInfo.cs index 5e0122f56b..b23e949d04 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/BrokerInfo.cs +++ b/openwire-dotnet/src/ActiveMQ/Commands/BrokerInfo.cs @@ -1,95 +1,95 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -using System; -using System.Collections; - -using ActiveMQ.OpenWire; -using ActiveMQ.OpenWire.Commands; - -namespace ActiveMQ.OpenWire.Commands -{ - // - // Marshalling code for Open Wire Format for BrokerInfo - // - // - // NOTE!: This file is autogenerated - do not modify! - // if you need to make a change, please see the Groovy scripts in the - // activemq-core module - // - public class BrokerInfo : BaseCommand - { - public const byte ID_BrokerInfo = 2; - - BrokerId brokerId; - string brokerURL; - BrokerInfo[] peerBrokerInfos; - string brokerName; - bool slaveBroker; - - public override string ToString() { - return GetType().Name + "[" - + " BrokerId=" + BrokerId - + " BrokerURL=" + BrokerURL - + " PeerBrokerInfos=" + PeerBrokerInfos - + " BrokerName=" + BrokerName - + " SlaveBroker=" + SlaveBroker - + " ]"; - - } - - - - public override byte GetDataStructureType() { - return ID_BrokerInfo; - } - - - // Properties - - public BrokerId BrokerId - { - get { return brokerId; } - set { this.brokerId = value; } - } - - public string BrokerURL - { - get { return brokerURL; } - set { this.brokerURL = value; } - } - - public BrokerInfo[] PeerBrokerInfos - { - get { return peerBrokerInfos; } - set { this.peerBrokerInfos = value; } - } - - public string BrokerName - { - get { return brokerName; } - set { this.brokerName = value; } - } - - public bool SlaveBroker - { - get { return slaveBroker; } - set { this.slaveBroker = value; } - } - - } -} +/* +* Copyright 2006 The Apache Software Foundation or its licensors, as +* applicable. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + +using System; +using System.Collections; + +using ActiveMQ.OpenWire; +using ActiveMQ.Commands; + +namespace ActiveMQ.Commands +{ + // + // Marshalling code for Open Wire Format for BrokerInfo + // + // + // NOTE!: This file is autogenerated - do not modify! + // if you need to make a change, please see the Groovy scripts in the + // activemq-core module + // + public class BrokerInfo : BaseCommand + { + public const byte ID_BrokerInfo = 2; + + BrokerId brokerId; + string brokerURL; + BrokerInfo[] peerBrokerInfos; + string brokerName; + bool slaveBroker; + + public override string ToString() { + return GetType().Name + "[" + + " BrokerId=" + BrokerId + + " BrokerURL=" + BrokerURL + + " PeerBrokerInfos=" + PeerBrokerInfos + + " BrokerName=" + BrokerName + + " SlaveBroker=" + SlaveBroker + + " ]"; + + } + + + + public override byte GetDataStructureType() { + return ID_BrokerInfo; + } + + + // Properties + + public BrokerId BrokerId + { + get { return brokerId; } + set { this.brokerId = value; } + } + + public string BrokerURL + { + get { return brokerURL; } + set { this.brokerURL = value; } + } + + public BrokerInfo[] PeerBrokerInfos + { + get { return peerBrokerInfos; } + set { this.peerBrokerInfos = value; } + } + + public string BrokerName + { + get { return brokerName; } + set { this.brokerName = value; } + } + + public bool SlaveBroker + { + get { return slaveBroker; } + set { this.slaveBroker = value; } + } + + } +} diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ConnectionError.cs b/openwire-dotnet/src/ActiveMQ/Commands/ConnectionError.cs similarity index 93% rename from openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ConnectionError.cs rename to openwire-dotnet/src/ActiveMQ/Commands/ConnectionError.cs index 28f1339d88..7c5f3f0f63 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ConnectionError.cs +++ b/openwire-dotnet/src/ActiveMQ/Commands/ConnectionError.cs @@ -1,71 +1,71 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -using System; -using System.Collections; - -using ActiveMQ.OpenWire; -using ActiveMQ.OpenWire.Commands; - -namespace ActiveMQ.OpenWire.Commands -{ - // - // Marshalling code for Open Wire Format for ConnectionError - // - // - // NOTE!: This file is autogenerated - do not modify! - // if you need to make a change, please see the Groovy scripts in the - // activemq-core module - // - public class ConnectionError : BaseCommand - { - public const byte ID_ConnectionError = 16; - - BrokerError exception; - ConnectionId connectionId; - - public override string ToString() { - return GetType().Name + "[" - + " Exception=" + Exception - + " ConnectionId=" + ConnectionId - + " ]"; - - } - - - - public override byte GetDataStructureType() { - return ID_ConnectionError; - } - - - // Properties - - public BrokerError Exception - { - get { return exception; } - set { this.exception = value; } - } - - public ConnectionId ConnectionId - { - get { return connectionId; } - set { this.connectionId = value; } - } - - } -} +/* +* Copyright 2006 The Apache Software Foundation or its licensors, as +* applicable. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + +using System; +using System.Collections; + +using ActiveMQ.OpenWire; +using ActiveMQ.Commands; + +namespace ActiveMQ.Commands +{ + // + // Marshalling code for Open Wire Format for ConnectionError + // + // + // NOTE!: This file is autogenerated - do not modify! + // if you need to make a change, please see the Groovy scripts in the + // activemq-core module + // + public class ConnectionError : BaseCommand + { + public const byte ID_ConnectionError = 16; + + BrokerError exception; + ConnectionId connectionId; + + public override string ToString() { + return GetType().Name + "[" + + " Exception=" + Exception + + " ConnectionId=" + ConnectionId + + " ]"; + + } + + + + public override byte GetDataStructureType() { + return ID_ConnectionError; + } + + + // Properties + + public BrokerError Exception + { + get { return exception; } + set { this.exception = value; } + } + + public ConnectionId ConnectionId + { + get { return connectionId; } + set { this.connectionId = value; } + } + + } +} diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ConnectionId.cs b/openwire-dotnet/src/ActiveMQ/Commands/ConnectionId.cs similarity index 93% rename from openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ConnectionId.cs rename to openwire-dotnet/src/ActiveMQ/Commands/ConnectionId.cs index 6e8cef8e0c..276a4b585e 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ConnectionId.cs +++ b/openwire-dotnet/src/ActiveMQ/Commands/ConnectionId.cs @@ -1,85 +1,85 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -using System; -using System.Collections; - -using ActiveMQ.OpenWire; -using ActiveMQ.OpenWire.Commands; - -namespace ActiveMQ.OpenWire.Commands -{ - // - // Marshalling code for Open Wire Format for ConnectionId - // - // - // NOTE!: This file is autogenerated - do not modify! - // if you need to make a change, please see the Groovy scripts in the - // activemq-core module - // - public class ConnectionId : AbstractCommand - { - public const byte ID_ConnectionId = 120; - - string value; - - public override int GetHashCode() { - int answer = 0; - answer = (answer * 37) + HashCode(Value); - return answer; - - } - - - public override bool Equals(object that) { - if (that is ConnectionId) { - return Equals((ConnectionId) that); - } - return false; - } - - public virtual bool Equals(ConnectionId that) { - if (! Equals(this.Value, that.Value)) return false; - return true; - - } - - - public override string ToString() { - return GetType().Name + "[" - + " Value=" + Value - + " ]"; - - } - - - - public override byte GetDataStructureType() { - return ID_ConnectionId; - } - - - // Properties - - public string Value - { - get { return value; } - set { this.value = value; } - } - - } -} +/* +* Copyright 2006 The Apache Software Foundation or its licensors, as +* applicable. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + +using System; +using System.Collections; + +using ActiveMQ.OpenWire; +using ActiveMQ.Commands; + +namespace ActiveMQ.Commands +{ + // + // Marshalling code for Open Wire Format for ConnectionId + // + // + // NOTE!: This file is autogenerated - do not modify! + // if you need to make a change, please see the Groovy scripts in the + // activemq-core module + // + public class ConnectionId : AbstractCommand + { + public const byte ID_ConnectionId = 120; + + string value; + + public override int GetHashCode() { + int answer = 0; + answer = (answer * 37) + HashCode(Value); + return answer; + + } + + + public override bool Equals(object that) { + if (that is ConnectionId) { + return Equals((ConnectionId) that); + } + return false; + } + + public virtual bool Equals(ConnectionId that) { + if (! Equals(this.Value, that.Value)) return false; + return true; + + } + + + public override string ToString() { + return GetType().Name + "[" + + " Value=" + Value + + " ]"; + + } + + + + public override byte GetDataStructureType() { + return ID_ConnectionId; + } + + + // Properties + + public string Value + { + get { return value; } + set { this.value = value; } + } + + } +} diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ConnectionInfo.cs b/openwire-dotnet/src/ActiveMQ/Commands/ConnectionInfo.cs similarity index 94% rename from openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ConnectionInfo.cs rename to openwire-dotnet/src/ActiveMQ/Commands/ConnectionInfo.cs index 1c2a6ebf69..8dbbaf6546 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ConnectionInfo.cs +++ b/openwire-dotnet/src/ActiveMQ/Commands/ConnectionInfo.cs @@ -1,95 +1,95 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -using System; -using System.Collections; - -using ActiveMQ.OpenWire; -using ActiveMQ.OpenWire.Commands; - -namespace ActiveMQ.OpenWire.Commands -{ - // - // Marshalling code for Open Wire Format for ConnectionInfo - // - // - // NOTE!: This file is autogenerated - do not modify! - // if you need to make a change, please see the Groovy scripts in the - // activemq-core module - // - public class ConnectionInfo : BaseCommand - { - public const byte ID_ConnectionInfo = 3; - - ConnectionId connectionId; - string clientId; - string password; - string userName; - BrokerId[] brokerPath; - - public override string ToString() { - return GetType().Name + "[" - + " ConnectionId=" + ConnectionId - + " ClientId=" + ClientId - + " Password=" + Password - + " UserName=" + UserName - + " BrokerPath=" + BrokerPath - + " ]"; - - } - - - - public override byte GetDataStructureType() { - return ID_ConnectionInfo; - } - - - // Properties - - public ConnectionId ConnectionId - { - get { return connectionId; } - set { this.connectionId = value; } - } - - public string ClientId - { - get { return clientId; } - set { this.clientId = value; } - } - - public string Password - { - get { return password; } - set { this.password = value; } - } - - public string UserName - { - get { return userName; } - set { this.userName = value; } - } - - public BrokerId[] BrokerPath - { - get { return brokerPath; } - set { this.brokerPath = value; } - } - - } -} +/* +* Copyright 2006 The Apache Software Foundation or its licensors, as +* applicable. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + +using System; +using System.Collections; + +using ActiveMQ.OpenWire; +using ActiveMQ.Commands; + +namespace ActiveMQ.Commands +{ + // + // Marshalling code for Open Wire Format for ConnectionInfo + // + // + // NOTE!: This file is autogenerated - do not modify! + // if you need to make a change, please see the Groovy scripts in the + // activemq-core module + // + public class ConnectionInfo : BaseCommand + { + public const byte ID_ConnectionInfo = 3; + + ConnectionId connectionId; + string clientId; + string password; + string userName; + BrokerId[] brokerPath; + + public override string ToString() { + return GetType().Name + "[" + + " ConnectionId=" + ConnectionId + + " ClientId=" + ClientId + + " Password=" + Password + + " UserName=" + UserName + + " BrokerPath=" + BrokerPath + + " ]"; + + } + + + + public override byte GetDataStructureType() { + return ID_ConnectionInfo; + } + + + // Properties + + public ConnectionId ConnectionId + { + get { return connectionId; } + set { this.connectionId = value; } + } + + public string ClientId + { + get { return clientId; } + set { this.clientId = value; } + } + + public string Password + { + get { return password; } + set { this.password = value; } + } + + public string UserName + { + get { return userName; } + set { this.userName = value; } + } + + public BrokerId[] BrokerPath + { + get { return brokerPath; } + set { this.brokerPath = value; } + } + + } +} diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ConsumerId.cs b/openwire-dotnet/src/ActiveMQ/Commands/ConsumerId.cs similarity index 94% rename from openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ConsumerId.cs rename to openwire-dotnet/src/ActiveMQ/Commands/ConsumerId.cs index 312fc4d26d..25a3517758 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ConsumerId.cs +++ b/openwire-dotnet/src/ActiveMQ/Commands/ConsumerId.cs @@ -1,105 +1,105 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -using System; -using System.Collections; - -using ActiveMQ.OpenWire; -using ActiveMQ.OpenWire.Commands; - -namespace ActiveMQ.OpenWire.Commands -{ - // - // Marshalling code for Open Wire Format for ConsumerId - // - // - // NOTE!: This file is autogenerated - do not modify! - // if you need to make a change, please see the Groovy scripts in the - // activemq-core module - // - public class ConsumerId : AbstractCommand - { - public const byte ID_ConsumerId = 122; - - string connectionId; - long sessionId; - long value; - - public override int GetHashCode() { - int answer = 0; - answer = (answer * 37) + HashCode(ConnectionId); - answer = (answer * 37) + HashCode(SessionId); - answer = (answer * 37) + HashCode(Value); - return answer; - - } - - - public override bool Equals(object that) { - if (that is ConsumerId) { - return Equals((ConsumerId) that); - } - return false; - } - - public virtual bool Equals(ConsumerId that) { - if (! Equals(this.ConnectionId, that.ConnectionId)) return false; - if (! Equals(this.SessionId, that.SessionId)) return false; - if (! Equals(this.Value, that.Value)) return false; - return true; - - } - - - public override string ToString() { - return GetType().Name + "[" - + " ConnectionId=" + ConnectionId - + " SessionId=" + SessionId - + " Value=" + Value - + " ]"; - - } - - - - public override byte GetDataStructureType() { - return ID_ConsumerId; - } - - - // Properties - - public string ConnectionId - { - get { return connectionId; } - set { this.connectionId = value; } - } - - public long SessionId - { - get { return sessionId; } - set { this.sessionId = value; } - } - - public long Value - { - get { return value; } - set { this.value = value; } - } - - } -} +/* +* Copyright 2006 The Apache Software Foundation or its licensors, as +* applicable. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + +using System; +using System.Collections; + +using ActiveMQ.OpenWire; +using ActiveMQ.Commands; + +namespace ActiveMQ.Commands +{ + // + // Marshalling code for Open Wire Format for ConsumerId + // + // + // NOTE!: This file is autogenerated - do not modify! + // if you need to make a change, please see the Groovy scripts in the + // activemq-core module + // + public class ConsumerId : AbstractCommand + { + public const byte ID_ConsumerId = 122; + + string connectionId; + long sessionId; + long value; + + public override int GetHashCode() { + int answer = 0; + answer = (answer * 37) + HashCode(ConnectionId); + answer = (answer * 37) + HashCode(SessionId); + answer = (answer * 37) + HashCode(Value); + return answer; + + } + + + public override bool Equals(object that) { + if (that is ConsumerId) { + return Equals((ConsumerId) that); + } + return false; + } + + public virtual bool Equals(ConsumerId that) { + if (! Equals(this.ConnectionId, that.ConnectionId)) return false; + if (! Equals(this.SessionId, that.SessionId)) return false; + if (! Equals(this.Value, that.Value)) return false; + return true; + + } + + + public override string ToString() { + return GetType().Name + "[" + + " ConnectionId=" + ConnectionId + + " SessionId=" + SessionId + + " Value=" + Value + + " ]"; + + } + + + + public override byte GetDataStructureType() { + return ID_ConsumerId; + } + + + // Properties + + public string ConnectionId + { + get { return connectionId; } + set { this.connectionId = value; } + } + + public long SessionId + { + get { return sessionId; } + set { this.sessionId = value; } + } + + public long Value + { + get { return value; } + set { this.value = value; } + } + + } +} diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ConsumerInfo.cs b/openwire-dotnet/src/ActiveMQ/Commands/ConsumerInfo.cs similarity index 95% rename from openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ConsumerInfo.cs rename to openwire-dotnet/src/ActiveMQ/Commands/ConsumerInfo.cs index 92fad09a86..506696e590 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ConsumerInfo.cs +++ b/openwire-dotnet/src/ActiveMQ/Commands/ConsumerInfo.cs @@ -1,167 +1,167 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -using System; -using System.Collections; - -using ActiveMQ.OpenWire; -using ActiveMQ.OpenWire.Commands; - -namespace ActiveMQ.OpenWire.Commands -{ - // - // Marshalling code for Open Wire Format for ConsumerInfo - // - // - // NOTE!: This file is autogenerated - do not modify! - // if you need to make a change, please see the Groovy scripts in the - // activemq-core module - // - public class ConsumerInfo : BaseCommand - { - public const byte ID_ConsumerInfo = 5; - - ConsumerId consumerId; - bool browser; - ActiveMQDestination destination; - int prefetchSize; - int maximumPendingMessageLimit; - bool dispatchAsync; - string selector; - string subcriptionName; - bool noLocal; - bool exclusive; - bool retroactive; - byte priority; - BrokerId[] brokerPath; - bool networkSubscription; - - public override string ToString() { - return GetType().Name + "[" - + " ConsumerId=" + ConsumerId - + " Browser=" + Browser - + " Destination=" + Destination - + " PrefetchSize=" + PrefetchSize - + " MaximumPendingMessageLimit=" + MaximumPendingMessageLimit - + " DispatchAsync=" + DispatchAsync - + " Selector=" + Selector - + " SubcriptionName=" + SubcriptionName - + " NoLocal=" + NoLocal - + " Exclusive=" + Exclusive - + " Retroactive=" + Retroactive - + " Priority=" + Priority - + " BrokerPath=" + BrokerPath - + " NetworkSubscription=" + NetworkSubscription - + " ]"; - - } - - - - public override byte GetDataStructureType() { - return ID_ConsumerInfo; - } - - - // Properties - - public ConsumerId ConsumerId - { - get { return consumerId; } - set { this.consumerId = value; } - } - - public bool Browser - { - get { return browser; } - set { this.browser = value; } - } - - public ActiveMQDestination Destination - { - get { return destination; } - set { this.destination = value; } - } - - public int PrefetchSize - { - get { return prefetchSize; } - set { this.prefetchSize = value; } - } - - public int MaximumPendingMessageLimit - { - get { return maximumPendingMessageLimit; } - set { this.maximumPendingMessageLimit = value; } - } - - public bool DispatchAsync - { - get { return dispatchAsync; } - set { this.dispatchAsync = value; } - } - - public string Selector - { - get { return selector; } - set { this.selector = value; } - } - - public string SubcriptionName - { - get { return subcriptionName; } - set { this.subcriptionName = value; } - } - - public bool NoLocal - { - get { return noLocal; } - set { this.noLocal = value; } - } - - public bool Exclusive - { - get { return exclusive; } - set { this.exclusive = value; } - } - - public bool Retroactive - { - get { return retroactive; } - set { this.retroactive = value; } - } - - public byte Priority - { - get { return priority; } - set { this.priority = value; } - } - - public BrokerId[] BrokerPath - { - get { return brokerPath; } - set { this.brokerPath = value; } - } - - public bool NetworkSubscription - { - get { return networkSubscription; } - set { this.networkSubscription = value; } - } - - } -} +/* +* Copyright 2006 The Apache Software Foundation or its licensors, as +* applicable. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + +using System; +using System.Collections; + +using ActiveMQ.OpenWire; +using ActiveMQ.Commands; + +namespace ActiveMQ.Commands +{ + // + // Marshalling code for Open Wire Format for ConsumerInfo + // + // + // NOTE!: This file is autogenerated - do not modify! + // if you need to make a change, please see the Groovy scripts in the + // activemq-core module + // + public class ConsumerInfo : BaseCommand + { + public const byte ID_ConsumerInfo = 5; + + ConsumerId consumerId; + bool browser; + ActiveMQDestination destination; + int prefetchSize; + int maximumPendingMessageLimit; + bool dispatchAsync; + string selector; + string subcriptionName; + bool noLocal; + bool exclusive; + bool retroactive; + byte priority; + BrokerId[] brokerPath; + bool networkSubscription; + + public override string ToString() { + return GetType().Name + "[" + + " ConsumerId=" + ConsumerId + + " Browser=" + Browser + + " Destination=" + Destination + + " PrefetchSize=" + PrefetchSize + + " MaximumPendingMessageLimit=" + MaximumPendingMessageLimit + + " DispatchAsync=" + DispatchAsync + + " Selector=" + Selector + + " SubcriptionName=" + SubcriptionName + + " NoLocal=" + NoLocal + + " Exclusive=" + Exclusive + + " Retroactive=" + Retroactive + + " Priority=" + Priority + + " BrokerPath=" + BrokerPath + + " NetworkSubscription=" + NetworkSubscription + + " ]"; + + } + + + + public override byte GetDataStructureType() { + return ID_ConsumerInfo; + } + + + // Properties + + public ConsumerId ConsumerId + { + get { return consumerId; } + set { this.consumerId = value; } + } + + public bool Browser + { + get { return browser; } + set { this.browser = value; } + } + + public ActiveMQDestination Destination + { + get { return destination; } + set { this.destination = value; } + } + + public int PrefetchSize + { + get { return prefetchSize; } + set { this.prefetchSize = value; } + } + + public int MaximumPendingMessageLimit + { + get { return maximumPendingMessageLimit; } + set { this.maximumPendingMessageLimit = value; } + } + + public bool DispatchAsync + { + get { return dispatchAsync; } + set { this.dispatchAsync = value; } + } + + public string Selector + { + get { return selector; } + set { this.selector = value; } + } + + public string SubcriptionName + { + get { return subcriptionName; } + set { this.subcriptionName = value; } + } + + public bool NoLocal + { + get { return noLocal; } + set { this.noLocal = value; } + } + + public bool Exclusive + { + get { return exclusive; } + set { this.exclusive = value; } + } + + public bool Retroactive + { + get { return retroactive; } + set { this.retroactive = value; } + } + + public byte Priority + { + get { return priority; } + set { this.priority = value; } + } + + public BrokerId[] BrokerPath + { + get { return brokerPath; } + set { this.brokerPath = value; } + } + + public bool NetworkSubscription + { + get { return networkSubscription; } + set { this.networkSubscription = value; } + } + + } +} diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ControlCommand.cs b/openwire-dotnet/src/ActiveMQ/Commands/ControlCommand.cs similarity index 92% rename from openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ControlCommand.cs rename to openwire-dotnet/src/ActiveMQ/Commands/ControlCommand.cs index 65e9bc58db..25969600d6 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ControlCommand.cs +++ b/openwire-dotnet/src/ActiveMQ/Commands/ControlCommand.cs @@ -1,63 +1,63 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -using System; -using System.Collections; - -using ActiveMQ.OpenWire; -using ActiveMQ.OpenWire.Commands; - -namespace ActiveMQ.OpenWire.Commands -{ - // - // Marshalling code for Open Wire Format for ControlCommand - // - // - // NOTE!: This file is autogenerated - do not modify! - // if you need to make a change, please see the Groovy scripts in the - // activemq-core module - // - public class ControlCommand : BaseCommand - { - public const byte ID_ControlCommand = 14; - - string command; - - public override string ToString() { - return GetType().Name + "[" - + " Command=" + Command - + " ]"; - - } - - - - public override byte GetDataStructureType() { - return ID_ControlCommand; - } - - - // Properties - - public string Command - { - get { return command; } - set { this.command = value; } - } - - } -} +/* +* Copyright 2006 The Apache Software Foundation or its licensors, as +* applicable. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + +using System; +using System.Collections; + +using ActiveMQ.OpenWire; +using ActiveMQ.Commands; + +namespace ActiveMQ.Commands +{ + // + // Marshalling code for Open Wire Format for ControlCommand + // + // + // NOTE!: This file is autogenerated - do not modify! + // if you need to make a change, please see the Groovy scripts in the + // activemq-core module + // + public class ControlCommand : BaseCommand + { + public const byte ID_ControlCommand = 14; + + string command; + + public override string ToString() { + return GetType().Name + "[" + + " Command=" + Command + + " ]"; + + } + + + + public override byte GetDataStructureType() { + return ID_ControlCommand; + } + + + // Properties + + public string Command + { + get { return command; } + set { this.command = value; } + } + + } +} diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/DataArrayResponse.cs b/openwire-dotnet/src/ActiveMQ/Commands/DataArrayResponse.cs similarity index 93% rename from openwire-dotnet/src/ActiveMQ/OpenWire/Commands/DataArrayResponse.cs rename to openwire-dotnet/src/ActiveMQ/Commands/DataArrayResponse.cs index e6515f8fbc..82d73eaa00 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/DataArrayResponse.cs +++ b/openwire-dotnet/src/ActiveMQ/Commands/DataArrayResponse.cs @@ -1,63 +1,63 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -using System; -using System.Collections; - -using ActiveMQ.OpenWire; -using ActiveMQ.OpenWire.Commands; - -namespace ActiveMQ.OpenWire.Commands -{ - // - // Marshalling code for Open Wire Format for DataArrayResponse - // - // - // NOTE!: This file is autogenerated - do not modify! - // if you need to make a change, please see the Groovy scripts in the - // activemq-core module - // - public class DataArrayResponse : Response - { - public const byte ID_DataArrayResponse = 33; - - DataStructure[] data; - - public override string ToString() { - return GetType().Name + "[" - + " Data=" + Data - + " ]"; - - } - - - - public override byte GetDataStructureType() { - return ID_DataArrayResponse; - } - - - // Properties - - public DataStructure[] Data - { - get { return data; } - set { this.data = value; } - } - - } -} +/* +* Copyright 2006 The Apache Software Foundation or its licensors, as +* applicable. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + +using System; +using System.Collections; + +using ActiveMQ.OpenWire; +using ActiveMQ.Commands; + +namespace ActiveMQ.Commands +{ + // + // Marshalling code for Open Wire Format for DataArrayResponse + // + // + // NOTE!: This file is autogenerated - do not modify! + // if you need to make a change, please see the Groovy scripts in the + // activemq-core module + // + public class DataArrayResponse : Response + { + public const byte ID_DataArrayResponse = 33; + + DataStructure[] data; + + public override string ToString() { + return GetType().Name + "[" + + " Data=" + Data + + " ]"; + + } + + + + public override byte GetDataStructureType() { + return ID_DataArrayResponse; + } + + + // Properties + + public DataStructure[] Data + { + get { return data; } + set { this.data = value; } + } + + } +} diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/DataResponse.cs b/openwire-dotnet/src/ActiveMQ/Commands/DataResponse.cs similarity index 92% rename from openwire-dotnet/src/ActiveMQ/OpenWire/Commands/DataResponse.cs rename to openwire-dotnet/src/ActiveMQ/Commands/DataResponse.cs index 94e06aaf33..b15e5b8d10 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/DataResponse.cs +++ b/openwire-dotnet/src/ActiveMQ/Commands/DataResponse.cs @@ -1,63 +1,63 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -using System; -using System.Collections; - -using ActiveMQ.OpenWire; -using ActiveMQ.OpenWire.Commands; - -namespace ActiveMQ.OpenWire.Commands -{ - // - // Marshalling code for Open Wire Format for DataResponse - // - // - // NOTE!: This file is autogenerated - do not modify! - // if you need to make a change, please see the Groovy scripts in the - // activemq-core module - // - public class DataResponse : Response - { - public const byte ID_DataResponse = 32; - - DataStructure data; - - public override string ToString() { - return GetType().Name + "[" - + " Data=" + Data - + " ]"; - - } - - - - public override byte GetDataStructureType() { - return ID_DataResponse; - } - - - // Properties - - public DataStructure Data - { - get { return data; } - set { this.data = value; } - } - - } -} +/* +* Copyright 2006 The Apache Software Foundation or its licensors, as +* applicable. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + +using System; +using System.Collections; + +using ActiveMQ.OpenWire; +using ActiveMQ.Commands; + +namespace ActiveMQ.Commands +{ + // + // Marshalling code for Open Wire Format for DataResponse + // + // + // NOTE!: This file is autogenerated - do not modify! + // if you need to make a change, please see the Groovy scripts in the + // activemq-core module + // + public class DataResponse : Response + { + public const byte ID_DataResponse = 32; + + DataStructure data; + + public override string ToString() { + return GetType().Name + "[" + + " Data=" + Data + + " ]"; + + } + + + + public override byte GetDataStructureType() { + return ID_DataResponse; + } + + + // Properties + + public DataStructure Data + { + get { return data; } + set { this.data = value; } + } + + } +} diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/DestinationInfo.cs b/openwire-dotnet/src/ActiveMQ/Commands/DestinationInfo.cs similarity index 94% rename from openwire-dotnet/src/ActiveMQ/OpenWire/Commands/DestinationInfo.cs rename to openwire-dotnet/src/ActiveMQ/Commands/DestinationInfo.cs index 5ceaba4238..aff7c7dd95 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/DestinationInfo.cs +++ b/openwire-dotnet/src/ActiveMQ/Commands/DestinationInfo.cs @@ -1,95 +1,95 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -using System; -using System.Collections; - -using ActiveMQ.OpenWire; -using ActiveMQ.OpenWire.Commands; - -namespace ActiveMQ.OpenWire.Commands -{ - // - // Marshalling code for Open Wire Format for DestinationInfo - // - // - // NOTE!: This file is autogenerated - do not modify! - // if you need to make a change, please see the Groovy scripts in the - // activemq-core module - // - public class DestinationInfo : BaseCommand - { - public const byte ID_DestinationInfo = 8; - - ConnectionId connectionId; - ActiveMQDestination destination; - byte operationType; - long timeout; - BrokerId[] brokerPath; - - public override string ToString() { - return GetType().Name + "[" - + " ConnectionId=" + ConnectionId - + " Destination=" + Destination - + " OperationType=" + OperationType - + " Timeout=" + Timeout - + " BrokerPath=" + BrokerPath - + " ]"; - - } - - - - public override byte GetDataStructureType() { - return ID_DestinationInfo; - } - - - // Properties - - public ConnectionId ConnectionId - { - get { return connectionId; } - set { this.connectionId = value; } - } - - public ActiveMQDestination Destination - { - get { return destination; } - set { this.destination = value; } - } - - public byte OperationType - { - get { return operationType; } - set { this.operationType = value; } - } - - public long Timeout - { - get { return timeout; } - set { this.timeout = value; } - } - - public BrokerId[] BrokerPath - { - get { return brokerPath; } - set { this.brokerPath = value; } - } - - } -} +/* +* Copyright 2006 The Apache Software Foundation or its licensors, as +* applicable. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + +using System; +using System.Collections; + +using ActiveMQ.OpenWire; +using ActiveMQ.Commands; + +namespace ActiveMQ.Commands +{ + // + // Marshalling code for Open Wire Format for DestinationInfo + // + // + // NOTE!: This file is autogenerated - do not modify! + // if you need to make a change, please see the Groovy scripts in the + // activemq-core module + // + public class DestinationInfo : BaseCommand + { + public const byte ID_DestinationInfo = 8; + + ConnectionId connectionId; + ActiveMQDestination destination; + byte operationType; + long timeout; + BrokerId[] brokerPath; + + public override string ToString() { + return GetType().Name + "[" + + " ConnectionId=" + ConnectionId + + " Destination=" + Destination + + " OperationType=" + OperationType + + " Timeout=" + Timeout + + " BrokerPath=" + BrokerPath + + " ]"; + + } + + + + public override byte GetDataStructureType() { + return ID_DestinationInfo; + } + + + // Properties + + public ConnectionId ConnectionId + { + get { return connectionId; } + set { this.connectionId = value; } + } + + public ActiveMQDestination Destination + { + get { return destination; } + set { this.destination = value; } + } + + public byte OperationType + { + get { return operationType; } + set { this.operationType = value; } + } + + public long Timeout + { + get { return timeout; } + set { this.timeout = value; } + } + + public BrokerId[] BrokerPath + { + get { return brokerPath; } + set { this.brokerPath = value; } + } + + } +} diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/DiscoveryEvent.cs b/openwire-dotnet/src/ActiveMQ/Commands/DiscoveryEvent.cs similarity index 93% rename from openwire-dotnet/src/ActiveMQ/OpenWire/Commands/DiscoveryEvent.cs rename to openwire-dotnet/src/ActiveMQ/Commands/DiscoveryEvent.cs index 9cc6af2c5b..f6dcf187cd 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/DiscoveryEvent.cs +++ b/openwire-dotnet/src/ActiveMQ/Commands/DiscoveryEvent.cs @@ -1,71 +1,71 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -using System; -using System.Collections; - -using ActiveMQ.OpenWire; -using ActiveMQ.OpenWire.Commands; - -namespace ActiveMQ.OpenWire.Commands -{ - // - // Marshalling code for Open Wire Format for DiscoveryEvent - // - // - // NOTE!: This file is autogenerated - do not modify! - // if you need to make a change, please see the Groovy scripts in the - // activemq-core module - // - public class DiscoveryEvent : AbstractCommand - { - public const byte ID_DiscoveryEvent = 40; - - string serviceName; - string brokerName; - - public override string ToString() { - return GetType().Name + "[" - + " ServiceName=" + ServiceName - + " BrokerName=" + BrokerName - + " ]"; - - } - - - - public override byte GetDataStructureType() { - return ID_DiscoveryEvent; - } - - - // Properties - - public string ServiceName - { - get { return serviceName; } - set { this.serviceName = value; } - } - - public string BrokerName - { - get { return brokerName; } - set { this.brokerName = value; } - } - - } -} +/* +* Copyright 2006 The Apache Software Foundation or its licensors, as +* applicable. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + +using System; +using System.Collections; + +using ActiveMQ.OpenWire; +using ActiveMQ.Commands; + +namespace ActiveMQ.Commands +{ + // + // Marshalling code for Open Wire Format for DiscoveryEvent + // + // + // NOTE!: This file is autogenerated - do not modify! + // if you need to make a change, please see the Groovy scripts in the + // activemq-core module + // + public class DiscoveryEvent : AbstractCommand + { + public const byte ID_DiscoveryEvent = 40; + + string serviceName; + string brokerName; + + public override string ToString() { + return GetType().Name + "[" + + " ServiceName=" + ServiceName + + " BrokerName=" + BrokerName + + " ]"; + + } + + + + public override byte GetDataStructureType() { + return ID_DiscoveryEvent; + } + + + // Properties + + public string ServiceName + { + get { return serviceName; } + set { this.serviceName = value; } + } + + public string BrokerName + { + get { return brokerName; } + set { this.brokerName = value; } + } + + } +} diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ExceptionResponse.cs b/openwire-dotnet/src/ActiveMQ/Commands/ExceptionResponse.cs similarity index 93% rename from openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ExceptionResponse.cs rename to openwire-dotnet/src/ActiveMQ/Commands/ExceptionResponse.cs index ce38ad3efd..8e3aee9281 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ExceptionResponse.cs +++ b/openwire-dotnet/src/ActiveMQ/Commands/ExceptionResponse.cs @@ -1,63 +1,63 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -using System; -using System.Collections; - -using ActiveMQ.OpenWire; -using ActiveMQ.OpenWire.Commands; - -namespace ActiveMQ.OpenWire.Commands -{ - // - // Marshalling code for Open Wire Format for ExceptionResponse - // - // - // NOTE!: This file is autogenerated - do not modify! - // if you need to make a change, please see the Groovy scripts in the - // activemq-core module - // - public class ExceptionResponse : Response - { - public const byte ID_ExceptionResponse = 31; - - BrokerError exception; - - public override string ToString() { - return GetType().Name + "[" - + " Exception=" + Exception - + " ]"; - - } - - - - public override byte GetDataStructureType() { - return ID_ExceptionResponse; - } - - - // Properties - - public BrokerError Exception - { - get { return exception; } - set { this.exception = value; } - } - - } -} +/* +* Copyright 2006 The Apache Software Foundation or its licensors, as +* applicable. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + +using System; +using System.Collections; + +using ActiveMQ.OpenWire; +using ActiveMQ.Commands; + +namespace ActiveMQ.Commands +{ + // + // Marshalling code for Open Wire Format for ExceptionResponse + // + // + // NOTE!: This file is autogenerated - do not modify! + // if you need to make a change, please see the Groovy scripts in the + // activemq-core module + // + public class ExceptionResponse : Response + { + public const byte ID_ExceptionResponse = 31; + + BrokerError exception; + + public override string ToString() { + return GetType().Name + "[" + + " Exception=" + Exception + + " ]"; + + } + + + + public override byte GetDataStructureType() { + return ID_ExceptionResponse; + } + + + // Properties + + public BrokerError Exception + { + get { return exception; } + set { this.exception = value; } + } + + } +} diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/FlushCommand.cs b/openwire-dotnet/src/ActiveMQ/Commands/FlushCommand.cs similarity index 92% rename from openwire-dotnet/src/ActiveMQ/OpenWire/Commands/FlushCommand.cs rename to openwire-dotnet/src/ActiveMQ/Commands/FlushCommand.cs index f6866a6228..3cb60557db 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/FlushCommand.cs +++ b/openwire-dotnet/src/ActiveMQ/Commands/FlushCommand.cs @@ -1,55 +1,55 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -using System; -using System.Collections; - -using ActiveMQ.OpenWire; -using ActiveMQ.OpenWire.Commands; - -namespace ActiveMQ.OpenWire.Commands -{ - // - // Marshalling code for Open Wire Format for FlushCommand - // - // - // NOTE!: This file is autogenerated - do not modify! - // if you need to make a change, please see the Groovy scripts in the - // activemq-core module - // - public class FlushCommand : BaseCommand - { - public const byte ID_FlushCommand = 15; - - - public override string ToString() { - return GetType().Name + "[" - + " ]"; - - } - - - - public override byte GetDataStructureType() { - return ID_FlushCommand; - } - - - // Properties - - } -} +/* +* Copyright 2006 The Apache Software Foundation or its licensors, as +* applicable. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + +using System; +using System.Collections; + +using ActiveMQ.OpenWire; +using ActiveMQ.Commands; + +namespace ActiveMQ.Commands +{ + // + // Marshalling code for Open Wire Format for FlushCommand + // + // + // NOTE!: This file is autogenerated - do not modify! + // if you need to make a change, please see the Groovy scripts in the + // activemq-core module + // + public class FlushCommand : BaseCommand + { + public const byte ID_FlushCommand = 15; + + + public override string ToString() { + return GetType().Name + "[" + + " ]"; + + } + + + + public override byte GetDataStructureType() { + return ID_FlushCommand; + } + + + // Properties + + } +} diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/IntegerResponse.cs b/openwire-dotnet/src/ActiveMQ/Commands/IntegerResponse.cs similarity index 92% rename from openwire-dotnet/src/ActiveMQ/OpenWire/Commands/IntegerResponse.cs rename to openwire-dotnet/src/ActiveMQ/Commands/IntegerResponse.cs index dad82c1c01..030ea53768 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/IntegerResponse.cs +++ b/openwire-dotnet/src/ActiveMQ/Commands/IntegerResponse.cs @@ -1,63 +1,63 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -using System; -using System.Collections; - -using ActiveMQ.OpenWire; -using ActiveMQ.OpenWire.Commands; - -namespace ActiveMQ.OpenWire.Commands -{ - // - // Marshalling code for Open Wire Format for IntegerResponse - // - // - // NOTE!: This file is autogenerated - do not modify! - // if you need to make a change, please see the Groovy scripts in the - // activemq-core module - // - public class IntegerResponse : Response - { - public const byte ID_IntegerResponse = 34; - - int result; - - public override string ToString() { - return GetType().Name + "[" - + " Result=" + Result - + " ]"; - - } - - - - public override byte GetDataStructureType() { - return ID_IntegerResponse; - } - - - // Properties - - public int Result - { - get { return result; } - set { this.result = value; } - } - - } -} +/* +* Copyright 2006 The Apache Software Foundation or its licensors, as +* applicable. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + +using System; +using System.Collections; + +using ActiveMQ.OpenWire; +using ActiveMQ.Commands; + +namespace ActiveMQ.Commands +{ + // + // Marshalling code for Open Wire Format for IntegerResponse + // + // + // NOTE!: This file is autogenerated - do not modify! + // if you need to make a change, please see the Groovy scripts in the + // activemq-core module + // + public class IntegerResponse : Response + { + public const byte ID_IntegerResponse = 34; + + int result; + + public override string ToString() { + return GetType().Name + "[" + + " Result=" + Result + + " ]"; + + } + + + + public override byte GetDataStructureType() { + return ID_IntegerResponse; + } + + + // Properties + + public int Result + { + get { return result; } + set { this.result = value; } + } + + } +} diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/JournalQueueAck.cs b/openwire-dotnet/src/ActiveMQ/Commands/JournalQueueAck.cs similarity index 93% rename from openwire-dotnet/src/ActiveMQ/OpenWire/Commands/JournalQueueAck.cs rename to openwire-dotnet/src/ActiveMQ/Commands/JournalQueueAck.cs index 4db8a5787b..21eb773dae 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/JournalQueueAck.cs +++ b/openwire-dotnet/src/ActiveMQ/Commands/JournalQueueAck.cs @@ -1,71 +1,71 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -using System; -using System.Collections; - -using ActiveMQ.OpenWire; -using ActiveMQ.OpenWire.Commands; - -namespace ActiveMQ.OpenWire.Commands -{ - // - // Marshalling code for Open Wire Format for JournalQueueAck - // - // - // NOTE!: This file is autogenerated - do not modify! - // if you need to make a change, please see the Groovy scripts in the - // activemq-core module - // - public class JournalQueueAck : AbstractCommand - { - public const byte ID_JournalQueueAck = 52; - - ActiveMQDestination destination; - MessageAck messageAck; - - public override string ToString() { - return GetType().Name + "[" - + " Destination=" + Destination - + " MessageAck=" + MessageAck - + " ]"; - - } - - - - public override byte GetDataStructureType() { - return ID_JournalQueueAck; - } - - - // Properties - - public ActiveMQDestination Destination - { - get { return destination; } - set { this.destination = value; } - } - - public MessageAck MessageAck - { - get { return messageAck; } - set { this.messageAck = value; } - } - - } -} +/* +* Copyright 2006 The Apache Software Foundation or its licensors, as +* applicable. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + +using System; +using System.Collections; + +using ActiveMQ.OpenWire; +using ActiveMQ.Commands; + +namespace ActiveMQ.Commands +{ + // + // Marshalling code for Open Wire Format for JournalQueueAck + // + // + // NOTE!: This file is autogenerated - do not modify! + // if you need to make a change, please see the Groovy scripts in the + // activemq-core module + // + public class JournalQueueAck : AbstractCommand + { + public const byte ID_JournalQueueAck = 52; + + ActiveMQDestination destination; + MessageAck messageAck; + + public override string ToString() { + return GetType().Name + "[" + + " Destination=" + Destination + + " MessageAck=" + MessageAck + + " ]"; + + } + + + + public override byte GetDataStructureType() { + return ID_JournalQueueAck; + } + + + // Properties + + public ActiveMQDestination Destination + { + get { return destination; } + set { this.destination = value; } + } + + public MessageAck MessageAck + { + get { return messageAck; } + set { this.messageAck = value; } + } + + } +} diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/JournalTopicAck.cs b/openwire-dotnet/src/ActiveMQ/Commands/JournalTopicAck.cs similarity index 94% rename from openwire-dotnet/src/ActiveMQ/OpenWire/Commands/JournalTopicAck.cs rename to openwire-dotnet/src/ActiveMQ/Commands/JournalTopicAck.cs index 6011e54832..3e545b4714 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/JournalTopicAck.cs +++ b/openwire-dotnet/src/ActiveMQ/Commands/JournalTopicAck.cs @@ -1,103 +1,103 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -using System; -using System.Collections; - -using ActiveMQ.OpenWire; -using ActiveMQ.OpenWire.Commands; - -namespace ActiveMQ.OpenWire.Commands -{ - // - // Marshalling code for Open Wire Format for JournalTopicAck - // - // - // NOTE!: This file is autogenerated - do not modify! - // if you need to make a change, please see the Groovy scripts in the - // activemq-core module - // - public class JournalTopicAck : AbstractCommand - { - public const byte ID_JournalTopicAck = 50; - - ActiveMQDestination destination; - MessageId messageId; - long messageSequenceId; - string subscritionName; - string clientId; - TransactionId transactionId; - - public override string ToString() { - return GetType().Name + "[" - + " Destination=" + Destination - + " MessageId=" + MessageId - + " MessageSequenceId=" + MessageSequenceId - + " SubscritionName=" + SubscritionName - + " ClientId=" + ClientId - + " TransactionId=" + TransactionId - + " ]"; - - } - - - - public override byte GetDataStructureType() { - return ID_JournalTopicAck; - } - - - // Properties - - public ActiveMQDestination Destination - { - get { return destination; } - set { this.destination = value; } - } - - public MessageId MessageId - { - get { return messageId; } - set { this.messageId = value; } - } - - public long MessageSequenceId - { - get { return messageSequenceId; } - set { this.messageSequenceId = value; } - } - - public string SubscritionName - { - get { return subscritionName; } - set { this.subscritionName = value; } - } - - public string ClientId - { - get { return clientId; } - set { this.clientId = value; } - } - - public TransactionId TransactionId - { - get { return transactionId; } - set { this.transactionId = value; } - } - - } -} +/* +* Copyright 2006 The Apache Software Foundation or its licensors, as +* applicable. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + +using System; +using System.Collections; + +using ActiveMQ.OpenWire; +using ActiveMQ.Commands; + +namespace ActiveMQ.Commands +{ + // + // Marshalling code for Open Wire Format for JournalTopicAck + // + // + // NOTE!: This file is autogenerated - do not modify! + // if you need to make a change, please see the Groovy scripts in the + // activemq-core module + // + public class JournalTopicAck : AbstractCommand + { + public const byte ID_JournalTopicAck = 50; + + ActiveMQDestination destination; + MessageId messageId; + long messageSequenceId; + string subscritionName; + string clientId; + TransactionId transactionId; + + public override string ToString() { + return GetType().Name + "[" + + " Destination=" + Destination + + " MessageId=" + MessageId + + " MessageSequenceId=" + MessageSequenceId + + " SubscritionName=" + SubscritionName + + " ClientId=" + ClientId + + " TransactionId=" + TransactionId + + " ]"; + + } + + + + public override byte GetDataStructureType() { + return ID_JournalTopicAck; + } + + + // Properties + + public ActiveMQDestination Destination + { + get { return destination; } + set { this.destination = value; } + } + + public MessageId MessageId + { + get { return messageId; } + set { this.messageId = value; } + } + + public long MessageSequenceId + { + get { return messageSequenceId; } + set { this.messageSequenceId = value; } + } + + public string SubscritionName + { + get { return subscritionName; } + set { this.subscritionName = value; } + } + + public string ClientId + { + get { return clientId; } + set { this.clientId = value; } + } + + public TransactionId TransactionId + { + get { return transactionId; } + set { this.transactionId = value; } + } + + } +} diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/JournalTrace.cs b/openwire-dotnet/src/ActiveMQ/Commands/JournalTrace.cs similarity index 92% rename from openwire-dotnet/src/ActiveMQ/OpenWire/Commands/JournalTrace.cs rename to openwire-dotnet/src/ActiveMQ/Commands/JournalTrace.cs index ce70e6c709..f6c37fcc0d 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/JournalTrace.cs +++ b/openwire-dotnet/src/ActiveMQ/Commands/JournalTrace.cs @@ -1,63 +1,63 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -using System; -using System.Collections; - -using ActiveMQ.OpenWire; -using ActiveMQ.OpenWire.Commands; - -namespace ActiveMQ.OpenWire.Commands -{ - // - // Marshalling code for Open Wire Format for JournalTrace - // - // - // NOTE!: This file is autogenerated - do not modify! - // if you need to make a change, please see the Groovy scripts in the - // activemq-core module - // - public class JournalTrace : AbstractCommand - { - public const byte ID_JournalTrace = 53; - - string message; - - public override string ToString() { - return GetType().Name + "[" - + " Message=" + Message - + " ]"; - - } - - - - public override byte GetDataStructureType() { - return ID_JournalTrace; - } - - - // Properties - - public string Message - { - get { return message; } - set { this.message = value; } - } - - } -} +/* +* Copyright 2006 The Apache Software Foundation or its licensors, as +* applicable. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + +using System; +using System.Collections; + +using ActiveMQ.OpenWire; +using ActiveMQ.Commands; + +namespace ActiveMQ.Commands +{ + // + // Marshalling code for Open Wire Format for JournalTrace + // + // + // NOTE!: This file is autogenerated - do not modify! + // if you need to make a change, please see the Groovy scripts in the + // activemq-core module + // + public class JournalTrace : AbstractCommand + { + public const byte ID_JournalTrace = 53; + + string message; + + public override string ToString() { + return GetType().Name + "[" + + " Message=" + Message + + " ]"; + + } + + + + public override byte GetDataStructureType() { + return ID_JournalTrace; + } + + + // Properties + + public string Message + { + get { return message; } + set { this.message = value; } + } + + } +} diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/JournalTransaction.cs b/openwire-dotnet/src/ActiveMQ/Commands/JournalTransaction.cs similarity index 93% rename from openwire-dotnet/src/ActiveMQ/OpenWire/Commands/JournalTransaction.cs rename to openwire-dotnet/src/ActiveMQ/Commands/JournalTransaction.cs index 4c768d5b4e..99cd78e43b 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/JournalTransaction.cs +++ b/openwire-dotnet/src/ActiveMQ/Commands/JournalTransaction.cs @@ -1,79 +1,79 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -using System; -using System.Collections; - -using ActiveMQ.OpenWire; -using ActiveMQ.OpenWire.Commands; - -namespace ActiveMQ.OpenWire.Commands -{ - // - // Marshalling code for Open Wire Format for JournalTransaction - // - // - // NOTE!: This file is autogenerated - do not modify! - // if you need to make a change, please see the Groovy scripts in the - // activemq-core module - // - public class JournalTransaction : AbstractCommand - { - public const byte ID_JournalTransaction = 54; - - TransactionId transactionId; - byte type; - bool wasPrepared; - - public override string ToString() { - return GetType().Name + "[" - + " TransactionId=" + TransactionId - + " Type=" + Type - + " WasPrepared=" + WasPrepared - + " ]"; - - } - - - - public override byte GetDataStructureType() { - return ID_JournalTransaction; - } - - - // Properties - - public TransactionId TransactionId - { - get { return transactionId; } - set { this.transactionId = value; } - } - - public byte Type - { - get { return type; } - set { this.type = value; } - } - - public bool WasPrepared - { - get { return wasPrepared; } - set { this.wasPrepared = value; } - } - - } -} +/* +* Copyright 2006 The Apache Software Foundation or its licensors, as +* applicable. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + +using System; +using System.Collections; + +using ActiveMQ.OpenWire; +using ActiveMQ.Commands; + +namespace ActiveMQ.Commands +{ + // + // Marshalling code for Open Wire Format for JournalTransaction + // + // + // NOTE!: This file is autogenerated - do not modify! + // if you need to make a change, please see the Groovy scripts in the + // activemq-core module + // + public class JournalTransaction : AbstractCommand + { + public const byte ID_JournalTransaction = 54; + + TransactionId transactionId; + byte type; + bool wasPrepared; + + public override string ToString() { + return GetType().Name + "[" + + " TransactionId=" + TransactionId + + " Type=" + Type + + " WasPrepared=" + WasPrepared + + " ]"; + + } + + + + public override byte GetDataStructureType() { + return ID_JournalTransaction; + } + + + // Properties + + public TransactionId TransactionId + { + get { return transactionId; } + set { this.transactionId = value; } + } + + public byte Type + { + get { return type; } + set { this.type = value; } + } + + public bool WasPrepared + { + get { return wasPrepared; } + set { this.wasPrepared = value; } + } + + } +} diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/KeepAliveInfo.cs b/openwire-dotnet/src/ActiveMQ/Commands/KeepAliveInfo.cs similarity index 92% rename from openwire-dotnet/src/ActiveMQ/OpenWire/Commands/KeepAliveInfo.cs rename to openwire-dotnet/src/ActiveMQ/Commands/KeepAliveInfo.cs index 4e82d816b0..9fee642447 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/KeepAliveInfo.cs +++ b/openwire-dotnet/src/ActiveMQ/Commands/KeepAliveInfo.cs @@ -1,55 +1,55 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -using System; -using System.Collections; - -using ActiveMQ.OpenWire; -using ActiveMQ.OpenWire.Commands; - -namespace ActiveMQ.OpenWire.Commands -{ - // - // Marshalling code for Open Wire Format for KeepAliveInfo - // - // - // NOTE!: This file is autogenerated - do not modify! - // if you need to make a change, please see the Groovy scripts in the - // activemq-core module - // - public class KeepAliveInfo : AbstractCommand - { - public const byte ID_KeepAliveInfo = 10; - - - public override string ToString() { - return GetType().Name + "[" - + " ]"; - - } - - - - public override byte GetDataStructureType() { - return ID_KeepAliveInfo; - } - - - // Properties - - } -} +/* +* Copyright 2006 The Apache Software Foundation or its licensors, as +* applicable. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + +using System; +using System.Collections; + +using ActiveMQ.OpenWire; +using ActiveMQ.Commands; + +namespace ActiveMQ.Commands +{ + // + // Marshalling code for Open Wire Format for KeepAliveInfo + // + // + // NOTE!: This file is autogenerated - do not modify! + // if you need to make a change, please see the Groovy scripts in the + // activemq-core module + // + public class KeepAliveInfo : AbstractCommand + { + public const byte ID_KeepAliveInfo = 10; + + + public override string ToString() { + return GetType().Name + "[" + + " ]"; + + } + + + + public override byte GetDataStructureType() { + return ID_KeepAliveInfo; + } + + + // Properties + + } +} diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/LocalTransactionId.cs b/openwire-dotnet/src/ActiveMQ/Commands/LocalTransactionId.cs similarity index 94% rename from openwire-dotnet/src/ActiveMQ/OpenWire/Commands/LocalTransactionId.cs rename to openwire-dotnet/src/ActiveMQ/Commands/LocalTransactionId.cs index 7ac5a88f41..8a498e6f07 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/LocalTransactionId.cs +++ b/openwire-dotnet/src/ActiveMQ/Commands/LocalTransactionId.cs @@ -1,95 +1,95 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -using System; -using System.Collections; - -using ActiveMQ.OpenWire; -using ActiveMQ.OpenWire.Commands; - -namespace ActiveMQ.OpenWire.Commands -{ - // - // Marshalling code for Open Wire Format for LocalTransactionId - // - // - // NOTE!: This file is autogenerated - do not modify! - // if you need to make a change, please see the Groovy scripts in the - // activemq-core module - // - public class LocalTransactionId : TransactionId - { - public const byte ID_LocalTransactionId = 111; - - long value; - ConnectionId connectionId; - - public override int GetHashCode() { - int answer = 0; - answer = (answer * 37) + HashCode(Value); - answer = (answer * 37) + HashCode(ConnectionId); - return answer; - - } - - - public override bool Equals(object that) { - if (that is LocalTransactionId) { - return Equals((LocalTransactionId) that); - } - return false; - } - - public virtual bool Equals(LocalTransactionId that) { - if (! Equals(this.Value, that.Value)) return false; - if (! Equals(this.ConnectionId, that.ConnectionId)) return false; - return true; - - } - - - public override string ToString() { - return GetType().Name + "[" - + " Value=" + Value - + " ConnectionId=" + ConnectionId - + " ]"; - - } - - - - public override byte GetDataStructureType() { - return ID_LocalTransactionId; - } - - - // Properties - - public long Value - { - get { return value; } - set { this.value = value; } - } - - public ConnectionId ConnectionId - { - get { return connectionId; } - set { this.connectionId = value; } - } - - } -} +/* +* Copyright 2006 The Apache Software Foundation or its licensors, as +* applicable. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + +using System; +using System.Collections; + +using ActiveMQ.OpenWire; +using ActiveMQ.Commands; + +namespace ActiveMQ.Commands +{ + // + // Marshalling code for Open Wire Format for LocalTransactionId + // + // + // NOTE!: This file is autogenerated - do not modify! + // if you need to make a change, please see the Groovy scripts in the + // activemq-core module + // + public class LocalTransactionId : TransactionId + { + public const byte ID_LocalTransactionId = 111; + + long value; + ConnectionId connectionId; + + public override int GetHashCode() { + int answer = 0; + answer = (answer * 37) + HashCode(Value); + answer = (answer * 37) + HashCode(ConnectionId); + return answer; + + } + + + public override bool Equals(object that) { + if (that is LocalTransactionId) { + return Equals((LocalTransactionId) that); + } + return false; + } + + public virtual bool Equals(LocalTransactionId that) { + if (! Equals(this.Value, that.Value)) return false; + if (! Equals(this.ConnectionId, that.ConnectionId)) return false; + return true; + + } + + + public override string ToString() { + return GetType().Name + "[" + + " Value=" + Value + + " ConnectionId=" + ConnectionId + + " ]"; + + } + + + + public override byte GetDataStructureType() { + return ID_LocalTransactionId; + } + + + // Properties + + public long Value + { + get { return value; } + set { this.value = value; } + } + + public ConnectionId ConnectionId + { + get { return connectionId; } + set { this.connectionId = value; } + } + + } +} diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/Message.cs b/openwire-dotnet/src/ActiveMQ/Commands/Message.cs similarity index 95% rename from openwire-dotnet/src/ActiveMQ/OpenWire/Commands/Message.cs rename to openwire-dotnet/src/ActiveMQ/Commands/Message.cs index a97d71718b..5fb0a1e736 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/Message.cs +++ b/openwire-dotnet/src/ActiveMQ/Commands/Message.cs @@ -1,255 +1,255 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -using System; -using System.Collections; - -using ActiveMQ.OpenWire; -using ActiveMQ.OpenWire.Commands; - -namespace ActiveMQ.OpenWire.Commands -{ - // - // Marshalling code for Open Wire Format for Message - // - // - // NOTE!: This file is autogenerated - do not modify! - // if you need to make a change, please see the Groovy scripts in the - // activemq-core module - // - public class Message : BaseCommand - { - public const byte ID_Message = 0; - - ProducerId producerId; - ActiveMQDestination destination; - TransactionId transactionId; - ActiveMQDestination originalDestination; - MessageId messageId; - TransactionId originalTransactionId; - string groupID; - int groupSequence; - string correlationId; - bool persistent; - long expiration; - byte priority; - ActiveMQDestination replyTo; - long timestamp; - string type; - byte[] content; - byte[] marshalledProperties; - DataStructure dataStructure; - ConsumerId targetConsumerId; - bool compressed; - int redeliveryCounter; - BrokerId[] brokerPath; - long arrival; - string userID; - bool recievedByDFBridge; - - public override string ToString() { - return GetType().Name + "[" - + " ProducerId=" + ProducerId - + " Destination=" + Destination - + " TransactionId=" + TransactionId - + " OriginalDestination=" + OriginalDestination - + " MessageId=" + MessageId - + " OriginalTransactionId=" + OriginalTransactionId - + " GroupID=" + GroupID - + " GroupSequence=" + GroupSequence - + " CorrelationId=" + CorrelationId - + " Persistent=" + Persistent - + " Expiration=" + Expiration - + " Priority=" + Priority - + " ReplyTo=" + ReplyTo - + " Timestamp=" + Timestamp - + " Type=" + Type - + " Content=" + Content - + " MarshalledProperties=" + MarshalledProperties - + " DataStructure=" + DataStructure - + " TargetConsumerId=" + TargetConsumerId - + " Compressed=" + Compressed - + " RedeliveryCounter=" + RedeliveryCounter - + " BrokerPath=" + BrokerPath - + " Arrival=" + Arrival - + " UserID=" + UserID - + " RecievedByDFBridge=" + RecievedByDFBridge - + " ]"; - - } - - - - public override byte GetDataStructureType() { - return ID_Message; - } - - - // Properties - - public ProducerId ProducerId - { - get { return producerId; } - set { this.producerId = value; } - } - - public ActiveMQDestination Destination - { - get { return destination; } - set { this.destination = value; } - } - - public TransactionId TransactionId - { - get { return transactionId; } - set { this.transactionId = value; } - } - - public ActiveMQDestination OriginalDestination - { - get { return originalDestination; } - set { this.originalDestination = value; } - } - - public MessageId MessageId - { - get { return messageId; } - set { this.messageId = value; } - } - - public TransactionId OriginalTransactionId - { - get { return originalTransactionId; } - set { this.originalTransactionId = value; } - } - - public string GroupID - { - get { return groupID; } - set { this.groupID = value; } - } - - public int GroupSequence - { - get { return groupSequence; } - set { this.groupSequence = value; } - } - - public string CorrelationId - { - get { return correlationId; } - set { this.correlationId = value; } - } - - public bool Persistent - { - get { return persistent; } - set { this.persistent = value; } - } - - public long Expiration - { - get { return expiration; } - set { this.expiration = value; } - } - - public byte Priority - { - get { return priority; } - set { this.priority = value; } - } - - public ActiveMQDestination ReplyTo - { - get { return replyTo; } - set { this.replyTo = value; } - } - - public long Timestamp - { - get { return timestamp; } - set { this.timestamp = value; } - } - - public string Type - { - get { return type; } - set { this.type = value; } - } - - public byte[] Content - { - get { return content; } - set { this.content = value; } - } - - public byte[] MarshalledProperties - { - get { return marshalledProperties; } - set { this.marshalledProperties = value; } - } - - public DataStructure DataStructure - { - get { return dataStructure; } - set { this.dataStructure = value; } - } - - public ConsumerId TargetConsumerId - { - get { return targetConsumerId; } - set { this.targetConsumerId = value; } - } - - public bool Compressed - { - get { return compressed; } - set { this.compressed = value; } - } - - public int RedeliveryCounter - { - get { return redeliveryCounter; } - set { this.redeliveryCounter = value; } - } - - public BrokerId[] BrokerPath - { - get { return brokerPath; } - set { this.brokerPath = value; } - } - - public long Arrival - { - get { return arrival; } - set { this.arrival = value; } - } - - public string UserID - { - get { return userID; } - set { this.userID = value; } - } - - public bool RecievedByDFBridge - { - get { return recievedByDFBridge; } - set { this.recievedByDFBridge = value; } - } - - } -} +/* +* Copyright 2006 The Apache Software Foundation or its licensors, as +* applicable. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + +using System; +using System.Collections; + +using ActiveMQ.OpenWire; +using ActiveMQ.Commands; + +namespace ActiveMQ.Commands +{ + // + // Marshalling code for Open Wire Format for Message + // + // + // NOTE!: This file is autogenerated - do not modify! + // if you need to make a change, please see the Groovy scripts in the + // activemq-core module + // + public class Message : BaseCommand + { + public const byte ID_Message = 0; + + ProducerId producerId; + ActiveMQDestination destination; + TransactionId transactionId; + ActiveMQDestination originalDestination; + MessageId messageId; + TransactionId originalTransactionId; + string groupID; + int groupSequence; + string correlationId; + bool persistent; + long expiration; + byte priority; + ActiveMQDestination replyTo; + long timestamp; + string type; + byte[] content; + byte[] marshalledProperties; + DataStructure dataStructure; + ConsumerId targetConsumerId; + bool compressed; + int redeliveryCounter; + BrokerId[] brokerPath; + long arrival; + string userID; + bool recievedByDFBridge; + + public override string ToString() { + return GetType().Name + "[" + + " ProducerId=" + ProducerId + + " Destination=" + Destination + + " TransactionId=" + TransactionId + + " OriginalDestination=" + OriginalDestination + + " MessageId=" + MessageId + + " OriginalTransactionId=" + OriginalTransactionId + + " GroupID=" + GroupID + + " GroupSequence=" + GroupSequence + + " CorrelationId=" + CorrelationId + + " Persistent=" + Persistent + + " Expiration=" + Expiration + + " Priority=" + Priority + + " ReplyTo=" + ReplyTo + + " Timestamp=" + Timestamp + + " Type=" + Type + + " Content=" + Content + + " MarshalledProperties=" + MarshalledProperties + + " DataStructure=" + DataStructure + + " TargetConsumerId=" + TargetConsumerId + + " Compressed=" + Compressed + + " RedeliveryCounter=" + RedeliveryCounter + + " BrokerPath=" + BrokerPath + + " Arrival=" + Arrival + + " UserID=" + UserID + + " RecievedByDFBridge=" + RecievedByDFBridge + + " ]"; + + } + + + + public override byte GetDataStructureType() { + return ID_Message; + } + + + // Properties + + public ProducerId ProducerId + { + get { return producerId; } + set { this.producerId = value; } + } + + public ActiveMQDestination Destination + { + get { return destination; } + set { this.destination = value; } + } + + public TransactionId TransactionId + { + get { return transactionId; } + set { this.transactionId = value; } + } + + public ActiveMQDestination OriginalDestination + { + get { return originalDestination; } + set { this.originalDestination = value; } + } + + public MessageId MessageId + { + get { return messageId; } + set { this.messageId = value; } + } + + public TransactionId OriginalTransactionId + { + get { return originalTransactionId; } + set { this.originalTransactionId = value; } + } + + public string GroupID + { + get { return groupID; } + set { this.groupID = value; } + } + + public int GroupSequence + { + get { return groupSequence; } + set { this.groupSequence = value; } + } + + public string CorrelationId + { + get { return correlationId; } + set { this.correlationId = value; } + } + + public bool Persistent + { + get { return persistent; } + set { this.persistent = value; } + } + + public long Expiration + { + get { return expiration; } + set { this.expiration = value; } + } + + public byte Priority + { + get { return priority; } + set { this.priority = value; } + } + + public ActiveMQDestination ReplyTo + { + get { return replyTo; } + set { this.replyTo = value; } + } + + public long Timestamp + { + get { return timestamp; } + set { this.timestamp = value; } + } + + public string Type + { + get { return type; } + set { this.type = value; } + } + + public byte[] Content + { + get { return content; } + set { this.content = value; } + } + + public byte[] MarshalledProperties + { + get { return marshalledProperties; } + set { this.marshalledProperties = value; } + } + + public DataStructure DataStructure + { + get { return dataStructure; } + set { this.dataStructure = value; } + } + + public ConsumerId TargetConsumerId + { + get { return targetConsumerId; } + set { this.targetConsumerId = value; } + } + + public bool Compressed + { + get { return compressed; } + set { this.compressed = value; } + } + + public int RedeliveryCounter + { + get { return redeliveryCounter; } + set { this.redeliveryCounter = value; } + } + + public BrokerId[] BrokerPath + { + get { return brokerPath; } + set { this.brokerPath = value; } + } + + public long Arrival + { + get { return arrival; } + set { this.arrival = value; } + } + + public string UserID + { + get { return userID; } + set { this.userID = value; } + } + + public bool RecievedByDFBridge + { + get { return recievedByDFBridge; } + set { this.recievedByDFBridge = value; } + } + + } +} diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/MessageAck.cs b/openwire-dotnet/src/ActiveMQ/Commands/MessageAck.cs similarity index 94% rename from openwire-dotnet/src/ActiveMQ/OpenWire/Commands/MessageAck.cs rename to openwire-dotnet/src/ActiveMQ/Commands/MessageAck.cs index 5a229489a6..6032cd6863 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/MessageAck.cs +++ b/openwire-dotnet/src/ActiveMQ/Commands/MessageAck.cs @@ -1,111 +1,111 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -using System; -using System.Collections; - -using ActiveMQ.OpenWire; -using ActiveMQ.OpenWire.Commands; - -namespace ActiveMQ.OpenWire.Commands -{ - // - // Marshalling code for Open Wire Format for MessageAck - // - // - // NOTE!: This file is autogenerated - do not modify! - // if you need to make a change, please see the Groovy scripts in the - // activemq-core module - // - public class MessageAck : BaseCommand - { - public const byte ID_MessageAck = 22; - - ActiveMQDestination destination; - TransactionId transactionId; - ConsumerId consumerId; - byte ackType; - MessageId firstMessageId; - MessageId lastMessageId; - int messageCount; - - public override string ToString() { - return GetType().Name + "[" - + " Destination=" + Destination - + " TransactionId=" + TransactionId - + " ConsumerId=" + ConsumerId - + " AckType=" + AckType - + " FirstMessageId=" + FirstMessageId - + " LastMessageId=" + LastMessageId - + " MessageCount=" + MessageCount - + " ]"; - - } - - - - public override byte GetDataStructureType() { - return ID_MessageAck; - } - - - // Properties - - public ActiveMQDestination Destination - { - get { return destination; } - set { this.destination = value; } - } - - public TransactionId TransactionId - { - get { return transactionId; } - set { this.transactionId = value; } - } - - public ConsumerId ConsumerId - { - get { return consumerId; } - set { this.consumerId = value; } - } - - public byte AckType - { - get { return ackType; } - set { this.ackType = value; } - } - - public MessageId FirstMessageId - { - get { return firstMessageId; } - set { this.firstMessageId = value; } - } - - public MessageId LastMessageId - { - get { return lastMessageId; } - set { this.lastMessageId = value; } - } - - public int MessageCount - { - get { return messageCount; } - set { this.messageCount = value; } - } - - } -} +/* +* Copyright 2006 The Apache Software Foundation or its licensors, as +* applicable. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + +using System; +using System.Collections; + +using ActiveMQ.OpenWire; +using ActiveMQ.Commands; + +namespace ActiveMQ.Commands +{ + // + // Marshalling code for Open Wire Format for MessageAck + // + // + // NOTE!: This file is autogenerated - do not modify! + // if you need to make a change, please see the Groovy scripts in the + // activemq-core module + // + public class MessageAck : BaseCommand + { + public const byte ID_MessageAck = 22; + + ActiveMQDestination destination; + TransactionId transactionId; + ConsumerId consumerId; + byte ackType; + MessageId firstMessageId; + MessageId lastMessageId; + int messageCount; + + public override string ToString() { + return GetType().Name + "[" + + " Destination=" + Destination + + " TransactionId=" + TransactionId + + " ConsumerId=" + ConsumerId + + " AckType=" + AckType + + " FirstMessageId=" + FirstMessageId + + " LastMessageId=" + LastMessageId + + " MessageCount=" + MessageCount + + " ]"; + + } + + + + public override byte GetDataStructureType() { + return ID_MessageAck; + } + + + // Properties + + public ActiveMQDestination Destination + { + get { return destination; } + set { this.destination = value; } + } + + public TransactionId TransactionId + { + get { return transactionId; } + set { this.transactionId = value; } + } + + public ConsumerId ConsumerId + { + get { return consumerId; } + set { this.consumerId = value; } + } + + public byte AckType + { + get { return ackType; } + set { this.ackType = value; } + } + + public MessageId FirstMessageId + { + get { return firstMessageId; } + set { this.firstMessageId = value; } + } + + public MessageId LastMessageId + { + get { return lastMessageId; } + set { this.lastMessageId = value; } + } + + public int MessageCount + { + get { return messageCount; } + set { this.messageCount = value; } + } + + } +} diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/MessageDispatch.cs b/openwire-dotnet/src/ActiveMQ/Commands/MessageDispatch.cs similarity index 94% rename from openwire-dotnet/src/ActiveMQ/OpenWire/Commands/MessageDispatch.cs rename to openwire-dotnet/src/ActiveMQ/Commands/MessageDispatch.cs index 98e80b9614..7cddb89dfa 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/MessageDispatch.cs +++ b/openwire-dotnet/src/ActiveMQ/Commands/MessageDispatch.cs @@ -1,87 +1,87 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -using System; -using System.Collections; - -using ActiveMQ.OpenWire; -using ActiveMQ.OpenWire.Commands; - -namespace ActiveMQ.OpenWire.Commands -{ - // - // Marshalling code for Open Wire Format for MessageDispatch - // - // - // NOTE!: This file is autogenerated - do not modify! - // if you need to make a change, please see the Groovy scripts in the - // activemq-core module - // - public class MessageDispatch : BaseCommand - { - public const byte ID_MessageDispatch = 21; - - ConsumerId consumerId; - ActiveMQDestination destination; - Message message; - int redeliveryCounter; - - public override string ToString() { - return GetType().Name + "[" - + " ConsumerId=" + ConsumerId - + " Destination=" + Destination - + " Message=" + Message - + " RedeliveryCounter=" + RedeliveryCounter - + " ]"; - - } - - - - public override byte GetDataStructureType() { - return ID_MessageDispatch; - } - - - // Properties - - public ConsumerId ConsumerId - { - get { return consumerId; } - set { this.consumerId = value; } - } - - public ActiveMQDestination Destination - { - get { return destination; } - set { this.destination = value; } - } - - public Message Message - { - get { return message; } - set { this.message = value; } - } - - public int RedeliveryCounter - { - get { return redeliveryCounter; } - set { this.redeliveryCounter = value; } - } - - } -} +/* +* Copyright 2006 The Apache Software Foundation or its licensors, as +* applicable. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + +using System; +using System.Collections; + +using ActiveMQ.OpenWire; +using ActiveMQ.Commands; + +namespace ActiveMQ.Commands +{ + // + // Marshalling code for Open Wire Format for MessageDispatch + // + // + // NOTE!: This file is autogenerated - do not modify! + // if you need to make a change, please see the Groovy scripts in the + // activemq-core module + // + public class MessageDispatch : BaseCommand + { + public const byte ID_MessageDispatch = 21; + + ConsumerId consumerId; + ActiveMQDestination destination; + Message message; + int redeliveryCounter; + + public override string ToString() { + return GetType().Name + "[" + + " ConsumerId=" + ConsumerId + + " Destination=" + Destination + + " Message=" + Message + + " RedeliveryCounter=" + RedeliveryCounter + + " ]"; + + } + + + + public override byte GetDataStructureType() { + return ID_MessageDispatch; + } + + + // Properties + + public ConsumerId ConsumerId + { + get { return consumerId; } + set { this.consumerId = value; } + } + + public ActiveMQDestination Destination + { + get { return destination; } + set { this.destination = value; } + } + + public Message Message + { + get { return message; } + set { this.message = value; } + } + + public int RedeliveryCounter + { + get { return redeliveryCounter; } + set { this.redeliveryCounter = value; } + } + + } +} diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/MessageDispatchNotification.cs b/openwire-dotnet/src/ActiveMQ/Commands/MessageDispatchNotification.cs similarity index 93% rename from openwire-dotnet/src/ActiveMQ/OpenWire/Commands/MessageDispatchNotification.cs rename to openwire-dotnet/src/ActiveMQ/Commands/MessageDispatchNotification.cs index 227c95c8e8..909cc1713d 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/MessageDispatchNotification.cs +++ b/openwire-dotnet/src/ActiveMQ/Commands/MessageDispatchNotification.cs @@ -19,9 +19,9 @@ using System; using System.Collections; using ActiveMQ.OpenWire; -using ActiveMQ.OpenWire.Commands; +using ActiveMQ.Commands; -namespace ActiveMQ.OpenWire.Commands +namespace ActiveMQ.Commands { // // Marshalling code for Open Wire Format for MessageDispatchNotification diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/MessageId.cs b/openwire-dotnet/src/ActiveMQ/Commands/MessageId.cs similarity index 94% rename from openwire-dotnet/src/ActiveMQ/OpenWire/Commands/MessageId.cs rename to openwire-dotnet/src/ActiveMQ/Commands/MessageId.cs index 36085fb7fd..c27914daf9 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/MessageId.cs +++ b/openwire-dotnet/src/ActiveMQ/Commands/MessageId.cs @@ -1,105 +1,105 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -using System; -using System.Collections; - -using ActiveMQ.OpenWire; -using ActiveMQ.OpenWire.Commands; - -namespace ActiveMQ.OpenWire.Commands -{ - // - // Marshalling code for Open Wire Format for MessageId - // - // - // NOTE!: This file is autogenerated - do not modify! - // if you need to make a change, please see the Groovy scripts in the - // activemq-core module - // - public class MessageId : AbstractCommand - { - public const byte ID_MessageId = 110; - - ProducerId producerId; - long producerSequenceId; - long brokerSequenceId; - - public override int GetHashCode() { - int answer = 0; - answer = (answer * 37) + HashCode(ProducerId); - answer = (answer * 37) + HashCode(ProducerSequenceId); - answer = (answer * 37) + HashCode(BrokerSequenceId); - return answer; - - } - - - public override bool Equals(object that) { - if (that is MessageId) { - return Equals((MessageId) that); - } - return false; - } - - public virtual bool Equals(MessageId that) { - if (! Equals(this.ProducerId, that.ProducerId)) return false; - if (! Equals(this.ProducerSequenceId, that.ProducerSequenceId)) return false; - if (! Equals(this.BrokerSequenceId, that.BrokerSequenceId)) return false; - return true; - - } - - - public override string ToString() { - return GetType().Name + "[" - + " ProducerId=" + ProducerId - + " ProducerSequenceId=" + ProducerSequenceId - + " BrokerSequenceId=" + BrokerSequenceId - + " ]"; - - } - - - - public override byte GetDataStructureType() { - return ID_MessageId; - } - - - // Properties - - public ProducerId ProducerId - { - get { return producerId; } - set { this.producerId = value; } - } - - public long ProducerSequenceId - { - get { return producerSequenceId; } - set { this.producerSequenceId = value; } - } - - public long BrokerSequenceId - { - get { return brokerSequenceId; } - set { this.brokerSequenceId = value; } - } - - } -} +/* +* Copyright 2006 The Apache Software Foundation or its licensors, as +* applicable. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + +using System; +using System.Collections; + +using ActiveMQ.OpenWire; +using ActiveMQ.Commands; + +namespace ActiveMQ.Commands +{ + // + // Marshalling code for Open Wire Format for MessageId + // + // + // NOTE!: This file is autogenerated - do not modify! + // if you need to make a change, please see the Groovy scripts in the + // activemq-core module + // + public class MessageId : AbstractCommand + { + public const byte ID_MessageId = 110; + + ProducerId producerId; + long producerSequenceId; + long brokerSequenceId; + + public override int GetHashCode() { + int answer = 0; + answer = (answer * 37) + HashCode(ProducerId); + answer = (answer * 37) + HashCode(ProducerSequenceId); + answer = (answer * 37) + HashCode(BrokerSequenceId); + return answer; + + } + + + public override bool Equals(object that) { + if (that is MessageId) { + return Equals((MessageId) that); + } + return false; + } + + public virtual bool Equals(MessageId that) { + if (! Equals(this.ProducerId, that.ProducerId)) return false; + if (! Equals(this.ProducerSequenceId, that.ProducerSequenceId)) return false; + if (! Equals(this.BrokerSequenceId, that.BrokerSequenceId)) return false; + return true; + + } + + + public override string ToString() { + return GetType().Name + "[" + + " ProducerId=" + ProducerId + + " ProducerSequenceId=" + ProducerSequenceId + + " BrokerSequenceId=" + BrokerSequenceId + + " ]"; + + } + + + + public override byte GetDataStructureType() { + return ID_MessageId; + } + + + // Properties + + public ProducerId ProducerId + { + get { return producerId; } + set { this.producerId = value; } + } + + public long ProducerSequenceId + { + get { return producerSequenceId; } + set { this.producerSequenceId = value; } + } + + public long BrokerSequenceId + { + get { return brokerSequenceId; } + set { this.brokerSequenceId = value; } + } + + } +} diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ProducerId.cs b/openwire-dotnet/src/ActiveMQ/Commands/ProducerId.cs similarity index 94% rename from openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ProducerId.cs rename to openwire-dotnet/src/ActiveMQ/Commands/ProducerId.cs index 8df6b95ddc..3c858811ed 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ProducerId.cs +++ b/openwire-dotnet/src/ActiveMQ/Commands/ProducerId.cs @@ -1,105 +1,105 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -using System; -using System.Collections; - -using ActiveMQ.OpenWire; -using ActiveMQ.OpenWire.Commands; - -namespace ActiveMQ.OpenWire.Commands -{ - // - // Marshalling code for Open Wire Format for ProducerId - // - // - // NOTE!: This file is autogenerated - do not modify! - // if you need to make a change, please see the Groovy scripts in the - // activemq-core module - // - public class ProducerId : AbstractCommand - { - public const byte ID_ProducerId = 123; - - string connectionId; - long value; - long sessionId; - - public override int GetHashCode() { - int answer = 0; - answer = (answer * 37) + HashCode(ConnectionId); - answer = (answer * 37) + HashCode(Value); - answer = (answer * 37) + HashCode(SessionId); - return answer; - - } - - - public override bool Equals(object that) { - if (that is ProducerId) { - return Equals((ProducerId) that); - } - return false; - } - - public virtual bool Equals(ProducerId that) { - if (! Equals(this.ConnectionId, that.ConnectionId)) return false; - if (! Equals(this.Value, that.Value)) return false; - if (! Equals(this.SessionId, that.SessionId)) return false; - return true; - - } - - - public override string ToString() { - return GetType().Name + "[" - + " ConnectionId=" + ConnectionId - + " Value=" + Value - + " SessionId=" + SessionId - + " ]"; - - } - - - - public override byte GetDataStructureType() { - return ID_ProducerId; - } - - - // Properties - - public string ConnectionId - { - get { return connectionId; } - set { this.connectionId = value; } - } - - public long Value - { - get { return value; } - set { this.value = value; } - } - - public long SessionId - { - get { return sessionId; } - set { this.sessionId = value; } - } - - } -} +/* +* Copyright 2006 The Apache Software Foundation or its licensors, as +* applicable. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + +using System; +using System.Collections; + +using ActiveMQ.OpenWire; +using ActiveMQ.Commands; + +namespace ActiveMQ.Commands +{ + // + // Marshalling code for Open Wire Format for ProducerId + // + // + // NOTE!: This file is autogenerated - do not modify! + // if you need to make a change, please see the Groovy scripts in the + // activemq-core module + // + public class ProducerId : AbstractCommand + { + public const byte ID_ProducerId = 123; + + string connectionId; + long value; + long sessionId; + + public override int GetHashCode() { + int answer = 0; + answer = (answer * 37) + HashCode(ConnectionId); + answer = (answer * 37) + HashCode(Value); + answer = (answer * 37) + HashCode(SessionId); + return answer; + + } + + + public override bool Equals(object that) { + if (that is ProducerId) { + return Equals((ProducerId) that); + } + return false; + } + + public virtual bool Equals(ProducerId that) { + if (! Equals(this.ConnectionId, that.ConnectionId)) return false; + if (! Equals(this.Value, that.Value)) return false; + if (! Equals(this.SessionId, that.SessionId)) return false; + return true; + + } + + + public override string ToString() { + return GetType().Name + "[" + + " ConnectionId=" + ConnectionId + + " Value=" + Value + + " SessionId=" + SessionId + + " ]"; + + } + + + + public override byte GetDataStructureType() { + return ID_ProducerId; + } + + + // Properties + + public string ConnectionId + { + get { return connectionId; } + set { this.connectionId = value; } + } + + public long Value + { + get { return value; } + set { this.value = value; } + } + + public long SessionId + { + get { return sessionId; } + set { this.sessionId = value; } + } + + } +} diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ProducerInfo.cs b/openwire-dotnet/src/ActiveMQ/Commands/ProducerInfo.cs similarity index 93% rename from openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ProducerInfo.cs rename to openwire-dotnet/src/ActiveMQ/Commands/ProducerInfo.cs index f217bb084e..3508eb38fe 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ProducerInfo.cs +++ b/openwire-dotnet/src/ActiveMQ/Commands/ProducerInfo.cs @@ -1,79 +1,79 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -using System; -using System.Collections; - -using ActiveMQ.OpenWire; -using ActiveMQ.OpenWire.Commands; - -namespace ActiveMQ.OpenWire.Commands -{ - // - // Marshalling code for Open Wire Format for ProducerInfo - // - // - // NOTE!: This file is autogenerated - do not modify! - // if you need to make a change, please see the Groovy scripts in the - // activemq-core module - // - public class ProducerInfo : BaseCommand - { - public const byte ID_ProducerInfo = 6; - - ProducerId producerId; - ActiveMQDestination destination; - BrokerId[] brokerPath; - - public override string ToString() { - return GetType().Name + "[" - + " ProducerId=" + ProducerId - + " Destination=" + Destination - + " BrokerPath=" + BrokerPath - + " ]"; - - } - - - - public override byte GetDataStructureType() { - return ID_ProducerInfo; - } - - - // Properties - - public ProducerId ProducerId - { - get { return producerId; } - set { this.producerId = value; } - } - - public ActiveMQDestination Destination - { - get { return destination; } - set { this.destination = value; } - } - - public BrokerId[] BrokerPath - { - get { return brokerPath; } - set { this.brokerPath = value; } - } - - } -} +/* +* Copyright 2006 The Apache Software Foundation or its licensors, as +* applicable. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + +using System; +using System.Collections; + +using ActiveMQ.OpenWire; +using ActiveMQ.Commands; + +namespace ActiveMQ.Commands +{ + // + // Marshalling code for Open Wire Format for ProducerInfo + // + // + // NOTE!: This file is autogenerated - do not modify! + // if you need to make a change, please see the Groovy scripts in the + // activemq-core module + // + public class ProducerInfo : BaseCommand + { + public const byte ID_ProducerInfo = 6; + + ProducerId producerId; + ActiveMQDestination destination; + BrokerId[] brokerPath; + + public override string ToString() { + return GetType().Name + "[" + + " ProducerId=" + ProducerId + + " Destination=" + Destination + + " BrokerPath=" + BrokerPath + + " ]"; + + } + + + + public override byte GetDataStructureType() { + return ID_ProducerInfo; + } + + + // Properties + + public ProducerId ProducerId + { + get { return producerId; } + set { this.producerId = value; } + } + + public ActiveMQDestination Destination + { + get { return destination; } + set { this.destination = value; } + } + + public BrokerId[] BrokerPath + { + get { return brokerPath; } + set { this.brokerPath = value; } + } + + } +} diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/RemoveInfo.cs b/openwire-dotnet/src/ActiveMQ/Commands/RemoveInfo.cs similarity index 92% rename from openwire-dotnet/src/ActiveMQ/OpenWire/Commands/RemoveInfo.cs rename to openwire-dotnet/src/ActiveMQ/Commands/RemoveInfo.cs index 4cf279b7ff..c7e73f0683 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/RemoveInfo.cs +++ b/openwire-dotnet/src/ActiveMQ/Commands/RemoveInfo.cs @@ -1,63 +1,63 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -using System; -using System.Collections; - -using ActiveMQ.OpenWire; -using ActiveMQ.OpenWire.Commands; - -namespace ActiveMQ.OpenWire.Commands -{ - // - // Marshalling code for Open Wire Format for RemoveInfo - // - // - // NOTE!: This file is autogenerated - do not modify! - // if you need to make a change, please see the Groovy scripts in the - // activemq-core module - // - public class RemoveInfo : BaseCommand - { - public const byte ID_RemoveInfo = 12; - - DataStructure objectId; - - public override string ToString() { - return GetType().Name + "[" - + " ObjectId=" + ObjectId - + " ]"; - - } - - - - public override byte GetDataStructureType() { - return ID_RemoveInfo; - } - - - // Properties - - public DataStructure ObjectId - { - get { return objectId; } - set { this.objectId = value; } - } - - } -} +/* +* Copyright 2006 The Apache Software Foundation or its licensors, as +* applicable. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + +using System; +using System.Collections; + +using ActiveMQ.OpenWire; +using ActiveMQ.Commands; + +namespace ActiveMQ.Commands +{ + // + // Marshalling code for Open Wire Format for RemoveInfo + // + // + // NOTE!: This file is autogenerated - do not modify! + // if you need to make a change, please see the Groovy scripts in the + // activemq-core module + // + public class RemoveInfo : BaseCommand + { + public const byte ID_RemoveInfo = 12; + + DataStructure objectId; + + public override string ToString() { + return GetType().Name + "[" + + " ObjectId=" + ObjectId + + " ]"; + + } + + + + public override byte GetDataStructureType() { + return ID_RemoveInfo; + } + + + // Properties + + public DataStructure ObjectId + { + get { return objectId; } + set { this.objectId = value; } + } + + } +} diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/RemoveSubscriptionInfo.cs b/openwire-dotnet/src/ActiveMQ/Commands/RemoveSubscriptionInfo.cs similarity index 94% rename from openwire-dotnet/src/ActiveMQ/OpenWire/Commands/RemoveSubscriptionInfo.cs rename to openwire-dotnet/src/ActiveMQ/Commands/RemoveSubscriptionInfo.cs index e6a57aaf8f..a3b1fa9fb3 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/RemoveSubscriptionInfo.cs +++ b/openwire-dotnet/src/ActiveMQ/Commands/RemoveSubscriptionInfo.cs @@ -1,79 +1,79 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -using System; -using System.Collections; - -using ActiveMQ.OpenWire; -using ActiveMQ.OpenWire.Commands; - -namespace ActiveMQ.OpenWire.Commands -{ - // - // Marshalling code for Open Wire Format for RemoveSubscriptionInfo - // - // - // NOTE!: This file is autogenerated - do not modify! - // if you need to make a change, please see the Groovy scripts in the - // activemq-core module - // - public class RemoveSubscriptionInfo : BaseCommand - { - public const byte ID_RemoveSubscriptionInfo = 0; - - ConnectionId connectionId; - string subcriptionName; - string clientId; - - public override string ToString() { - return GetType().Name + "[" - + " ConnectionId=" + ConnectionId - + " SubcriptionName=" + SubcriptionName - + " ClientId=" + ClientId - + " ]"; - - } - - - - public override byte GetDataStructureType() { - return ID_RemoveSubscriptionInfo; - } - - - // Properties - - public ConnectionId ConnectionId - { - get { return connectionId; } - set { this.connectionId = value; } - } - - public string SubcriptionName - { - get { return subcriptionName; } - set { this.subcriptionName = value; } - } - - public string ClientId - { - get { return clientId; } - set { this.clientId = value; } - } - - } -} +/* +* Copyright 2006 The Apache Software Foundation or its licensors, as +* applicable. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + +using System; +using System.Collections; + +using ActiveMQ.OpenWire; +using ActiveMQ.Commands; + +namespace ActiveMQ.Commands +{ + // + // Marshalling code for Open Wire Format for RemoveSubscriptionInfo + // + // + // NOTE!: This file is autogenerated - do not modify! + // if you need to make a change, please see the Groovy scripts in the + // activemq-core module + // + public class RemoveSubscriptionInfo : BaseCommand + { + public const byte ID_RemoveSubscriptionInfo = 0; + + ConnectionId connectionId; + string subcriptionName; + string clientId; + + public override string ToString() { + return GetType().Name + "[" + + " ConnectionId=" + ConnectionId + + " SubcriptionName=" + SubcriptionName + + " ClientId=" + ClientId + + " ]"; + + } + + + + public override byte GetDataStructureType() { + return ID_RemoveSubscriptionInfo; + } + + + // Properties + + public ConnectionId ConnectionId + { + get { return connectionId; } + set { this.connectionId = value; } + } + + public string SubcriptionName + { + get { return subcriptionName; } + set { this.subcriptionName = value; } + } + + public string ClientId + { + get { return clientId; } + set { this.clientId = value; } + } + + } +} diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/Response.cs b/openwire-dotnet/src/ActiveMQ/Commands/Response.cs similarity index 93% rename from openwire-dotnet/src/ActiveMQ/OpenWire/Commands/Response.cs rename to openwire-dotnet/src/ActiveMQ/Commands/Response.cs index 118fb7e085..0bfdb79d6e 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/Response.cs +++ b/openwire-dotnet/src/ActiveMQ/Commands/Response.cs @@ -1,63 +1,63 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -using System; -using System.Collections; - -using ActiveMQ.OpenWire; -using ActiveMQ.OpenWire.Commands; - -namespace ActiveMQ.OpenWire.Commands -{ - // - // Marshalling code for Open Wire Format for Response - // - // - // NOTE!: This file is autogenerated - do not modify! - // if you need to make a change, please see the Groovy scripts in the - // activemq-core module - // - public class Response : BaseCommand - { - public const byte ID_Response = 30; - - short correlationId; - - public override string ToString() { - return GetType().Name + "[" - + " CorrelationId=" + CorrelationId - + " ]"; - - } - - - - public override byte GetDataStructureType() { - return ID_Response; - } - - - // Properties - - public short CorrelationId - { - get { return correlationId; } - set { this.correlationId = value; } - } - - } -} +/* +* Copyright 2006 The Apache Software Foundation or its licensors, as +* applicable. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + +using System; +using System.Collections; + +using ActiveMQ.OpenWire; +using ActiveMQ.Commands; + +namespace ActiveMQ.Commands +{ + // + // Marshalling code for Open Wire Format for Response + // + // + // NOTE!: This file is autogenerated - do not modify! + // if you need to make a change, please see the Groovy scripts in the + // activemq-core module + // + public class Response : BaseCommand + { + public const byte ID_Response = 30; + + short correlationId; + + public override string ToString() { + return GetType().Name + "[" + + " CorrelationId=" + CorrelationId + + " ]"; + + } + + + + public override byte GetDataStructureType() { + return ID_Response; + } + + + // Properties + + public short CorrelationId + { + get { return correlationId; } + set { this.correlationId = value; } + } + + } +} diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/SessionId.cs b/openwire-dotnet/src/ActiveMQ/Commands/SessionId.cs similarity index 94% rename from openwire-dotnet/src/ActiveMQ/OpenWire/Commands/SessionId.cs rename to openwire-dotnet/src/ActiveMQ/Commands/SessionId.cs index 61465f9de1..6dbcd384fa 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/SessionId.cs +++ b/openwire-dotnet/src/ActiveMQ/Commands/SessionId.cs @@ -1,95 +1,95 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -using System; -using System.Collections; - -using ActiveMQ.OpenWire; -using ActiveMQ.OpenWire.Commands; - -namespace ActiveMQ.OpenWire.Commands -{ - // - // Marshalling code for Open Wire Format for SessionId - // - // - // NOTE!: This file is autogenerated - do not modify! - // if you need to make a change, please see the Groovy scripts in the - // activemq-core module - // - public class SessionId : AbstractCommand - { - public const byte ID_SessionId = 121; - - string connectionId; - long value; - - public override int GetHashCode() { - int answer = 0; - answer = (answer * 37) + HashCode(ConnectionId); - answer = (answer * 37) + HashCode(Value); - return answer; - - } - - - public override bool Equals(object that) { - if (that is SessionId) { - return Equals((SessionId) that); - } - return false; - } - - public virtual bool Equals(SessionId that) { - if (! Equals(this.ConnectionId, that.ConnectionId)) return false; - if (! Equals(this.Value, that.Value)) return false; - return true; - - } - - - public override string ToString() { - return GetType().Name + "[" - + " ConnectionId=" + ConnectionId - + " Value=" + Value - + " ]"; - - } - - - - public override byte GetDataStructureType() { - return ID_SessionId; - } - - - // Properties - - public string ConnectionId - { - get { return connectionId; } - set { this.connectionId = value; } - } - - public long Value - { - get { return value; } - set { this.value = value; } - } - - } -} +/* +* Copyright 2006 The Apache Software Foundation or its licensors, as +* applicable. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + +using System; +using System.Collections; + +using ActiveMQ.OpenWire; +using ActiveMQ.Commands; + +namespace ActiveMQ.Commands +{ + // + // Marshalling code for Open Wire Format for SessionId + // + // + // NOTE!: This file is autogenerated - do not modify! + // if you need to make a change, please see the Groovy scripts in the + // activemq-core module + // + public class SessionId : AbstractCommand + { + public const byte ID_SessionId = 121; + + string connectionId; + long value; + + public override int GetHashCode() { + int answer = 0; + answer = (answer * 37) + HashCode(ConnectionId); + answer = (answer * 37) + HashCode(Value); + return answer; + + } + + + public override bool Equals(object that) { + if (that is SessionId) { + return Equals((SessionId) that); + } + return false; + } + + public virtual bool Equals(SessionId that) { + if (! Equals(this.ConnectionId, that.ConnectionId)) return false; + if (! Equals(this.Value, that.Value)) return false; + return true; + + } + + + public override string ToString() { + return GetType().Name + "[" + + " ConnectionId=" + ConnectionId + + " Value=" + Value + + " ]"; + + } + + + + public override byte GetDataStructureType() { + return ID_SessionId; + } + + + // Properties + + public string ConnectionId + { + get { return connectionId; } + set { this.connectionId = value; } + } + + public long Value + { + get { return value; } + set { this.value = value; } + } + + } +} diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/SessionInfo.cs b/openwire-dotnet/src/ActiveMQ/Commands/SessionInfo.cs similarity index 93% rename from openwire-dotnet/src/ActiveMQ/OpenWire/Commands/SessionInfo.cs rename to openwire-dotnet/src/ActiveMQ/Commands/SessionInfo.cs index ed3b84ce36..dc077d5942 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/SessionInfo.cs +++ b/openwire-dotnet/src/ActiveMQ/Commands/SessionInfo.cs @@ -1,63 +1,63 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -using System; -using System.Collections; - -using ActiveMQ.OpenWire; -using ActiveMQ.OpenWire.Commands; - -namespace ActiveMQ.OpenWire.Commands -{ - // - // Marshalling code for Open Wire Format for SessionInfo - // - // - // NOTE!: This file is autogenerated - do not modify! - // if you need to make a change, please see the Groovy scripts in the - // activemq-core module - // - public class SessionInfo : BaseCommand - { - public const byte ID_SessionInfo = 4; - - SessionId sessionId; - - public override string ToString() { - return GetType().Name + "[" - + " SessionId=" + SessionId - + " ]"; - - } - - - - public override byte GetDataStructureType() { - return ID_SessionInfo; - } - - - // Properties - - public SessionId SessionId - { - get { return sessionId; } - set { this.sessionId = value; } - } - - } -} +/* +* Copyright 2006 The Apache Software Foundation or its licensors, as +* applicable. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + +using System; +using System.Collections; + +using ActiveMQ.OpenWire; +using ActiveMQ.Commands; + +namespace ActiveMQ.Commands +{ + // + // Marshalling code for Open Wire Format for SessionInfo + // + // + // NOTE!: This file is autogenerated - do not modify! + // if you need to make a change, please see the Groovy scripts in the + // activemq-core module + // + public class SessionInfo : BaseCommand + { + public const byte ID_SessionInfo = 4; + + SessionId sessionId; + + public override string ToString() { + return GetType().Name + "[" + + " SessionId=" + SessionId + + " ]"; + + } + + + + public override byte GetDataStructureType() { + return ID_SessionInfo; + } + + + // Properties + + public SessionId SessionId + { + get { return sessionId; } + set { this.sessionId = value; } + } + + } +} diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ShutdownInfo.cs b/openwire-dotnet/src/ActiveMQ/Commands/ShutdownInfo.cs similarity index 92% rename from openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ShutdownInfo.cs rename to openwire-dotnet/src/ActiveMQ/Commands/ShutdownInfo.cs index 8843236e9c..19b0f305ec 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ShutdownInfo.cs +++ b/openwire-dotnet/src/ActiveMQ/Commands/ShutdownInfo.cs @@ -1,55 +1,55 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -using System; -using System.Collections; - -using ActiveMQ.OpenWire; -using ActiveMQ.OpenWire.Commands; - -namespace ActiveMQ.OpenWire.Commands -{ - // - // Marshalling code for Open Wire Format for ShutdownInfo - // - // - // NOTE!: This file is autogenerated - do not modify! - // if you need to make a change, please see the Groovy scripts in the - // activemq-core module - // - public class ShutdownInfo : BaseCommand - { - public const byte ID_ShutdownInfo = 11; - - - public override string ToString() { - return GetType().Name + "[" - + " ]"; - - } - - - - public override byte GetDataStructureType() { - return ID_ShutdownInfo; - } - - - // Properties - - } -} +/* +* Copyright 2006 The Apache Software Foundation or its licensors, as +* applicable. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + +using System; +using System.Collections; + +using ActiveMQ.OpenWire; +using ActiveMQ.Commands; + +namespace ActiveMQ.Commands +{ + // + // Marshalling code for Open Wire Format for ShutdownInfo + // + // + // NOTE!: This file is autogenerated - do not modify! + // if you need to make a change, please see the Groovy scripts in the + // activemq-core module + // + public class ShutdownInfo : BaseCommand + { + public const byte ID_ShutdownInfo = 11; + + + public override string ToString() { + return GetType().Name + "[" + + " ]"; + + } + + + + public override byte GetDataStructureType() { + return ID_ShutdownInfo; + } + + + // Properties + + } +} diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/SubscriptionInfo.cs b/openwire-dotnet/src/ActiveMQ/Commands/SubscriptionInfo.cs similarity index 94% rename from openwire-dotnet/src/ActiveMQ/OpenWire/Commands/SubscriptionInfo.cs rename to openwire-dotnet/src/ActiveMQ/Commands/SubscriptionInfo.cs index 66857cd680..85b84e530d 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/SubscriptionInfo.cs +++ b/openwire-dotnet/src/ActiveMQ/Commands/SubscriptionInfo.cs @@ -1,87 +1,87 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -using System; -using System.Collections; - -using ActiveMQ.OpenWire; -using ActiveMQ.OpenWire.Commands; - -namespace ActiveMQ.OpenWire.Commands -{ - // - // Marshalling code for Open Wire Format for SubscriptionInfo - // - // - // NOTE!: This file is autogenerated - do not modify! - // if you need to make a change, please see the Groovy scripts in the - // activemq-core module - // - public class SubscriptionInfo : AbstractCommand - { - public const byte ID_SubscriptionInfo = 55; - - string clientId; - ActiveMQDestination destination; - string selector; - string subcriptionName; - - public override string ToString() { - return GetType().Name + "[" - + " ClientId=" + ClientId - + " Destination=" + Destination - + " Selector=" + Selector - + " SubcriptionName=" + SubcriptionName - + " ]"; - - } - - - - public override byte GetDataStructureType() { - return ID_SubscriptionInfo; - } - - - // Properties - - public string ClientId - { - get { return clientId; } - set { this.clientId = value; } - } - - public ActiveMQDestination Destination - { - get { return destination; } - set { this.destination = value; } - } - - public string Selector - { - get { return selector; } - set { this.selector = value; } - } - - public string SubcriptionName - { - get { return subcriptionName; } - set { this.subcriptionName = value; } - } - - } -} +/* +* Copyright 2006 The Apache Software Foundation or its licensors, as +* applicable. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + +using System; +using System.Collections; + +using ActiveMQ.OpenWire; +using ActiveMQ.Commands; + +namespace ActiveMQ.Commands +{ + // + // Marshalling code for Open Wire Format for SubscriptionInfo + // + // + // NOTE!: This file is autogenerated - do not modify! + // if you need to make a change, please see the Groovy scripts in the + // activemq-core module + // + public class SubscriptionInfo : AbstractCommand + { + public const byte ID_SubscriptionInfo = 55; + + string clientId; + ActiveMQDestination destination; + string selector; + string subcriptionName; + + public override string ToString() { + return GetType().Name + "[" + + " ClientId=" + ClientId + + " Destination=" + Destination + + " Selector=" + Selector + + " SubcriptionName=" + SubcriptionName + + " ]"; + + } + + + + public override byte GetDataStructureType() { + return ID_SubscriptionInfo; + } + + + // Properties + + public string ClientId + { + get { return clientId; } + set { this.clientId = value; } + } + + public ActiveMQDestination Destination + { + get { return destination; } + set { this.destination = value; } + } + + public string Selector + { + get { return selector; } + set { this.selector = value; } + } + + public string SubcriptionName + { + get { return subcriptionName; } + set { this.subcriptionName = value; } + } + + } +} diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/TransactionId.cs b/openwire-dotnet/src/ActiveMQ/Commands/TransactionId.cs similarity index 92% rename from openwire-dotnet/src/ActiveMQ/OpenWire/Commands/TransactionId.cs rename to openwire-dotnet/src/ActiveMQ/Commands/TransactionId.cs index 782e5961b2..ae2af1f045 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/TransactionId.cs +++ b/openwire-dotnet/src/ActiveMQ/Commands/TransactionId.cs @@ -1,75 +1,75 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -using System; -using System.Collections; - -using ActiveMQ.OpenWire; -using ActiveMQ.OpenWire.Commands; - -namespace ActiveMQ.OpenWire.Commands -{ - // - // Marshalling code for Open Wire Format for TransactionId - // - // - // NOTE!: This file is autogenerated - do not modify! - // if you need to make a change, please see the Groovy scripts in the - // activemq-core module - // - public class TransactionId : AbstractCommand - { - public const byte ID_TransactionId = 0; - - - public override int GetHashCode() { - int answer = 0; - return answer; - - } - - - public override bool Equals(object that) { - if (that is TransactionId) { - return Equals((TransactionId) that); - } - return false; - } - - public virtual bool Equals(TransactionId that) { - return true; - - } - - - public override string ToString() { - return GetType().Name + "[" - + " ]"; - - } - - - - public override byte GetDataStructureType() { - return ID_TransactionId; - } - - - // Properties - - } -} +/* +* Copyright 2006 The Apache Software Foundation or its licensors, as +* applicable. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + +using System; +using System.Collections; + +using ActiveMQ.OpenWire; +using ActiveMQ.Commands; + +namespace ActiveMQ.Commands +{ + // + // Marshalling code for Open Wire Format for TransactionId + // + // + // NOTE!: This file is autogenerated - do not modify! + // if you need to make a change, please see the Groovy scripts in the + // activemq-core module + // + public class TransactionId : AbstractCommand + { + public const byte ID_TransactionId = 0; + + + public override int GetHashCode() { + int answer = 0; + return answer; + + } + + + public override bool Equals(object that) { + if (that is TransactionId) { + return Equals((TransactionId) that); + } + return false; + } + + public virtual bool Equals(TransactionId that) { + return true; + + } + + + public override string ToString() { + return GetType().Name + "[" + + " ]"; + + } + + + + public override byte GetDataStructureType() { + return ID_TransactionId; + } + + + // Properties + + } +} diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/TransactionInfo.cs b/openwire-dotnet/src/ActiveMQ/Commands/TransactionInfo.cs similarity index 93% rename from openwire-dotnet/src/ActiveMQ/OpenWire/Commands/TransactionInfo.cs rename to openwire-dotnet/src/ActiveMQ/Commands/TransactionInfo.cs index 85068cdac6..45acbbd7db 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/TransactionInfo.cs +++ b/openwire-dotnet/src/ActiveMQ/Commands/TransactionInfo.cs @@ -1,79 +1,79 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -using System; -using System.Collections; - -using ActiveMQ.OpenWire; -using ActiveMQ.OpenWire.Commands; - -namespace ActiveMQ.OpenWire.Commands -{ - // - // Marshalling code for Open Wire Format for TransactionInfo - // - // - // NOTE!: This file is autogenerated - do not modify! - // if you need to make a change, please see the Groovy scripts in the - // activemq-core module - // - public class TransactionInfo : BaseCommand - { - public const byte ID_TransactionInfo = 7; - - ConnectionId connectionId; - TransactionId transactionId; - byte type; - - public override string ToString() { - return GetType().Name + "[" - + " ConnectionId=" + ConnectionId - + " TransactionId=" + TransactionId - + " Type=" + Type - + " ]"; - - } - - - - public override byte GetDataStructureType() { - return ID_TransactionInfo; - } - - - // Properties - - public ConnectionId ConnectionId - { - get { return connectionId; } - set { this.connectionId = value; } - } - - public TransactionId TransactionId - { - get { return transactionId; } - set { this.transactionId = value; } - } - - public byte Type - { - get { return type; } - set { this.type = value; } - } - - } -} +/* +* Copyright 2006 The Apache Software Foundation or its licensors, as +* applicable. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + +using System; +using System.Collections; + +using ActiveMQ.OpenWire; +using ActiveMQ.Commands; + +namespace ActiveMQ.Commands +{ + // + // Marshalling code for Open Wire Format for TransactionInfo + // + // + // NOTE!: This file is autogenerated - do not modify! + // if you need to make a change, please see the Groovy scripts in the + // activemq-core module + // + public class TransactionInfo : BaseCommand + { + public const byte ID_TransactionInfo = 7; + + ConnectionId connectionId; + TransactionId transactionId; + byte type; + + public override string ToString() { + return GetType().Name + "[" + + " ConnectionId=" + ConnectionId + + " TransactionId=" + TransactionId + + " Type=" + Type + + " ]"; + + } + + + + public override byte GetDataStructureType() { + return ID_TransactionInfo; + } + + + // Properties + + public ConnectionId ConnectionId + { + get { return connectionId; } + set { this.connectionId = value; } + } + + public TransactionId TransactionId + { + get { return transactionId; } + set { this.transactionId = value; } + } + + public byte Type + { + get { return type; } + set { this.type = value; } + } + + } +} diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/WireFormatInfo.cs b/openwire-dotnet/src/ActiveMQ/Commands/WireFormatInfo.cs similarity index 94% rename from openwire-dotnet/src/ActiveMQ/OpenWire/Commands/WireFormatInfo.cs rename to openwire-dotnet/src/ActiveMQ/Commands/WireFormatInfo.cs index 7646df65e5..b8a29e36bb 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/WireFormatInfo.cs +++ b/openwire-dotnet/src/ActiveMQ/Commands/WireFormatInfo.cs @@ -1,111 +1,111 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -using System; -using System.Collections; - -using ActiveMQ.OpenWire; -using ActiveMQ.OpenWire.Commands; - -namespace ActiveMQ.OpenWire.Commands -{ - // - // Marshalling code for Open Wire Format for WireFormatInfo - // - // - // NOTE!: This file is autogenerated - do not modify! - // if you need to make a change, please see the Groovy scripts in the - // activemq-core module - // - public class WireFormatInfo : AbstractCommand - { - public const byte ID_WireFormatInfo = 1; - - byte[] magic; - int version; - bool cacheEnabled; - bool stackTraceEnabled; - bool tcpNoDelayEnabled; - bool prefixPacketSize; - bool tightEncodingEnabled; - - public override string ToString() { - return GetType().Name + "[" - + " Magic=" + Magic - + " Version=" + Version - + " CacheEnabled=" + CacheEnabled - + " StackTraceEnabled=" + StackTraceEnabled - + " TcpNoDelayEnabled=" + TcpNoDelayEnabled - + " PrefixPacketSize=" + PrefixPacketSize - + " TightEncodingEnabled=" + TightEncodingEnabled - + " ]"; - - } - - - - public override byte GetDataStructureType() { - return ID_WireFormatInfo; - } - - - // Properties - - public byte[] Magic - { - get { return magic; } - set { this.magic = value; } - } - - public int Version - { - get { return version; } - set { this.version = value; } - } - - public bool CacheEnabled - { - get { return cacheEnabled; } - set { this.cacheEnabled = value; } - } - - public bool StackTraceEnabled - { - get { return stackTraceEnabled; } - set { this.stackTraceEnabled = value; } - } - - public bool TcpNoDelayEnabled - { - get { return tcpNoDelayEnabled; } - set { this.tcpNoDelayEnabled = value; } - } - - public bool PrefixPacketSize - { - get { return prefixPacketSize; } - set { this.prefixPacketSize = value; } - } - - public bool TightEncodingEnabled - { - get { return tightEncodingEnabled; } - set { this.tightEncodingEnabled = value; } - } - - } -} +/* +* Copyright 2006 The Apache Software Foundation or its licensors, as +* applicable. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + +using System; +using System.Collections; + +using ActiveMQ.OpenWire; +using ActiveMQ.Commands; + +namespace ActiveMQ.Commands +{ + // + // Marshalling code for Open Wire Format for WireFormatInfo + // + // + // NOTE!: This file is autogenerated - do not modify! + // if you need to make a change, please see the Groovy scripts in the + // activemq-core module + // + public class WireFormatInfo : AbstractCommand + { + public const byte ID_WireFormatInfo = 1; + + byte[] magic; + int version; + bool cacheEnabled; + bool stackTraceEnabled; + bool tcpNoDelayEnabled; + bool prefixPacketSize; + bool tightEncodingEnabled; + + public override string ToString() { + return GetType().Name + "[" + + " Magic=" + Magic + + " Version=" + Version + + " CacheEnabled=" + CacheEnabled + + " StackTraceEnabled=" + StackTraceEnabled + + " TcpNoDelayEnabled=" + TcpNoDelayEnabled + + " PrefixPacketSize=" + PrefixPacketSize + + " TightEncodingEnabled=" + TightEncodingEnabled + + " ]"; + + } + + + + public override byte GetDataStructureType() { + return ID_WireFormatInfo; + } + + + // Properties + + public byte[] Magic + { + get { return magic; } + set { this.magic = value; } + } + + public int Version + { + get { return version; } + set { this.version = value; } + } + + public bool CacheEnabled + { + get { return cacheEnabled; } + set { this.cacheEnabled = value; } + } + + public bool StackTraceEnabled + { + get { return stackTraceEnabled; } + set { this.stackTraceEnabled = value; } + } + + public bool TcpNoDelayEnabled + { + get { return tcpNoDelayEnabled; } + set { this.tcpNoDelayEnabled = value; } + } + + public bool PrefixPacketSize + { + get { return prefixPacketSize; } + set { this.prefixPacketSize = value; } + } + + public bool TightEncodingEnabled + { + get { return tightEncodingEnabled; } + set { this.tightEncodingEnabled = value; } + } + + } +} diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/XATransactionId.cs b/openwire-dotnet/src/ActiveMQ/Commands/XATransactionId.cs similarity index 94% rename from openwire-dotnet/src/ActiveMQ/OpenWire/Commands/XATransactionId.cs rename to openwire-dotnet/src/ActiveMQ/Commands/XATransactionId.cs index c2498aad58..1b48b297c4 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/XATransactionId.cs +++ b/openwire-dotnet/src/ActiveMQ/Commands/XATransactionId.cs @@ -1,105 +1,105 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -using System; -using System.Collections; - -using ActiveMQ.OpenWire; -using ActiveMQ.OpenWire.Commands; - -namespace ActiveMQ.OpenWire.Commands -{ - // - // Marshalling code for Open Wire Format for XATransactionId - // - // - // NOTE!: This file is autogenerated - do not modify! - // if you need to make a change, please see the Groovy scripts in the - // activemq-core module - // - public class XATransactionId : TransactionId - { - public const byte ID_XATransactionId = 112; - - int formatId; - byte[] globalTransactionId; - byte[] branchQualifier; - - public override int GetHashCode() { - int answer = 0; - answer = (answer * 37) + HashCode(FormatId); - answer = (answer * 37) + HashCode(GlobalTransactionId); - answer = (answer * 37) + HashCode(BranchQualifier); - return answer; - - } - - - public override bool Equals(object that) { - if (that is XATransactionId) { - return Equals((XATransactionId) that); - } - return false; - } - - public virtual bool Equals(XATransactionId that) { - if (! Equals(this.FormatId, that.FormatId)) return false; - if (! Equals(this.GlobalTransactionId, that.GlobalTransactionId)) return false; - if (! Equals(this.BranchQualifier, that.BranchQualifier)) return false; - return true; - - } - - - public override string ToString() { - return GetType().Name + "[" - + " FormatId=" + FormatId - + " GlobalTransactionId=" + GlobalTransactionId - + " BranchQualifier=" + BranchQualifier - + " ]"; - - } - - - - public override byte GetDataStructureType() { - return ID_XATransactionId; - } - - - // Properties - - public int FormatId - { - get { return formatId; } - set { this.formatId = value; } - } - - public byte[] GlobalTransactionId - { - get { return globalTransactionId; } - set { this.globalTransactionId = value; } - } - - public byte[] BranchQualifier - { - get { return branchQualifier; } - set { this.branchQualifier = value; } - } - - } -} +/* +* Copyright 2006 The Apache Software Foundation or its licensors, as +* applicable. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + +using System; +using System.Collections; + +using ActiveMQ.OpenWire; +using ActiveMQ.Commands; + +namespace ActiveMQ.Commands +{ + // + // Marshalling code for Open Wire Format for XATransactionId + // + // + // NOTE!: This file is autogenerated - do not modify! + // if you need to make a change, please see the Groovy scripts in the + // activemq-core module + // + public class XATransactionId : TransactionId + { + public const byte ID_XATransactionId = 112; + + int formatId; + byte[] globalTransactionId; + byte[] branchQualifier; + + public override int GetHashCode() { + int answer = 0; + answer = (answer * 37) + HashCode(FormatId); + answer = (answer * 37) + HashCode(GlobalTransactionId); + answer = (answer * 37) + HashCode(BranchQualifier); + return answer; + + } + + + public override bool Equals(object that) { + if (that is XATransactionId) { + return Equals((XATransactionId) that); + } + return false; + } + + public virtual bool Equals(XATransactionId that) { + if (! Equals(this.FormatId, that.FormatId)) return false; + if (! Equals(this.GlobalTransactionId, that.GlobalTransactionId)) return false; + if (! Equals(this.BranchQualifier, that.BranchQualifier)) return false; + return true; + + } + + + public override string ToString() { + return GetType().Name + "[" + + " FormatId=" + FormatId + + " GlobalTransactionId=" + GlobalTransactionId + + " BranchQualifier=" + BranchQualifier + + " ]"; + + } + + + + public override byte GetDataStructureType() { + return ID_XATransactionId; + } + + + // Properties + + public int FormatId + { + get { return formatId; } + set { this.formatId = value; } + } + + public byte[] GlobalTransactionId + { + get { return globalTransactionId; } + set { this.globalTransactionId = value; } + } + + public byte[] BranchQualifier + { + get { return branchQualifier; } + set { this.branchQualifier = value; } + } + + } +} diff --git a/openwire-dotnet/src/ActiveMQ/Connection.cs b/openwire-dotnet/src/ActiveMQ/Connection.cs index 2b3ad18050..216a2ca16b 100755 --- a/openwire-dotnet/src/ActiveMQ/Connection.cs +++ b/openwire-dotnet/src/ActiveMQ/Connection.cs @@ -1,9 +1,9 @@ +using ActiveMQ.Commands; +using ActiveMQ.OpenWire; +using ActiveMQ.Transport; +using JMS; using System; using System.Collections; -using System.Threading; - -using ActiveMQ.OpenWire; -using ActiveMQ.OpenWire.Commands; namespace ActiveMQ { diff --git a/openwire-dotnet/src/ActiveMQ/ConnectionClosedException.cs b/openwire-dotnet/src/ActiveMQ/ConnectionClosedException.cs index d079a48717..2e08190326 100755 --- a/openwire-dotnet/src/ActiveMQ/ConnectionClosedException.cs +++ b/openwire-dotnet/src/ActiveMQ/ConnectionClosedException.cs @@ -18,7 +18,6 @@ using System; using System.Collections; using ActiveMQ.OpenWire; -using ActiveMQ.OpenWire.Commands; namespace ActiveMQ { diff --git a/openwire-dotnet/src/ActiveMQ/ConnectionFactory.cs b/openwire-dotnet/src/ActiveMQ/ConnectionFactory.cs index c46e5ba7e1..e78fd7d3b3 100755 --- a/openwire-dotnet/src/ActiveMQ/ConnectionFactory.cs +++ b/openwire-dotnet/src/ActiveMQ/ConnectionFactory.cs @@ -14,11 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +using ActiveMQ.Commands; +using ActiveMQ.Transport; +using JMS; using System; -using System.Collections; - -using ActiveMQ.OpenWire; -using ActiveMQ.OpenWire.Commands; namespace ActiveMQ { diff --git a/openwire-dotnet/src/ActiveMQ/ConsumerClosedException.cs b/openwire-dotnet/src/ActiveMQ/ConsumerClosedException.cs index 80131fae8e..371ce3934b 100755 --- a/openwire-dotnet/src/ActiveMQ/ConsumerClosedException.cs +++ b/openwire-dotnet/src/ActiveMQ/ConsumerClosedException.cs @@ -18,7 +18,6 @@ using System; using System.Collections; using ActiveMQ.OpenWire; -using ActiveMQ.OpenWire.Commands; namespace ActiveMQ { diff --git a/openwire-dotnet/src/ActiveMQ/DestinationFilter.cs b/openwire-dotnet/src/ActiveMQ/DestinationFilter.cs index 5838039cd1..c2791f11f0 100755 --- a/openwire-dotnet/src/ActiveMQ/DestinationFilter.cs +++ b/openwire-dotnet/src/ActiveMQ/DestinationFilter.cs @@ -14,11 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +using ActiveMQ.Commands; using System; -using ActiveMQ.OpenWire; -using ActiveMQ.OpenWire.Commands; - namespace ActiveMQ { /// diff --git a/openwire-dotnet/src/ActiveMQ/MessageConsumer.cs b/openwire-dotnet/src/ActiveMQ/MessageConsumer.cs index 9b9b20b481..86a9d72141 100755 --- a/openwire-dotnet/src/ActiveMQ/MessageConsumer.cs +++ b/openwire-dotnet/src/ActiveMQ/MessageConsumer.cs @@ -14,12 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -using System; -using System.Collections; -using System.Threading; - +using ActiveMQ.Commands; using ActiveMQ.OpenWire; -using ActiveMQ.OpenWire.Commands; +using JMS; +using System.Threading; namespace ActiveMQ { diff --git a/openwire-dotnet/src/ActiveMQ/MessageProducer.cs b/openwire-dotnet/src/ActiveMQ/MessageProducer.cs index ca8580240f..00e7766e35 100755 --- a/openwire-dotnet/src/ActiveMQ/MessageProducer.cs +++ b/openwire-dotnet/src/ActiveMQ/MessageProducer.cs @@ -14,10 +14,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -using System; - -using ActiveMQ.OpenWire; -using ActiveMQ.OpenWire.Commands; +using ActiveMQ.Commands; +using JMS; namespace ActiveMQ { diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/AbstractCommand.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/AbstractCommand.cs index 47e7e6be56..92a7b720dc 100755 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/AbstractCommand.cs +++ b/openwire-dotnet/src/ActiveMQ/OpenWire/AbstractCommand.cs @@ -14,9 +14,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +using ActiveMQ.Commands; using System; -using ActiveMQ.OpenWire; -using ActiveMQ.OpenWire.Commands; namespace ActiveMQ.OpenWire { diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/BaseDataStreamMarshaller.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/BaseDataStreamMarshaller.cs index fc1c87fa50..9b1e9ad23e 100755 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/BaseDataStreamMarshaller.cs +++ b/openwire-dotnet/src/ActiveMQ/OpenWire/BaseDataStreamMarshaller.cs @@ -14,14 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +using ActiveMQ.Commands; using System; -using System.IO; -using System.Net; -using System.Text; using System.Collections; - -using ActiveMQ.OpenWire; -using ActiveMQ.OpenWire.Commands; +using System.IO; +using System.Text; namespace ActiveMQ.OpenWire diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/BooleanStream.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/BooleanStream.cs index ca897318ca..0ae788341c 100755 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/BooleanStream.cs +++ b/openwire-dotnet/src/ActiveMQ/OpenWire/BooleanStream.cs @@ -18,7 +18,6 @@ using System; using System.IO; using ActiveMQ.OpenWire; -using ActiveMQ.OpenWire.Commands; namespace ActiveMQ.OpenWire diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/DataStructureSupport.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/DataStructureSupport.cs index eced31e18a..522a876bc8 100755 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/DataStructureSupport.cs +++ b/openwire-dotnet/src/ActiveMQ/OpenWire/DataStructureSupport.cs @@ -17,7 +17,6 @@ using System; using ActiveMQ.OpenWire; -using ActiveMQ.OpenWire.Commands; namespace ActiveMQ.OpenWire { diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Dispatcher.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/Dispatcher.cs index 3164253f18..4c6608cb4a 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/Dispatcher.cs +++ b/openwire-dotnet/src/ActiveMQ/OpenWire/Dispatcher.cs @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -using System.Collections; +using ActiveMQ.Commands; +using JMS; using System; +using System.Collections; using System.Threading; -using ActiveMQ.OpenWire.Commands; - namespace ActiveMQ.OpenWire { /// diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/FutureResponse.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/FutureResponse.cs index a8e5209919..08f0358e63 100755 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/FutureResponse.cs +++ b/openwire-dotnet/src/ActiveMQ/OpenWire/FutureResponse.cs @@ -14,11 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +using ActiveMQ.Commands; using System; using System.Threading; -using ActiveMQ.OpenWire.Commands; - namespace ActiveMQ.OpenWire { /// diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/MessagePropertyHelper.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/MessagePropertyHelper.cs index 9a55c6f2e8..742ef349ff 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/MessagePropertyHelper.cs +++ b/openwire-dotnet/src/ActiveMQ/OpenWire/MessagePropertyHelper.cs @@ -14,11 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -using System; +using ActiveMQ.Commands; using System.Collections; -using ActiveMQ.OpenWire.Commands; - namespace ActiveMQ.OpenWire { public delegate object PropertyGetter(ActiveMQMessage message); diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/OpenWireFormat.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/OpenWireFormat.cs index 0c82b7a556..7b27c15447 100755 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/OpenWireFormat.cs +++ b/openwire-dotnet/src/ActiveMQ/OpenWire/OpenWireFormat.cs @@ -14,12 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +using ActiveMQ.Commands; +using ActiveMQ.OpenWire.V1; using System; using System.IO; -using ActiveMQ.OpenWire.Commands; -using ActiveMQ.OpenWire.V1; - namespace ActiveMQ.OpenWire { /// diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/PrimitiveMap.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/PrimitiveMap.cs index 43524383da..88a79b14b7 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/PrimitiveMap.cs +++ b/openwire-dotnet/src/ActiveMQ/OpenWire/PrimitiveMap.cs @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +using JMS; using System; using System.Collections; diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQBytesMessageMarshaller.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQBytesMessageMarshaller.cs index a5ddadf4eb..bdd9dfe6b9 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQBytesMessageMarshaller.cs +++ b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQBytesMessageMarshaller.cs @@ -19,8 +19,8 @@ using System; using System.Collections; using System.IO; +using ActiveMQ.Commands; using ActiveMQ.OpenWire; -using ActiveMQ.OpenWire.Commands; using ActiveMQ.OpenWire.V1; namespace ActiveMQ.OpenWire.V1 diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQDestinationMarshaller.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQDestinationMarshaller.cs index de073d49a8..99c1069914 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQDestinationMarshaller.cs +++ b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQDestinationMarshaller.cs @@ -19,8 +19,8 @@ using System; using System.Collections; using System.IO; +using ActiveMQ.Commands; using ActiveMQ.OpenWire; -using ActiveMQ.OpenWire.Commands; using ActiveMQ.OpenWire.V1; namespace ActiveMQ.OpenWire.V1 diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQMapMessageMarshaller.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQMapMessageMarshaller.cs index f28026e535..16611c91f9 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQMapMessageMarshaller.cs +++ b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQMapMessageMarshaller.cs @@ -19,8 +19,8 @@ using System; using System.Collections; using System.IO; +using ActiveMQ.Commands; using ActiveMQ.OpenWire; -using ActiveMQ.OpenWire.Commands; using ActiveMQ.OpenWire.V1; namespace ActiveMQ.OpenWire.V1 diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQMessageMarshaller.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQMessageMarshaller.cs index 4c31a45810..ba1bfb7f10 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQMessageMarshaller.cs +++ b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQMessageMarshaller.cs @@ -19,8 +19,8 @@ using System; using System.Collections; using System.IO; +using ActiveMQ.Commands; using ActiveMQ.OpenWire; -using ActiveMQ.OpenWire.Commands; using ActiveMQ.OpenWire.V1; namespace ActiveMQ.OpenWire.V1 diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQObjectMessageMarshaller.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQObjectMessageMarshaller.cs index 308c14d667..960c93cccd 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQObjectMessageMarshaller.cs +++ b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQObjectMessageMarshaller.cs @@ -19,8 +19,8 @@ using System; using System.Collections; using System.IO; +using ActiveMQ.Commands; using ActiveMQ.OpenWire; -using ActiveMQ.OpenWire.Commands; using ActiveMQ.OpenWire.V1; namespace ActiveMQ.OpenWire.V1 diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQQueueMarshaller.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQQueueMarshaller.cs index 52a4a191e3..45e72dcade 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQQueueMarshaller.cs +++ b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQQueueMarshaller.cs @@ -19,8 +19,8 @@ using System; using System.Collections; using System.IO; +using ActiveMQ.Commands; using ActiveMQ.OpenWire; -using ActiveMQ.OpenWire.Commands; using ActiveMQ.OpenWire.V1; namespace ActiveMQ.OpenWire.V1 diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQStreamMessageMarshaller.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQStreamMessageMarshaller.cs index fbeb65c1d3..a12d906ee1 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQStreamMessageMarshaller.cs +++ b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQStreamMessageMarshaller.cs @@ -19,8 +19,8 @@ using System; using System.Collections; using System.IO; +using ActiveMQ.Commands; using ActiveMQ.OpenWire; -using ActiveMQ.OpenWire.Commands; using ActiveMQ.OpenWire.V1; namespace ActiveMQ.OpenWire.V1 diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQTempDestinationMarshaller.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQTempDestinationMarshaller.cs index 10a2166e18..f8c17ff22e 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQTempDestinationMarshaller.cs +++ b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQTempDestinationMarshaller.cs @@ -19,8 +19,8 @@ using System; using System.Collections; using System.IO; +using ActiveMQ.Commands; using ActiveMQ.OpenWire; -using ActiveMQ.OpenWire.Commands; using ActiveMQ.OpenWire.V1; namespace ActiveMQ.OpenWire.V1 diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQTempQueueMarshaller.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQTempQueueMarshaller.cs index 3aeff09a1d..99efd9b1c6 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQTempQueueMarshaller.cs +++ b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQTempQueueMarshaller.cs @@ -19,8 +19,8 @@ using System; using System.Collections; using System.IO; +using ActiveMQ.Commands; using ActiveMQ.OpenWire; -using ActiveMQ.OpenWire.Commands; using ActiveMQ.OpenWire.V1; namespace ActiveMQ.OpenWire.V1 diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQTempTopicMarshaller.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQTempTopicMarshaller.cs index 9451b43f24..992a6fef54 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQTempTopicMarshaller.cs +++ b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQTempTopicMarshaller.cs @@ -19,8 +19,8 @@ using System; using System.Collections; using System.IO; +using ActiveMQ.Commands; using ActiveMQ.OpenWire; -using ActiveMQ.OpenWire.Commands; using ActiveMQ.OpenWire.V1; namespace ActiveMQ.OpenWire.V1 diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQTextMessageMarshaller.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQTextMessageMarshaller.cs index 25c303861c..7bacf1d6dc 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQTextMessageMarshaller.cs +++ b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQTextMessageMarshaller.cs @@ -19,8 +19,8 @@ using System; using System.Collections; using System.IO; +using ActiveMQ.Commands; using ActiveMQ.OpenWire; -using ActiveMQ.OpenWire.Commands; using ActiveMQ.OpenWire.V1; namespace ActiveMQ.OpenWire.V1 diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQTopicMarshaller.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQTopicMarshaller.cs index 64fa4e204d..229246d6c2 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQTopicMarshaller.cs +++ b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQTopicMarshaller.cs @@ -19,8 +19,8 @@ using System; using System.Collections; using System.IO; +using ActiveMQ.Commands; using ActiveMQ.OpenWire; -using ActiveMQ.OpenWire.Commands; using ActiveMQ.OpenWire.V1; namespace ActiveMQ.OpenWire.V1 diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/BaseCommandMarshaller.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/BaseCommandMarshaller.cs index 4196c66bff..991dde65a7 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/BaseCommandMarshaller.cs +++ b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/BaseCommandMarshaller.cs @@ -19,8 +19,8 @@ using System; using System.Collections; using System.IO; +using ActiveMQ.Commands; using ActiveMQ.OpenWire; -using ActiveMQ.OpenWire.Commands; using ActiveMQ.OpenWire.V1; namespace ActiveMQ.OpenWire.V1 diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/BrokerIdMarshaller.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/BrokerIdMarshaller.cs index d306bfe48f..a89255b3d1 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/BrokerIdMarshaller.cs +++ b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/BrokerIdMarshaller.cs @@ -19,8 +19,8 @@ using System; using System.Collections; using System.IO; +using ActiveMQ.Commands; using ActiveMQ.OpenWire; -using ActiveMQ.OpenWire.Commands; using ActiveMQ.OpenWire.V1; namespace ActiveMQ.OpenWire.V1 diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/BrokerInfoMarshaller.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/BrokerInfoMarshaller.cs index 68d963fe90..7e3665969a 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/BrokerInfoMarshaller.cs +++ b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/BrokerInfoMarshaller.cs @@ -19,8 +19,8 @@ using System; using System.Collections; using System.IO; +using ActiveMQ.Commands; using ActiveMQ.OpenWire; -using ActiveMQ.OpenWire.Commands; using ActiveMQ.OpenWire.V1; namespace ActiveMQ.OpenWire.V1 diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ConnectionErrorMarshaller.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ConnectionErrorMarshaller.cs index e13003eee8..fb197c20e9 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ConnectionErrorMarshaller.cs +++ b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ConnectionErrorMarshaller.cs @@ -19,8 +19,8 @@ using System; using System.Collections; using System.IO; +using ActiveMQ.Commands; using ActiveMQ.OpenWire; -using ActiveMQ.OpenWire.Commands; using ActiveMQ.OpenWire.V1; namespace ActiveMQ.OpenWire.V1 diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ConnectionIdMarshaller.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ConnectionIdMarshaller.cs index bf8a40c3e1..b5c60ea5fa 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ConnectionIdMarshaller.cs +++ b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ConnectionIdMarshaller.cs @@ -19,8 +19,8 @@ using System; using System.Collections; using System.IO; +using ActiveMQ.Commands; using ActiveMQ.OpenWire; -using ActiveMQ.OpenWire.Commands; using ActiveMQ.OpenWire.V1; namespace ActiveMQ.OpenWire.V1 diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ConnectionInfoMarshaller.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ConnectionInfoMarshaller.cs index 4a64924c2f..9c086a772a 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ConnectionInfoMarshaller.cs +++ b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ConnectionInfoMarshaller.cs @@ -19,8 +19,8 @@ using System; using System.Collections; using System.IO; +using ActiveMQ.Commands; using ActiveMQ.OpenWire; -using ActiveMQ.OpenWire.Commands; using ActiveMQ.OpenWire.V1; namespace ActiveMQ.OpenWire.V1 diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ConsumerIdMarshaller.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ConsumerIdMarshaller.cs index 88853714aa..20167aef03 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ConsumerIdMarshaller.cs +++ b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ConsumerIdMarshaller.cs @@ -19,8 +19,8 @@ using System; using System.Collections; using System.IO; +using ActiveMQ.Commands; using ActiveMQ.OpenWire; -using ActiveMQ.OpenWire.Commands; using ActiveMQ.OpenWire.V1; namespace ActiveMQ.OpenWire.V1 diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ConsumerInfoMarshaller.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ConsumerInfoMarshaller.cs index 174022ee5c..8b8f9f9afb 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ConsumerInfoMarshaller.cs +++ b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ConsumerInfoMarshaller.cs @@ -19,8 +19,8 @@ using System; using System.Collections; using System.IO; +using ActiveMQ.Commands; using ActiveMQ.OpenWire; -using ActiveMQ.OpenWire.Commands; using ActiveMQ.OpenWire.V1; namespace ActiveMQ.OpenWire.V1 diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ControlCommandMarshaller.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ControlCommandMarshaller.cs index 0789aee7b5..c5189e3430 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ControlCommandMarshaller.cs +++ b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ControlCommandMarshaller.cs @@ -19,8 +19,8 @@ using System; using System.Collections; using System.IO; +using ActiveMQ.Commands; using ActiveMQ.OpenWire; -using ActiveMQ.OpenWire.Commands; using ActiveMQ.OpenWire.V1; namespace ActiveMQ.OpenWire.V1 diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/DataArrayResponseMarshaller.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/DataArrayResponseMarshaller.cs index 7d6af546d5..c9f760eb42 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/DataArrayResponseMarshaller.cs +++ b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/DataArrayResponseMarshaller.cs @@ -19,8 +19,8 @@ using System; using System.Collections; using System.IO; +using ActiveMQ.Commands; using ActiveMQ.OpenWire; -using ActiveMQ.OpenWire.Commands; using ActiveMQ.OpenWire.V1; namespace ActiveMQ.OpenWire.V1 diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/DataResponseMarshaller.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/DataResponseMarshaller.cs index b4d76b90fb..0caf79931f 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/DataResponseMarshaller.cs +++ b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/DataResponseMarshaller.cs @@ -19,8 +19,8 @@ using System; using System.Collections; using System.IO; +using ActiveMQ.Commands; using ActiveMQ.OpenWire; -using ActiveMQ.OpenWire.Commands; using ActiveMQ.OpenWire.V1; namespace ActiveMQ.OpenWire.V1 diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/DataStructureSupportMarshaller.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/DataStructureSupportMarshaller.cs index 9d99e3c856..c911a6c2a0 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/DataStructureSupportMarshaller.cs +++ b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/DataStructureSupportMarshaller.cs @@ -20,7 +20,6 @@ using System.Collections; using System.IO; using ActiveMQ.OpenWire; -using ActiveMQ.OpenWire.Commands; using ActiveMQ.OpenWire.V1; namespace ActiveMQ.OpenWire.V1 diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/DestinationInfoMarshaller.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/DestinationInfoMarshaller.cs index acc70b48da..1dbd71bfcd 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/DestinationInfoMarshaller.cs +++ b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/DestinationInfoMarshaller.cs @@ -19,8 +19,8 @@ using System; using System.Collections; using System.IO; +using ActiveMQ.Commands; using ActiveMQ.OpenWire; -using ActiveMQ.OpenWire.Commands; using ActiveMQ.OpenWire.V1; namespace ActiveMQ.OpenWire.V1 diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/DiscoveryEventMarshaller.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/DiscoveryEventMarshaller.cs index 813f539c89..ddb65f3bab 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/DiscoveryEventMarshaller.cs +++ b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/DiscoveryEventMarshaller.cs @@ -19,8 +19,8 @@ using System; using System.Collections; using System.IO; +using ActiveMQ.Commands; using ActiveMQ.OpenWire; -using ActiveMQ.OpenWire.Commands; using ActiveMQ.OpenWire.V1; namespace ActiveMQ.OpenWire.V1 diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ExceptionResponseMarshaller.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ExceptionResponseMarshaller.cs index 7bc9b544b2..57ea487d70 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ExceptionResponseMarshaller.cs +++ b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ExceptionResponseMarshaller.cs @@ -19,8 +19,8 @@ using System; using System.Collections; using System.IO; +using ActiveMQ.Commands; using ActiveMQ.OpenWire; -using ActiveMQ.OpenWire.Commands; using ActiveMQ.OpenWire.V1; namespace ActiveMQ.OpenWire.V1 diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/FlushCommandMarshaller.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/FlushCommandMarshaller.cs index 643b0c9a43..dd0dd2e098 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/FlushCommandMarshaller.cs +++ b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/FlushCommandMarshaller.cs @@ -19,8 +19,8 @@ using System; using System.Collections; using System.IO; +using ActiveMQ.Commands; using ActiveMQ.OpenWire; -using ActiveMQ.OpenWire.Commands; using ActiveMQ.OpenWire.V1; namespace ActiveMQ.OpenWire.V1 diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/IntegerResponseMarshaller.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/IntegerResponseMarshaller.cs index 9ce556837a..f8f63f0fb9 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/IntegerResponseMarshaller.cs +++ b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/IntegerResponseMarshaller.cs @@ -19,8 +19,8 @@ using System; using System.Collections; using System.IO; +using ActiveMQ.Commands; using ActiveMQ.OpenWire; -using ActiveMQ.OpenWire.Commands; using ActiveMQ.OpenWire.V1; namespace ActiveMQ.OpenWire.V1 diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/JournalQueueAckMarshaller.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/JournalQueueAckMarshaller.cs index 00e4aabab5..c9532bea58 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/JournalQueueAckMarshaller.cs +++ b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/JournalQueueAckMarshaller.cs @@ -19,8 +19,8 @@ using System; using System.Collections; using System.IO; +using ActiveMQ.Commands; using ActiveMQ.OpenWire; -using ActiveMQ.OpenWire.Commands; using ActiveMQ.OpenWire.V1; namespace ActiveMQ.OpenWire.V1 diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/JournalTopicAckMarshaller.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/JournalTopicAckMarshaller.cs index dc9545eaa3..c8726086be 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/JournalTopicAckMarshaller.cs +++ b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/JournalTopicAckMarshaller.cs @@ -19,8 +19,8 @@ using System; using System.Collections; using System.IO; +using ActiveMQ.Commands; using ActiveMQ.OpenWire; -using ActiveMQ.OpenWire.Commands; using ActiveMQ.OpenWire.V1; namespace ActiveMQ.OpenWire.V1 diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/JournalTraceMarshaller.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/JournalTraceMarshaller.cs index defb563ec5..9ba306b1ef 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/JournalTraceMarshaller.cs +++ b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/JournalTraceMarshaller.cs @@ -19,8 +19,8 @@ using System; using System.Collections; using System.IO; +using ActiveMQ.Commands; using ActiveMQ.OpenWire; -using ActiveMQ.OpenWire.Commands; using ActiveMQ.OpenWire.V1; namespace ActiveMQ.OpenWire.V1 diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/JournalTransactionMarshaller.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/JournalTransactionMarshaller.cs index 142ebb6e87..9a954acdf7 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/JournalTransactionMarshaller.cs +++ b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/JournalTransactionMarshaller.cs @@ -19,8 +19,8 @@ using System; using System.Collections; using System.IO; +using ActiveMQ.Commands; using ActiveMQ.OpenWire; -using ActiveMQ.OpenWire.Commands; using ActiveMQ.OpenWire.V1; namespace ActiveMQ.OpenWire.V1 diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/KeepAliveInfoMarshaller.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/KeepAliveInfoMarshaller.cs index cccced66c6..9a95e8c67c 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/KeepAliveInfoMarshaller.cs +++ b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/KeepAliveInfoMarshaller.cs @@ -19,8 +19,8 @@ using System; using System.Collections; using System.IO; +using ActiveMQ.Commands; using ActiveMQ.OpenWire; -using ActiveMQ.OpenWire.Commands; using ActiveMQ.OpenWire.V1; namespace ActiveMQ.OpenWire.V1 diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/LocalTransactionIdMarshaller.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/LocalTransactionIdMarshaller.cs index da1b9651a4..74832b4b04 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/LocalTransactionIdMarshaller.cs +++ b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/LocalTransactionIdMarshaller.cs @@ -19,8 +19,8 @@ using System; using System.Collections; using System.IO; +using ActiveMQ.Commands; using ActiveMQ.OpenWire; -using ActiveMQ.OpenWire.Commands; using ActiveMQ.OpenWire.V1; namespace ActiveMQ.OpenWire.V1 diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/MarshallerFactory.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/MarshallerFactory.cs index 4945dae383..c13712b4bf 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/MarshallerFactory.cs +++ b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/MarshallerFactory.cs @@ -1,90 +1,90 @@ -// -// -// Copyright 2005-2006 The Apache Software Foundation -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// - -// Marshalling code for Open Wire Format for ExceptionResponse -// -// -// NOTE!: This file is autogenerated - do not modify! -// if you need to make a change, please see the Groovy scripts in the -// activemq-openwire module -// - -using System; -using System.Collections; -using System.IO; - -using ActiveMQ.OpenWire; -using ActiveMQ.OpenWire.Commands; -using ActiveMQ.OpenWire.V1; - -namespace ActiveMQ.OpenWire.V1 -{ - public class MarshallerFactory - { - public void configure(OpenWireFormat format) - { - - format.addMarshaller(new MessageIdMarshaller()); - format.addMarshaller(new BrokerInfoMarshaller()); - format.addMarshaller(new ActiveMQTempQueueMarshaller()); - format.addMarshaller(new LocalTransactionIdMarshaller()); - format.addMarshaller(new RemoveSubscriptionInfoMarshaller()); - format.addMarshaller(new IntegerResponseMarshaller()); - format.addMarshaller(new ActiveMQQueueMarshaller()); - format.addMarshaller(new DestinationInfoMarshaller()); - format.addMarshaller(new ActiveMQBytesMessageMarshaller()); - format.addMarshaller(new ShutdownInfoMarshaller()); - format.addMarshaller(new DataResponseMarshaller()); - format.addMarshaller(new SessionIdMarshaller()); - format.addMarshaller(new DataArrayResponseMarshaller()); - format.addMarshaller(new JournalQueueAckMarshaller()); - format.addMarshaller(new WireFormatInfoMarshaller()); - format.addMarshaller(new ResponseMarshaller()); - format.addMarshaller(new ConnectionErrorMarshaller()); - format.addMarshaller(new ActiveMQObjectMessageMarshaller()); - format.addMarshaller(new ConsumerInfoMarshaller()); - format.addMarshaller(new ActiveMQTempTopicMarshaller()); - format.addMarshaller(new ConnectionIdMarshaller()); - format.addMarshaller(new DiscoveryEventMarshaller()); - format.addMarshaller(new ConnectionInfoMarshaller()); - format.addMarshaller(new KeepAliveInfoMarshaller()); - format.addMarshaller(new XATransactionIdMarshaller()); - format.addMarshaller(new JournalTraceMarshaller()); - format.addMarshaller(new FlushCommandMarshaller()); - format.addMarshaller(new ConsumerIdMarshaller()); - format.addMarshaller(new JournalTopicAckMarshaller()); - format.addMarshaller(new ActiveMQTextMessageMarshaller()); - format.addMarshaller(new BrokerIdMarshaller()); - format.addMarshaller(new MessageDispatchMarshaller()); - format.addMarshaller(new ProducerInfoMarshaller()); - format.addMarshaller(new SubscriptionInfoMarshaller()); - format.addMarshaller(new ActiveMQMapMessageMarshaller()); - format.addMarshaller(new MessageDispatchNotificationMarshaller()); - format.addMarshaller(new SessionInfoMarshaller()); - format.addMarshaller(new ActiveMQMessageMarshaller()); - format.addMarshaller(new TransactionInfoMarshaller()); - format.addMarshaller(new ActiveMQStreamMessageMarshaller()); - format.addMarshaller(new MessageAckMarshaller()); - format.addMarshaller(new ProducerIdMarshaller()); - format.addMarshaller(new ActiveMQTopicMarshaller()); - format.addMarshaller(new JournalTransactionMarshaller()); - format.addMarshaller(new RemoveInfoMarshaller()); - format.addMarshaller(new ControlCommandMarshaller()); - format.addMarshaller(new ExceptionResponseMarshaller()); - } - } -} +// +// +// Copyright 2005-2006 The Apache Software Foundation +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// + +// Marshalling code for Open Wire Format for ExceptionResponse +// +// +// NOTE!: This file is autogenerated - do not modify! +// if you need to make a change, please see the Groovy scripts in the +// activemq-openwire module +// + +using System; +using System.Collections; +using System.IO; + +using ActiveMQ.Commands; +using ActiveMQ.OpenWire; +using ActiveMQ.OpenWire.V1; + +namespace ActiveMQ.OpenWire.V1 +{ + public class MarshallerFactory + { + public void configure(OpenWireFormat format) + { + + format.addMarshaller(new MessageIdMarshaller()); + format.addMarshaller(new BrokerInfoMarshaller()); + format.addMarshaller(new ActiveMQTempQueueMarshaller()); + format.addMarshaller(new LocalTransactionIdMarshaller()); + format.addMarshaller(new RemoveSubscriptionInfoMarshaller()); + format.addMarshaller(new IntegerResponseMarshaller()); + format.addMarshaller(new ActiveMQQueueMarshaller()); + format.addMarshaller(new DestinationInfoMarshaller()); + format.addMarshaller(new ActiveMQBytesMessageMarshaller()); + format.addMarshaller(new ShutdownInfoMarshaller()); + format.addMarshaller(new DataResponseMarshaller()); + format.addMarshaller(new SessionIdMarshaller()); + format.addMarshaller(new DataArrayResponseMarshaller()); + format.addMarshaller(new JournalQueueAckMarshaller()); + format.addMarshaller(new WireFormatInfoMarshaller()); + format.addMarshaller(new ResponseMarshaller()); + format.addMarshaller(new ConnectionErrorMarshaller()); + format.addMarshaller(new ActiveMQObjectMessageMarshaller()); + format.addMarshaller(new ConsumerInfoMarshaller()); + format.addMarshaller(new ActiveMQTempTopicMarshaller()); + format.addMarshaller(new ConnectionIdMarshaller()); + format.addMarshaller(new DiscoveryEventMarshaller()); + format.addMarshaller(new ConnectionInfoMarshaller()); + format.addMarshaller(new KeepAliveInfoMarshaller()); + format.addMarshaller(new XATransactionIdMarshaller()); + format.addMarshaller(new JournalTraceMarshaller()); + format.addMarshaller(new FlushCommandMarshaller()); + format.addMarshaller(new ConsumerIdMarshaller()); + format.addMarshaller(new JournalTopicAckMarshaller()); + format.addMarshaller(new ActiveMQTextMessageMarshaller()); + format.addMarshaller(new BrokerIdMarshaller()); + format.addMarshaller(new MessageDispatchMarshaller()); + format.addMarshaller(new ProducerInfoMarshaller()); + format.addMarshaller(new SubscriptionInfoMarshaller()); + format.addMarshaller(new ActiveMQMapMessageMarshaller()); + format.addMarshaller(new MessageDispatchNotificationMarshaller()); + format.addMarshaller(new SessionInfoMarshaller()); + format.addMarshaller(new ActiveMQMessageMarshaller()); + format.addMarshaller(new TransactionInfoMarshaller()); + format.addMarshaller(new ActiveMQStreamMessageMarshaller()); + format.addMarshaller(new MessageAckMarshaller()); + format.addMarshaller(new ProducerIdMarshaller()); + format.addMarshaller(new ActiveMQTopicMarshaller()); + format.addMarshaller(new JournalTransactionMarshaller()); + format.addMarshaller(new RemoveInfoMarshaller()); + format.addMarshaller(new ControlCommandMarshaller()); + format.addMarshaller(new ExceptionResponseMarshaller()); + } + } +} diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/MessageAckMarshaller.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/MessageAckMarshaller.cs index 00aad4c371..ceb99ca65c 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/MessageAckMarshaller.cs +++ b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/MessageAckMarshaller.cs @@ -19,8 +19,8 @@ using System; using System.Collections; using System.IO; +using ActiveMQ.Commands; using ActiveMQ.OpenWire; -using ActiveMQ.OpenWire.Commands; using ActiveMQ.OpenWire.V1; namespace ActiveMQ.OpenWire.V1 diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/MessageDispatchMarshaller.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/MessageDispatchMarshaller.cs index a451bec833..60999b1e21 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/MessageDispatchMarshaller.cs +++ b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/MessageDispatchMarshaller.cs @@ -19,8 +19,8 @@ using System; using System.Collections; using System.IO; +using ActiveMQ.Commands; using ActiveMQ.OpenWire; -using ActiveMQ.OpenWire.Commands; using ActiveMQ.OpenWire.V1; namespace ActiveMQ.OpenWire.V1 diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/MessageDispatchNotificationMarshaller.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/MessageDispatchNotificationMarshaller.cs index dbbfdde05a..871b2c2f6c 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/MessageDispatchNotificationMarshaller.cs +++ b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/MessageDispatchNotificationMarshaller.cs @@ -19,8 +19,8 @@ using System; using System.Collections; using System.IO; +using ActiveMQ.Commands; using ActiveMQ.OpenWire; -using ActiveMQ.OpenWire.Commands; using ActiveMQ.OpenWire.V1; namespace ActiveMQ.OpenWire.V1 diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/MessageIdMarshaller.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/MessageIdMarshaller.cs index d858a4fc53..1d51e84ba5 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/MessageIdMarshaller.cs +++ b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/MessageIdMarshaller.cs @@ -19,8 +19,8 @@ using System; using System.Collections; using System.IO; +using ActiveMQ.Commands; using ActiveMQ.OpenWire; -using ActiveMQ.OpenWire.Commands; using ActiveMQ.OpenWire.V1; namespace ActiveMQ.OpenWire.V1 diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/MessageMarshaller.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/MessageMarshaller.cs index 0dd5df4114..1010e9ae2e 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/MessageMarshaller.cs +++ b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/MessageMarshaller.cs @@ -19,8 +19,8 @@ using System; using System.Collections; using System.IO; +using ActiveMQ.Commands; using ActiveMQ.OpenWire; -using ActiveMQ.OpenWire.Commands; using ActiveMQ.OpenWire.V1; namespace ActiveMQ.OpenWire.V1 diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ProducerIdMarshaller.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ProducerIdMarshaller.cs index d94f11c170..c1abd49eb2 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ProducerIdMarshaller.cs +++ b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ProducerIdMarshaller.cs @@ -19,8 +19,8 @@ using System; using System.Collections; using System.IO; +using ActiveMQ.Commands; using ActiveMQ.OpenWire; -using ActiveMQ.OpenWire.Commands; using ActiveMQ.OpenWire.V1; namespace ActiveMQ.OpenWire.V1 diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ProducerInfoMarshaller.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ProducerInfoMarshaller.cs index aee22c9250..50490bc727 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ProducerInfoMarshaller.cs +++ b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ProducerInfoMarshaller.cs @@ -19,8 +19,8 @@ using System; using System.Collections; using System.IO; +using ActiveMQ.Commands; using ActiveMQ.OpenWire; -using ActiveMQ.OpenWire.Commands; using ActiveMQ.OpenWire.V1; namespace ActiveMQ.OpenWire.V1 diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/RemoveInfoMarshaller.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/RemoveInfoMarshaller.cs index fce6cdd891..85b4cd683c 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/RemoveInfoMarshaller.cs +++ b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/RemoveInfoMarshaller.cs @@ -19,8 +19,8 @@ using System; using System.Collections; using System.IO; +using ActiveMQ.Commands; using ActiveMQ.OpenWire; -using ActiveMQ.OpenWire.Commands; using ActiveMQ.OpenWire.V1; namespace ActiveMQ.OpenWire.V1 diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/RemoveSubscriptionInfoMarshaller.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/RemoveSubscriptionInfoMarshaller.cs index 7481c7b797..8cd9898c73 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/RemoveSubscriptionInfoMarshaller.cs +++ b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/RemoveSubscriptionInfoMarshaller.cs @@ -19,8 +19,8 @@ using System; using System.Collections; using System.IO; +using ActiveMQ.Commands; using ActiveMQ.OpenWire; -using ActiveMQ.OpenWire.Commands; using ActiveMQ.OpenWire.V1; namespace ActiveMQ.OpenWire.V1 diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ResponseMarshaller.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ResponseMarshaller.cs index 2941f139f8..095db8929c 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ResponseMarshaller.cs +++ b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ResponseMarshaller.cs @@ -19,8 +19,8 @@ using System; using System.Collections; using System.IO; +using ActiveMQ.Commands; using ActiveMQ.OpenWire; -using ActiveMQ.OpenWire.Commands; using ActiveMQ.OpenWire.V1; namespace ActiveMQ.OpenWire.V1 diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/SessionIdMarshaller.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/SessionIdMarshaller.cs index 4805352d3f..42cf9da937 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/SessionIdMarshaller.cs +++ b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/SessionIdMarshaller.cs @@ -19,8 +19,8 @@ using System; using System.Collections; using System.IO; +using ActiveMQ.Commands; using ActiveMQ.OpenWire; -using ActiveMQ.OpenWire.Commands; using ActiveMQ.OpenWire.V1; namespace ActiveMQ.OpenWire.V1 diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/SessionInfoMarshaller.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/SessionInfoMarshaller.cs index 86e47b1382..bc734c407b 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/SessionInfoMarshaller.cs +++ b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/SessionInfoMarshaller.cs @@ -19,8 +19,8 @@ using System; using System.Collections; using System.IO; +using ActiveMQ.Commands; using ActiveMQ.OpenWire; -using ActiveMQ.OpenWire.Commands; using ActiveMQ.OpenWire.V1; namespace ActiveMQ.OpenWire.V1 diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ShutdownInfoMarshaller.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ShutdownInfoMarshaller.cs index caf2ddc662..0d37c92b93 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ShutdownInfoMarshaller.cs +++ b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ShutdownInfoMarshaller.cs @@ -19,8 +19,8 @@ using System; using System.Collections; using System.IO; +using ActiveMQ.Commands; using ActiveMQ.OpenWire; -using ActiveMQ.OpenWire.Commands; using ActiveMQ.OpenWire.V1; namespace ActiveMQ.OpenWire.V1 diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/SubscriptionInfoMarshaller.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/SubscriptionInfoMarshaller.cs index 2ae58a18ef..dca2689351 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/SubscriptionInfoMarshaller.cs +++ b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/SubscriptionInfoMarshaller.cs @@ -19,8 +19,8 @@ using System; using System.Collections; using System.IO; +using ActiveMQ.Commands; using ActiveMQ.OpenWire; -using ActiveMQ.OpenWire.Commands; using ActiveMQ.OpenWire.V1; namespace ActiveMQ.OpenWire.V1 diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/TransactionIdMarshaller.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/TransactionIdMarshaller.cs index b048cbee6a..a9b792b06e 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/TransactionIdMarshaller.cs +++ b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/TransactionIdMarshaller.cs @@ -19,8 +19,8 @@ using System; using System.Collections; using System.IO; +using ActiveMQ.Commands; using ActiveMQ.OpenWire; -using ActiveMQ.OpenWire.Commands; using ActiveMQ.OpenWire.V1; namespace ActiveMQ.OpenWire.V1 diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/TransactionInfoMarshaller.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/TransactionInfoMarshaller.cs index 66995698b7..4861a41784 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/TransactionInfoMarshaller.cs +++ b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/TransactionInfoMarshaller.cs @@ -19,8 +19,8 @@ using System; using System.Collections; using System.IO; +using ActiveMQ.Commands; using ActiveMQ.OpenWire; -using ActiveMQ.OpenWire.Commands; using ActiveMQ.OpenWire.V1; namespace ActiveMQ.OpenWire.V1 diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/WireFormatInfoMarshaller.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/WireFormatInfoMarshaller.cs index d667662ab5..94b55721a3 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/WireFormatInfoMarshaller.cs +++ b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/WireFormatInfoMarshaller.cs @@ -19,8 +19,8 @@ using System; using System.Collections; using System.IO; +using ActiveMQ.Commands; using ActiveMQ.OpenWire; -using ActiveMQ.OpenWire.Commands; using ActiveMQ.OpenWire.V1; namespace ActiveMQ.OpenWire.V1 diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/XATransactionIdMarshaller.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/XATransactionIdMarshaller.cs index 8892237353..9332521464 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/XATransactionIdMarshaller.cs +++ b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/XATransactionIdMarshaller.cs @@ -19,8 +19,8 @@ using System; using System.Collections; using System.IO; +using ActiveMQ.Commands; using ActiveMQ.OpenWire; -using ActiveMQ.OpenWire.Commands; using ActiveMQ.OpenWire.V1; namespace ActiveMQ.OpenWire.V1 diff --git a/openwire-dotnet/src/ActiveMQ/Session.cs b/openwire-dotnet/src/ActiveMQ/Session.cs index f558cc032d..37e5933223 100755 --- a/openwire-dotnet/src/ActiveMQ/Session.cs +++ b/openwire-dotnet/src/ActiveMQ/Session.cs @@ -14,12 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +using ActiveMQ.Commands; +using JMS; using System; using System.Collections; -using ActiveMQ.OpenWire; -using ActiveMQ.OpenWire.Commands; - namespace ActiveMQ { /// diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/TransactionContext.cs b/openwire-dotnet/src/ActiveMQ/TransactionContext.cs similarity index 89% rename from openwire-dotnet/src/ActiveMQ/OpenWire/TransactionContext.cs rename to openwire-dotnet/src/ActiveMQ/TransactionContext.cs index f3fb5c5283..dcf4943695 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/TransactionContext.cs +++ b/openwire-dotnet/src/ActiveMQ/TransactionContext.cs @@ -14,25 +14,29 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +using ActiveMQ.Commands; +using ActiveMQ.OpenWire; using System.Collections; -using System; -using ActiveMQ.OpenWire.Commands; -namespace ActiveMQ.OpenWire +namespace ActiveMQ { - public enum TransactionType + public enum TransactionType { Begin = 0, Prepare = 1, CommitOnePhase = 2, CommitTwoPhase = 3, Rollback = 4, Recover=5, Forget = 6, End = 7 } - - public class TransactionContext +} + +namespace ActiveMQ +{ + public class TransactionContext { private TransactionId transactionId; private Session session; private ArrayList synchronizations = new ArrayList(); - public TransactionContext(Session session) { + public TransactionContext(Session session) + { this.session = session; } @@ -78,7 +82,8 @@ namespace ActiveMQ.OpenWire session.Connection.OneWay(info); } - foreach (ISynchronization synchronization in synchronizations) { + foreach (ISynchronization synchronization in synchronizations) + { synchronization.AfterRollback(); } synchronizations.Clear(); @@ -86,7 +91,8 @@ namespace ActiveMQ.OpenWire public void Commit() { - foreach (ISynchronization synchronization in synchronizations) { + foreach (ISynchronization synchronization in synchronizations) + { synchronization.BeforeCommit(); } @@ -101,10 +107,12 @@ namespace ActiveMQ.OpenWire session.Connection.OneWay(info); } - foreach (ISynchronization synchronization in synchronizations) { + foreach (ISynchronization synchronization in synchronizations) + { synchronization.AfterCommit(); } synchronizations.Clear(); } } } + diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/ITransport.cs b/openwire-dotnet/src/ActiveMQ/Transport/ITransport.cs similarity index 67% rename from openwire-dotnet/src/ActiveMQ/OpenWire/ITransport.cs rename to openwire-dotnet/src/ActiveMQ/Transport/ITransport.cs index 83562a2ee6..f3bb4d84cb 100755 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/ITransport.cs +++ b/openwire-dotnet/src/ActiveMQ/Transport/ITransport.cs @@ -14,20 +14,28 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +using ActiveMQ.Commands; +using ActiveMQ.OpenWire; +using JMS; using System; -using ActiveMQ.OpenWire.Commands; -namespace ActiveMQ.OpenWire + +namespace ActiveMQ.Transport { - - public delegate void CommandHandler(ITransport sender, Command command); - public delegate void ExceptionHandler(ITransport sender, Exception command); - - /// - /// Represents the logical networking transport layer. - /// - public interface ITransport : IStartable, IDisposable + public delegate void CommandHandler(ITransport sender, Command command); +} +namespace ActiveMQ.Transport +{ + public delegate void ExceptionHandler(ITransport sender, Exception command); +} + +/// +/// Represents the logical networking transport layer. +/// +namespace ActiveMQ.Transport +{ + public interface ITransport : IStartable, IDisposable { void Oneway(Command command); @@ -39,3 +47,4 @@ namespace ActiveMQ.OpenWire event ExceptionHandler Exception; } } + diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/SocketTransport.cs b/openwire-dotnet/src/ActiveMQ/Transport/SocketTransport.cs similarity index 96% rename from openwire-dotnet/src/ActiveMQ/OpenWire/SocketTransport.cs rename to openwire-dotnet/src/ActiveMQ/Transport/SocketTransport.cs index 6a511182fd..0f941aa160 100755 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/SocketTransport.cs +++ b/openwire-dotnet/src/ActiveMQ/Transport/SocketTransport.cs @@ -14,23 +14,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +using ActiveMQ.Commands; +using ActiveMQ.OpenWire; using System; using System.Collections; using System.IO; using System.Net; using System.Net.Sockets; -using System.Text; using System.Threading; -using ActiveMQ.OpenWire.Commands; -namespace ActiveMQ.OpenWire + +/// +/// An implementation of ITransport that uses sockets to communicate with the broker +/// +namespace ActiveMQ.Transport { - - /// - /// An implementation of ITransport that uses sockets to communicate with the broker - /// - public class SocketTransport : ITransport + public class SocketTransport : ITransport { private readonly object transmissionLock = new object(); private Socket socket; @@ -223,3 +223,4 @@ namespace ActiveMQ.OpenWire } } + diff --git a/openwire-dotnet/src/ActiveMQ/IBytesMessage.cs b/openwire-dotnet/src/JMS/IBytesMessage.cs similarity index 79% rename from openwire-dotnet/src/ActiveMQ/IBytesMessage.cs rename to openwire-dotnet/src/JMS/IBytesMessage.cs index 7d74777d4d..d82c3dc123 100644 --- a/openwire-dotnet/src/ActiveMQ/IBytesMessage.cs +++ b/openwire-dotnet/src/JMS/IBytesMessage.cs @@ -13,15 +13,16 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. -*/ -using System; + */ +using JMS; -namespace ActiveMQ + +/// +/// Represents a binary based message +/// +namespace JMS { - /// - /// Represents a binary based message - /// - public interface IBytesMessage : IMessage + public interface IBytesMessage : IMessage { byte[] Content @@ -31,3 +32,4 @@ namespace ActiveMQ } } } + diff --git a/openwire-dotnet/src/ActiveMQ/IConnection.cs b/openwire-dotnet/src/JMS/IConnection.cs old mode 100755 new mode 100644 similarity index 83% rename from openwire-dotnet/src/ActiveMQ/IConnection.cs rename to openwire-dotnet/src/JMS/IConnection.cs index e7b3d91b37..067df43752 --- a/openwire-dotnet/src/ActiveMQ/IConnection.cs +++ b/openwire-dotnet/src/JMS/IConnection.cs @@ -1,61 +1,61 @@ -/* - * Copyright 2006 The Apache Software Foundation or its licensors, as - * applicable. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -using System; - -namespace ActiveMQ -{ - - public enum AcknowledgementMode - { - Unknown, AutoAcknowledge, ClientAcknowledge, Transactional - } - - - /// - /// Represents a connection with a message broker - /// - public interface IConnection : IDisposable, IStartable - { - - /// - /// Creates a new session to work on this connection - /// - ISession CreateSession(); - - /// - /// Creates a new session to work on this connection - /// - ISession CreateSession(AcknowledgementMode acknowledgementMode); - - - // Properties - - AcknowledgementMode AcknowledgementMode - { - get; - set; - } - - String ClientId - { - get; - set; - } - - - } -} +/* + * Copyright 2006 The Apache Software Foundation or its licensors, as + * applicable. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +using JMS; +using System; + +namespace JMS +{ + public enum AcknowledgementMode + { + Unknown, AutoAcknowledge, ClientAcknowledge, Transactional + } + + /// + /// Represents a connection with a message broker + /// + public interface IConnection : IDisposable, IStartable, IStoppable + { + + /// + /// Creates a new session to work on this connection + /// + ISession CreateSession(); + + /// + /// Creates a new session to work on this connection + /// + ISession CreateSession(AcknowledgementMode acknowledgementMode); + + + // Properties + + AcknowledgementMode AcknowledgementMode + { + get; + set; + } + + String ClientId + { + get; + set; + } + + + } +} + diff --git a/openwire-dotnet/src/ActiveMQ/IConnectionFactory.cs b/openwire-dotnet/src/JMS/IConnectionFactory.cs old mode 100755 new mode 100644 similarity index 54% rename from openwire-dotnet/src/ActiveMQ/IConnectionFactory.cs rename to openwire-dotnet/src/JMS/IConnectionFactory.cs index d887d90a3e..a322761b3b --- a/openwire-dotnet/src/ActiveMQ/IConnectionFactory.cs +++ b/openwire-dotnet/src/JMS/IConnectionFactory.cs @@ -1,37 +1,40 @@ -/* - * Copyright 2006 The Apache Software Foundation or its licensors, as - * applicable. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -using System; - -namespace ActiveMQ -{ - - /// - /// A Factory of IConnection objects - /// - public interface IConnectionFactory { - - /// - /// Creates a new connection - /// - IConnection CreateConnection(); - - /// - /// Creates a new connection with the given user name and password - /// - IConnection CreateConnection(string userName, string password); - } -} +/* + * Copyright 2006 The Apache Software Foundation or its licensors, as + * applicable. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +using JMS; + + + +/// +/// A Factory of IConnection objects +/// +namespace JMS +{ + public interface IConnectionFactory + { + + /// + /// Creates a new connection + /// + IConnection CreateConnection(); + + /// + /// Creates a new connection with the given user name and password + /// + IConnection CreateConnection(string userName, string password); + } +} + diff --git a/openwire-dotnet/src/ActiveMQ/IDestination.cs b/openwire-dotnet/src/JMS/IDestination.cs old mode 100755 new mode 100644 similarity index 79% rename from openwire-dotnet/src/ActiveMQ/IDestination.cs rename to openwire-dotnet/src/JMS/IDestination.cs index 753e1e3cfe..be1d188222 --- a/openwire-dotnet/src/ActiveMQ/IDestination.cs +++ b/openwire-dotnet/src/JMS/IDestination.cs @@ -1,26 +1,29 @@ -/* - * Copyright 2006 The Apache Software Foundation or its licensors, as - * applicable. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -using System; - -namespace ActiveMQ -{ - /// - /// Summary description for Destination. - /// - public interface IDestination { - } -} +/* + * Copyright 2006 The Apache Software Foundation or its licensors, as + * applicable. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + + + +/// +/// Summary description for Destination. +/// +namespace JMS +{ + public interface IDestination + { + } +} + diff --git a/openwire-dotnet/src/ActiveMQ/IMapMessage.cs b/openwire-dotnet/src/JMS/IMapMessage.cs similarity index 70% rename from openwire-dotnet/src/ActiveMQ/IMapMessage.cs rename to openwire-dotnet/src/JMS/IMapMessage.cs index 101662a02b..0523dccebb 100644 --- a/openwire-dotnet/src/ActiveMQ/IMapMessage.cs +++ b/openwire-dotnet/src/JMS/IMapMessage.cs @@ -13,20 +13,23 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. -*/ -using System; + */ +using JMS; -namespace ActiveMQ + +/// +/// Represents a Map message which contains key and value pairs which are +/// of primitive types +/// +namespace JMS { - /// - /// Represents a Map message which contains key and value pairs which are - /// of primitive types - /// - public interface IMapMessage : IMessage + public interface IMapMessage : IMessage { - IPrimitiveMap Body { + IPrimitiveMap Body + { get; } } } + diff --git a/openwire-dotnet/src/ActiveMQ/IMessage.cs b/openwire-dotnet/src/JMS/IMessage.cs old mode 100755 new mode 100644 similarity index 91% rename from openwire-dotnet/src/ActiveMQ/IMessage.cs rename to openwire-dotnet/src/JMS/IMessage.cs index f6b2ffad8f..6364485e67 --- a/openwire-dotnet/src/ActiveMQ/IMessage.cs +++ b/openwire-dotnet/src/JMS/IMessage.cs @@ -1,166 +1,169 @@ -/* - * Copyright 2006 The Apache Software Foundation or its licensors, as - * applicable. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -using System; - -namespace ActiveMQ -{ - /// - /// Represents a message either to be sent to a message broker or received from a message broker - /// - public interface IMessage - { - - /// - /// If using client acknowledgement mode on the session then this method will acknowledge that the - /// message has been processed correctly. - /// - void Acknowledge(); - - /// - /// Provides access to the message properties (headers) - /// - IPrimitiveMap Properties { - get; - } - - /// - /// The correlation ID used to correlate messages from conversations or long running business processes - /// - string JMSCorrelationID - { - get; - set; - } - - /// - /// The destination of the message - /// - IDestination JMSDestination - { - get; - } - - /// - /// The time in milliseconds that this message should expire in - /// - long JMSExpiration - { - get; - set; - } - - /// - /// The message ID which is set by the provider - /// - string JMSMessageId - { - get; - } - - /// - /// Whether or not this message is persistent - /// - bool JMSPersistent - { - get; - set; - } - - /// - /// The Priority on this message - /// - byte JMSPriority - { - get; - set; - } - - /// - /// Returns true if this message has been redelivered to this or another consumer before being acknowledged successfully. - /// - bool JMSRedelivered - { - get; - } - - - /// - /// The destination that the consumer of this message should send replies to - /// - IDestination JMSReplyTo - { - get; - set; - } - - - /// - /// The timestamp the broker added to the message - /// - long JMSTimestamp - { - get; - } - - /// - /// The type name of this message - /// - string JMSType - { - get; - set; - } - - - // JMS Extension headers - - /// - /// Returns the number of times this message has been redelivered to other consumers without being acknowledged successfully. - /// - int JMSXDeliveryCount - { - get; - } - - - /// - /// The Message Group ID used to group messages together to the same consumer for the same group ID value - /// - string JMSXGroupID - { - get; - set; - } - /// - /// The Message Group Sequence counter to indicate the position in a group - /// - int JMSXGroupSeq - { - get; - set; - } - - /// - /// Returns the ID of the producers transaction - /// - string JMSXProducerTXID - { - get; - } - - } -} +/* + * Copyright 2006 The Apache Software Foundation or its licensors, as + * applicable. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +using JMS; + + +/// +/// Represents a message either to be sent to a message broker or received from a message broker +/// +namespace JMS +{ + public interface IMessage + { + + /// + /// If using client acknowledgement mode on the session then this method will acknowledge that the + /// message has been processed correctly. + /// + void Acknowledge(); + + /// + /// Provides access to the message properties (headers) + /// + IPrimitiveMap Properties + { + get; + } + + /// + /// The correlation ID used to correlate messages from conversations or long running business processes + /// + string JMSCorrelationID + { + get; + set; + } + + /// + /// The destination of the message + /// + IDestination JMSDestination + { + get; + } + + /// + /// The time in milliseconds that this message should expire in + /// + long JMSExpiration + { + get; + set; + } + + /// + /// The message ID which is set by the provider + /// + string JMSMessageId + { + get; + } + + /// + /// Whether or not this message is persistent + /// + bool JMSPersistent + { + get; + set; + } + + /// + /// The Priority on this message + /// + byte JMSPriority + { + get; + set; + } + + /// + /// Returns true if this message has been redelivered to this or another consumer before being acknowledged successfully. + /// + bool JMSRedelivered + { + get; + } + + + /// + /// The destination that the consumer of this message should send replies to + /// + IDestination JMSReplyTo + { + get; + set; + } + + + /// + /// The timestamp the broker added to the message + /// + long JMSTimestamp + { + get; + } + + /// + /// The type name of this message + /// + string JMSType + { + get; + set; + } + + + // JMS Extension headers + + /// + /// Returns the number of times this message has been redelivered to other consumers without being acknowledged successfully. + /// + int JMSXDeliveryCount + { + get; + } + + + /// + /// The Message Group ID used to group messages together to the same consumer for the same group ID value + /// + string JMSXGroupID + { + get; + set; + } + /// + /// The Message Group Sequence counter to indicate the position in a group + /// + int JMSXGroupSeq + { + get; + set; + } + + /// + /// Returns the ID of the producers transaction + /// + string JMSXProducerTXID + { + get; + } + + } +} + diff --git a/openwire-dotnet/src/ActiveMQ/IMessageConsumer.cs b/openwire-dotnet/src/JMS/IMessageConsumer.cs old mode 100755 new mode 100644 similarity index 84% rename from openwire-dotnet/src/ActiveMQ/IMessageConsumer.cs rename to openwire-dotnet/src/JMS/IMessageConsumer.cs index 874a51480b..bb45c35508 --- a/openwire-dotnet/src/ActiveMQ/IMessageConsumer.cs +++ b/openwire-dotnet/src/JMS/IMessageConsumer.cs @@ -1,49 +1,55 @@ -/* - * Copyright 2006 The Apache Software Foundation or its licensors, as - * applicable. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -using System; - -namespace ActiveMQ -{ - public delegate void MessageListener(IMessage message); - - /// - /// A consumer of messages - /// - public interface IMessageConsumer : IDisposable - { - - /// - /// Waits until a message is available and returns it - /// - IMessage Receive(); - - /// - /// If a message is available within the timeout duration it is returned otherwise this method returns null - /// - IMessage Receive(int timeout); - - /// - /// If a message is available immediately it is returned otherwise this method returns null - /// - IMessage ReceiveNoWait(); - - /// - /// An asynchronous listener which can be used to consume messages asynchronously - /// - event MessageListener Listener; - } -} +/* + * Copyright 2006 The Apache Software Foundation or its licensors, as + * applicable. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +using JMS; +using System; + + +namespace JMS +{ + public delegate void MessageListener(IMessage message); +} + +/// +/// A consumer of messages +/// +namespace JMS +{ + public interface IMessageConsumer : IDisposable + { + + /// + /// Waits until a message is available and returns it + /// + IMessage Receive(); + + /// + /// If a message is available within the timeout duration it is returned otherwise this method returns null + /// + IMessage Receive(int timeout); + + /// + /// If a message is available immediately it is returned otherwise this method returns null + /// + IMessage ReceiveNoWait(); + + /// + /// An asynchronous listener which can be used to consume messages asynchronously + /// + event MessageListener Listener; + } +} + diff --git a/openwire-dotnet/src/ActiveMQ/IMessageProducer.cs b/openwire-dotnet/src/JMS/IMessageProducer.cs old mode 100755 new mode 100644 similarity index 82% rename from openwire-dotnet/src/ActiveMQ/IMessageProducer.cs rename to openwire-dotnet/src/JMS/IMessageProducer.cs index 965635246e..197cf7170b --- a/openwire-dotnet/src/ActiveMQ/IMessageProducer.cs +++ b/openwire-dotnet/src/JMS/IMessageProducer.cs @@ -1,67 +1,71 @@ -/* - * Copyright 2006 The Apache Software Foundation or its licensors, as - * applicable. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -using System; - -namespace ActiveMQ -{ - /// - /// An object capable of sending messages to some destination - /// - public interface IMessageProducer : IDisposable { - - /// - /// Sends the message to the default destination for this producer - /// - void Send(IMessage message); - - /// - /// Sends the message to the given destination - /// - void Send(IDestination destination, IMessage message); - - bool Persistent - { - get; - set; - } - - long TimeToLive - { - get; - set; - } - - int Priority - { - get; - set; - } - - bool DisableMessageID - { - get; - set; - } - - bool DisableMessageTimestamp - { - get; - set; - } - - } -} +/* + * Copyright 2006 The Apache Software Foundation or its licensors, as + * applicable. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +using JMS; +using System; + + +/// +/// An object capable of sending messages to some destination +/// +namespace JMS +{ + public interface IMessageProducer : IDisposable + { + + /// + /// Sends the message to the default destination for this producer + /// + void Send(IMessage message); + + /// + /// Sends the message to the given destination + /// + void Send(IDestination destination, IMessage message); + + bool Persistent + { + get; + set; + } + + long TimeToLive + { + get; + set; + } + + int Priority + { + get; + set; + } + + bool DisableMessageID + { + get; + set; + } + + bool DisableMessageTimestamp + { + get; + set; + } + + } +} + diff --git a/openwire-dotnet/src/ActiveMQ/IPrimitiveMap.cs b/openwire-dotnet/src/JMS/IPrimitiveMap.cs similarity index 85% rename from openwire-dotnet/src/ActiveMQ/IPrimitiveMap.cs rename to openwire-dotnet/src/JMS/IPrimitiveMap.cs index 08df96400e..44b75df49a 100644 --- a/openwire-dotnet/src/ActiveMQ/IPrimitiveMap.cs +++ b/openwire-dotnet/src/JMS/IPrimitiveMap.cs @@ -13,17 +13,17 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. -*/ -using System; + */ using System.Collections; -namespace ActiveMQ + +/// +/// Represents a Map of primitive types where the keys are all string instances +/// and the values are strings or numbers. +/// +namespace JMS { - /// - /// Represents a Map of primitive types where the keys are all string instances - /// and the values are strings or numbers. - /// - public interface IPrimitiveMap + public interface IPrimitiveMap { void Clear(); @@ -82,3 +82,4 @@ namespace ActiveMQ } } + diff --git a/openwire-dotnet/src/ActiveMQ/IQueue.cs b/openwire-dotnet/src/JMS/IQueue.cs old mode 100755 new mode 100644 similarity index 73% rename from openwire-dotnet/src/ActiveMQ/IQueue.cs rename to openwire-dotnet/src/JMS/IQueue.cs index 96411e7f40..facd8305d8 --- a/openwire-dotnet/src/ActiveMQ/IQueue.cs +++ b/openwire-dotnet/src/JMS/IQueue.cs @@ -1,30 +1,35 @@ -/* - * Copyright 2006 The Apache Software Foundation or its licensors, as - * applicable. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -using System; - -namespace ActiveMQ -{ - /// - /// Summary description for IQueue. - /// - public interface IQueue : IDestination { - - String QueueName { - get; - } - } -} +/* + * Copyright 2006 The Apache Software Foundation or its licensors, as + * applicable. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +using JMS; +using System; + + +/// +/// Summary description for IQueue. +/// +namespace JMS +{ + public interface IQueue : IDestination + { + + String QueueName + { + get; + } + } +} + diff --git a/openwire-dotnet/src/ActiveMQ/ISession.cs b/openwire-dotnet/src/JMS/ISession.cs old mode 100755 new mode 100644 similarity index 91% rename from openwire-dotnet/src/ActiveMQ/ISession.cs rename to openwire-dotnet/src/JMS/ISession.cs index 9ea947fa82..73978225f9 --- a/openwire-dotnet/src/ActiveMQ/ISession.cs +++ b/openwire-dotnet/src/JMS/ISession.cs @@ -1,123 +1,126 @@ -/* - * Copyright 2006 The Apache Software Foundation or its licensors, as - * applicable. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -using System; - -namespace ActiveMQ -{ - /// - /// Represents a single unit of work on an IConnection. - /// So the ISession can be used to perform transactional receive and sends - /// - public interface ISession : IDisposable - { - - /// - /// Creates a producer of messages - /// - IMessageProducer CreateProducer(); - - /// - /// Creates a producer of messages on a given destination - /// - IMessageProducer CreateProducer(IDestination destination); - - /// - /// Creates a consumer of messages on a given destination - /// - IMessageConsumer CreateConsumer(IDestination destination); - - /// - /// Creates a consumer of messages on a given destination with a selector - /// - IMessageConsumer CreateConsumer(IDestination destination, string selector); - - /// - /// Creates a named durable consumer of messages on a given destination with a selector - /// - IMessageConsumer CreateDurableConsumer(ITopic destination, string name, string selector, bool noLocal); - - /// - /// Returns the queue for the given name - /// - IQueue GetQueue(string name); - - /// - /// Returns the topic for the given name - /// - ITopic GetTopic(string name); - - - /// - /// Creates a temporary queue - /// - ITemporaryQueue CreateTemporaryQueue(); - - /// - /// Creates a temporary topic - /// - ITemporaryTopic CreateTemporaryTopic(); - - - // Factory methods to create messages - - /// - /// Creates a new message with an empty body - /// - IMessage CreateMessage(); - - /// - /// Creates a new text message with an empty body - /// - ITextMessage CreateTextMessage(); - - /// - /// Creates a new text message with the given body - /// - ITextMessage CreateTextMessage(string text); - - /// - /// Creates a new Map message which contains primitive key and value pairs - /// - IMapMessage CreateMapMessage(); - - /// - /// Creates a new binary message - /// - IBytesMessage CreateBytesMessage(); - - /// - /// Creates a new binary message with the given body - /// - IBytesMessage CreateBytesMessage(byte[] body); - - - // Transaction methods - - /// - /// If this is a transactional session then commit all message - /// send and acknowledgements for producers and consumers in this session - /// - void Commit(); - - /// - /// If this is a transactional session then rollback all message - /// send and acknowledgements for producers and consumers in this session - /// - void Rollback(); - - } -} +/* + * Copyright 2006 The Apache Software Foundation or its licensors, as + * applicable. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +using JMS; +using System; + + +/// +/// Represents a single unit of work on an IConnection. +/// So the ISession can be used to perform transactional receive and sends +/// +namespace JMS +{ + public interface ISession : IDisposable + { + + /// + /// Creates a producer of messages + /// + IMessageProducer CreateProducer(); + + /// + /// Creates a producer of messages on a given destination + /// + IMessageProducer CreateProducer(IDestination destination); + + /// + /// Creates a consumer of messages on a given destination + /// + IMessageConsumer CreateConsumer(IDestination destination); + + /// + /// Creates a consumer of messages on a given destination with a selector + /// + IMessageConsumer CreateConsumer(IDestination destination, string selector); + + /// + /// Creates a named durable consumer of messages on a given destination with a selector + /// + IMessageConsumer CreateDurableConsumer(ITopic destination, string name, string selector, bool noLocal); + + /// + /// Returns the queue for the given name + /// + IQueue GetQueue(string name); + + /// + /// Returns the topic for the given name + /// + ITopic GetTopic(string name); + + + /// + /// Creates a temporary queue + /// + ITemporaryQueue CreateTemporaryQueue(); + + /// + /// Creates a temporary topic + /// + ITemporaryTopic CreateTemporaryTopic(); + + + // Factory methods to create messages + + /// + /// Creates a new message with an empty body + /// + IMessage CreateMessage(); + + /// + /// Creates a new text message with an empty body + /// + ITextMessage CreateTextMessage(); + + /// + /// Creates a new text message with the given body + /// + ITextMessage CreateTextMessage(string text); + + /// + /// Creates a new Map message which contains primitive key and value pairs + /// + IMapMessage CreateMapMessage(); + + /// + /// Creates a new binary message + /// + IBytesMessage CreateBytesMessage(); + + /// + /// Creates a new binary message with the given body + /// + IBytesMessage CreateBytesMessage(byte[] body); + + + // Transaction methods + + /// + /// If this is a transactional session then commit all message + /// send and acknowledgements for producers and consumers in this session + /// + void Commit(); + + /// + /// If this is a transactional session then rollback all message + /// send and acknowledgements for producers and consumers in this session + /// + void Rollback(); + + } +} + diff --git a/openwire-dotnet/src/ActiveMQ/IStartable.cs b/openwire-dotnet/src/JMS/IStartable.cs similarity index 90% rename from openwire-dotnet/src/ActiveMQ/IStartable.cs rename to openwire-dotnet/src/JMS/IStartable.cs index 313d6e4cab..57628cb0c5 100644 --- a/openwire-dotnet/src/ActiveMQ/IStartable.cs +++ b/openwire-dotnet/src/JMS/IStartable.cs @@ -14,10 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -namespace ActiveMQ + +namespace JMS { - public interface IStartable + public interface IStartable { void Start(); } } + diff --git a/openwire-dotnet/src/JMS/IStoppable.cs b/openwire-dotnet/src/JMS/IStoppable.cs new file mode 100644 index 0000000000..d86b29d39b --- /dev/null +++ b/openwire-dotnet/src/JMS/IStoppable.cs @@ -0,0 +1,23 @@ +/* + * Copyright 2006 The Apache Software Foundation or its licensors, as + * applicable. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +namespace JMS +{ + public interface IStoppable + { + void Stop(); + } +} diff --git a/openwire-dotnet/src/ActiveMQ/ITemporaryQueue.cs b/openwire-dotnet/src/JMS/ITemporaryQueue.cs old mode 100755 new mode 100644 similarity index 77% rename from openwire-dotnet/src/ActiveMQ/ITemporaryQueue.cs rename to openwire-dotnet/src/JMS/ITemporaryQueue.cs index dfc5dc3eb2..ca08c4323e --- a/openwire-dotnet/src/ActiveMQ/ITemporaryQueue.cs +++ b/openwire-dotnet/src/JMS/ITemporaryQueue.cs @@ -1,26 +1,29 @@ -/* - * Copyright 2006 The Apache Software Foundation or its licensors, as - * applicable. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -using System; - -namespace ActiveMQ -{ - /// - /// Summary description for ITemporaryQueue. - /// - public interface ITemporaryQueue : IDestination { - } -} +/* + * Copyright 2006 The Apache Software Foundation or its licensors, as + * applicable. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +using JMS; + + +/// +/// Summary description for ITemporaryQueue. +/// +namespace JMS +{ + public interface ITemporaryQueue : IDestination + { + } +} + diff --git a/openwire-dotnet/src/ActiveMQ/ITemporaryTopic.cs b/openwire-dotnet/src/JMS/ITemporaryTopic.cs old mode 100755 new mode 100644 similarity index 77% rename from openwire-dotnet/src/ActiveMQ/ITemporaryTopic.cs rename to openwire-dotnet/src/JMS/ITemporaryTopic.cs index 24ccdfcb46..b0e7b4f83a --- a/openwire-dotnet/src/ActiveMQ/ITemporaryTopic.cs +++ b/openwire-dotnet/src/JMS/ITemporaryTopic.cs @@ -1,26 +1,29 @@ -/* - * Copyright 2006 The Apache Software Foundation or its licensors, as - * applicable. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -using System; - -namespace ActiveMQ -{ - /// - /// Summary description for TemporaryTopic. - /// - public interface ITemporaryTopic : IDestination { - } -} +/* + * Copyright 2006 The Apache Software Foundation or its licensors, as + * applicable. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +using JMS; + + +/// +/// Summary description for TemporaryTopic. +/// +namespace JMS +{ + public interface ITemporaryTopic : IDestination + { + } +} + diff --git a/openwire-dotnet/src/ActiveMQ/ITextMessage.cs b/openwire-dotnet/src/JMS/ITextMessage.cs old mode 100755 new mode 100644 similarity index 81% rename from openwire-dotnet/src/ActiveMQ/ITextMessage.cs rename to openwire-dotnet/src/JMS/ITextMessage.cs index 75205e7492..886ed8cd4b --- a/openwire-dotnet/src/ActiveMQ/ITextMessage.cs +++ b/openwire-dotnet/src/JMS/ITextMessage.cs @@ -1,33 +1,35 @@ -/* - * Copyright 2006 The Apache Software Foundation or its licensors, as - * applicable. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -using System; - -namespace ActiveMQ -{ - /// - /// Represents a text based message - /// - public interface ITextMessage : IMessage - { - - string Text - { - get; - set; - } - } -} +/* + * Copyright 2006 The Apache Software Foundation or its licensors, as + * applicable. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +using JMS; + + +/// +/// Represents a text based message +/// +namespace JMS +{ + public interface ITextMessage : IMessage + { + + string Text + { + get; + set; + } + } +} + diff --git a/openwire-dotnet/src/ActiveMQ/ITopic.cs b/openwire-dotnet/src/JMS/ITopic.cs old mode 100755 new mode 100644 similarity index 73% rename from openwire-dotnet/src/ActiveMQ/ITopic.cs rename to openwire-dotnet/src/JMS/ITopic.cs index 18ff94f39d..cd72fcc90e --- a/openwire-dotnet/src/ActiveMQ/ITopic.cs +++ b/openwire-dotnet/src/JMS/ITopic.cs @@ -1,30 +1,35 @@ -/* - * Copyright 2006 The Apache Software Foundation or its licensors, as - * applicable. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -using System; - -namespace ActiveMQ -{ - /// - /// Summary description for ITopic. - /// - public interface ITopic : IDestination { - - String TopicName { - get; - } - } -} +/* + * Copyright 2006 The Apache Software Foundation or its licensors, as + * applicable. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +using JMS; +using System; + + +/// +/// Summary description for ITopic. +/// +namespace JMS +{ + public interface ITopic : IDestination + { + + String TopicName + { + get; + } + } +} + diff --git a/openwire-dotnet/src/src.csproj b/openwire-dotnet/src/src.csproj index 36a12a3d03..4a724cec21 100644 --- a/openwire-dotnet/src/src.csproj +++ b/openwire-dotnet/src/src.csproj @@ -34,27 +34,63 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - @@ -62,70 +98,15 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -182,5 +163,25 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/openwire-dotnet/tests/ActiveMQ/AsyncConsumeTest.cs b/openwire-dotnet/tests/ActiveMQ/AsyncConsumeTest.cs deleted file mode 100644 index c90b06d78d..0000000000 --- a/openwire-dotnet/tests/ActiveMQ/AsyncConsumeTest.cs +++ /dev/null @@ -1,91 +0,0 @@ -/* - * Copyright 2006 The Apache Software Foundation or its licensors, as - * applicable. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. -*/ -using System; -using System.IO; -using System.Threading; - -using NUnit.Framework; - -namespace ActiveMQ -{ - [TestFixture] - public class AsyncConsumeTest : TestSupport - { - protected Object semaphore = new Object(); - protected bool received; - - [Test] - public void TestAsynchronousConsume() - { - IConnectionFactory factory = new ConnectionFactory("localhost", 61616); - Assert.IsTrue(factory != null, "no factory created"); - - using (IConnection connection = factory.CreateConnection()) - { - Assert.IsTrue(connection != null, "no connection created"); - Console.WriteLine("Connected to ActiveMQ!"); - - ISession session = connection.CreateSession(); - IDestination destination = CreateDestination(session); - Assert.IsTrue(destination != null, "No queue available!"); - - // lets create an async consumer - // START SNIPPET: demo - IMessageConsumer consumer = session.CreateConsumer(destination); - consumer.Listener += new MessageListener(OnMessage); - // END SNIPPET: demo - - - // now lets send a message - session = connection.CreateSession(); - IMessageProducer producer = session.CreateProducer(destination); - IMessage request = CreateMessage(session); - request.JMSCorrelationID = "abc"; - request.JMSType = "Test"; - producer.Send(request); - - - WaitForMessageToArrive(); - } - - } - - protected void OnMessage(IMessage message) - { - Console.WriteLine("Received message: " + message); - lock (semaphore) - { - received = true; - Monitor.PulseAll(semaphore); - } - - } - - protected void WaitForMessageToArrive() - { - lock (semaphore) - { - if (!received) - { - Monitor.Wait(semaphore, 10000); - } - } - Assert.AreEqual(true, received, "Should have received a message by now!"); - } - - } -} diff --git a/openwire-dotnet/tests/ActiveMQ/BadConsumeTest.cs b/openwire-dotnet/tests/ActiveMQ/BadConsumeTest.cs deleted file mode 100644 index 3f4b3d22d1..0000000000 --- a/openwire-dotnet/tests/ActiveMQ/BadConsumeTest.cs +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright 2006 The Apache Software Foundation or its licensors, as - * applicable. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. -*/ -using NUnit.Framework; -using System; - -namespace ActiveMQ -{ - [TestFixture] - public class BadConsumeTest : TestSupport - { - [Test] - public void TestBadConsumeOperationToTestExceptions() - { - IConnectionFactory factory = new ConnectionFactory("localhost", 61616); - using (IConnection connection = factory.CreateConnection()) - { - ISession session = connection.CreateSession(); - - try - { - IMessageConsumer consumer = session.CreateConsumer(null); - Console.WriteLine("Created consumer: " + consumer); - - Assert.Fail("Should have thrown an exception!"); - } - catch (BrokerException e) - { - Console.WriteLine("Caught expected exception: " + e); - Console.WriteLine("Stack: " + e.StackTrace); - Console.WriteLine("Java Stack: " + e.JavaStackTrace); - } - } - } - } -} diff --git a/openwire-dotnet/tests/ActiveMQ/CommandTest.cs b/openwire-dotnet/tests/ActiveMQ/Commands/CommandTest.cs similarity index 92% rename from openwire-dotnet/tests/ActiveMQ/CommandTest.cs rename to openwire-dotnet/tests/ActiveMQ/Commands/CommandTest.cs index bf73d1c3ea..7bb6f6e350 100644 --- a/openwire-dotnet/tests/ActiveMQ/CommandTest.cs +++ b/openwire-dotnet/tests/ActiveMQ/Commands/CommandTest.cs @@ -14,15 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +using ActiveMQ.Commands; using NUnit.Framework; using System.Collections; -using ActiveMQ.OpenWire; -using ActiveMQ.OpenWire.Commands; -namespace ActiveMQ +namespace ActiveMQ.Commands { - [TestFixture] + [TestFixture] public class CommandTest { @@ -61,3 +60,4 @@ namespace ActiveMQ } } } + diff --git a/openwire-dotnet/tests/ActiveMQ/OpenWire/BooleanStreamTest.cs b/openwire-dotnet/tests/ActiveMQ/OpenWire/BooleanStreamTest.cs index 8c7814fd17..f38276a15f 100644 --- a/openwire-dotnet/tests/ActiveMQ/OpenWire/BooleanStreamTest.cs +++ b/openwire-dotnet/tests/ActiveMQ/OpenWire/BooleanStreamTest.cs @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +using JMS; +using NUnit.Framework; using System; using System.IO; -using NUnit.Framework; - namespace ActiveMQ.OpenWire { [TestFixture] - public class BooleanStreamTest : TestSupport + public class BooleanStreamTest { protected OpenWireFormat openWireformat; protected int endOfStreamMarker = 0x12345678; diff --git a/openwire-dotnet/tests/ActiveMQ/EndianTest.cs b/openwire-dotnet/tests/ActiveMQ/OpenWire/EndianTest.cs similarity index 93% rename from openwire-dotnet/tests/ActiveMQ/EndianTest.cs rename to openwire-dotnet/tests/ActiveMQ/OpenWire/EndianTest.cs index 85fb6b29ea..d19c9686eb 100644 --- a/openwire-dotnet/tests/ActiveMQ/EndianTest.cs +++ b/openwire-dotnet/tests/ActiveMQ/OpenWire/EndianTest.cs @@ -14,15 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +using ActiveMQ.OpenWire; using NUnit.Framework; using System; -using ActiveMQ.OpenWire; -using ActiveMQ.OpenWire.Commands; -namespace ActiveMQ +namespace ActiveMQ.OpenWire { - [TestFixture] + [TestFixture] public class EndianTest { @@ -76,3 +75,4 @@ namespace ActiveMQ } + diff --git a/openwire-dotnet/tests/ActiveMQ/TestMain.cs b/openwire-dotnet/tests/ActiveMQ/TestMain.cs index 47ba1c9a64..8d645ad830 100644 --- a/openwire-dotnet/tests/ActiveMQ/TestMain.cs +++ b/openwire-dotnet/tests/ActiveMQ/TestMain.cs @@ -14,11 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +using ActiveMQ.Commands; +using JMS; using System; -using System.IO; - -using ActiveMQ.OpenWire; -using ActiveMQ.OpenWire.Commands; namespace ActiveMQ { diff --git a/openwire-dotnet/tests/ActiveMQ/TestSupport.cs b/openwire-dotnet/tests/ActiveMQ/TestSupport.cs deleted file mode 100644 index 85c6616c9e..0000000000 --- a/openwire-dotnet/tests/ActiveMQ/TestSupport.cs +++ /dev/null @@ -1,95 +0,0 @@ -/* - * Copyright 2006 The Apache Software Foundation or its licensors, as - * applicable. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -using System; -using System.IO; - -using NUnit.Framework; - -namespace ActiveMQ -{ - - /// - /// useful base class for test cases - /// - [ TestFixture ] - public abstract class TestSupport - { - - public virtual void SendAndSyncReceive() - { - IConnectionFactory factory = new ConnectionFactory("localhost", 61616); - - Assert.IsTrue(factory != null, "no factory created"); - - using (IConnection connection = factory.CreateConnection()) - { - try - { - Assert.IsTrue(connection != null, "no connection created"); - Console.WriteLine("Connected to ActiveMQ!"); - - ISession session = connection.CreateSession(); - - IDestination destination = CreateDestination(session); - Assert.IsTrue(destination != null, "No queue available!"); - - IMessageConsumer consumer = session.CreateConsumer(destination); - - IMessageProducer producer = session.CreateProducer(destination); - - IMessage request = CreateMessage(session); - - producer.Send(request); - - IMessage message = consumer.Receive(); - Assert.IsNotNull(message, "No message returned!"); - - AssertValidMessage(message); - } - catch (Exception e) - { - Console.WriteLine("Caught: " + e); - } - } - } - - protected virtual IDestination CreateDestination(ISession session) - { - string name = CreateDestinationName(); - IDestination destination = session.GetQueue(name); - - Console.WriteLine("Using queue: " + destination); - return destination; - } - - protected virtual string CreateDestinationName() - { - string name = "Test.DotNet." + GetType().Name; - return name; - } - - protected virtual IMessage CreateMessage(ISession session) - { - return session.CreateMessage(); - } - - protected virtual void AssertValidMessage(IMessage message) - { - Assert.IsNotNull(message, "Null Message!"); - } - } -} diff --git a/openwire-dotnet/tests/JMS/AsyncConsumeTest.cs b/openwire-dotnet/tests/JMS/AsyncConsumeTest.cs new file mode 100644 index 0000000000..b5a7450085 --- /dev/null +++ b/openwire-dotnet/tests/JMS/AsyncConsumeTest.cs @@ -0,0 +1,89 @@ +/* + * Copyright 2006 The Apache Software Foundation or its licensors, as + * applicable. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +using JMS; +using NUnit.Framework; +using System; +using System.Threading; + + +namespace JMS +{ + [TestFixture] + public class AsyncConsumeTest : JMSTestSupport + { + protected Object semaphore = new Object(); + protected bool received; + + [SetUp] + virtual public void SetUp() + { + base.SetUp(); + } + + [TearDown] + virtual public void TearDown() + { + base.TearDown(); + } + + [Test] + public void TestAsynchronousConsume() + { + + // lets create an async consumer + // START SNIPPET: demo + IMessageConsumer consumer = session.CreateConsumer(this.Destination); + consumer.Listener += new MessageListener(OnMessage); + // END SNIPPET: demo + + // now lets send a message + IMessageProducer producer = CreateProducer(); + IMessage request = CreateMessage(); + request.JMSCorrelationID = "abc"; + request.JMSType = "Test"; + producer.Send(request); + + WaitForMessageToArrive(); + + } + + protected void OnMessage(IMessage message) + { + Console.WriteLine("Received message: " + message); + lock (semaphore) + { + received = true; + Monitor.PulseAll(semaphore); + } + + } + + protected void WaitForMessageToArrive() + { + lock (semaphore) + { + if (!received) + { + Monitor.Wait(semaphore, receiveTimeout); + } + Assert.AreEqual(true, received, "Should have received a message by now!"); + } + } + + } +} + diff --git a/openwire-dotnet/tests/JMS/BadConsumeTest.cs b/openwire-dotnet/tests/JMS/BadConsumeTest.cs new file mode 100644 index 0000000000..34f0acc61f --- /dev/null +++ b/openwire-dotnet/tests/JMS/BadConsumeTest.cs @@ -0,0 +1,56 @@ +/* + * Copyright 2006 The Apache Software Foundation or its licensors, as + * applicable. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +using JMS; +using NUnit.Framework; +using System; + + +namespace JMS +{ + [TestFixture] + public class BadConsumeTest : JMSTestSupport + { + [SetUp] + virtual public void SetUp() + { + base.SetUp(); + } + + [TearDown] + virtual public void TearDown() + { + base.TearDown(); + } + + [Test] + public void TestBadConsumeOperationToTestExceptions() + { + try + { + IMessageConsumer consumer = session.CreateConsumer(null); + Console.WriteLine("Created consumer: " + consumer); + Assert.Fail("Should have thrown an exception!"); + } + catch (Exception e) + { + Console.WriteLine("Caught expected exception: " + e); + Console.WriteLine("Stack: " + e.StackTrace); + } + } + } +} + diff --git a/openwire-dotnet/tests/ActiveMQ/BytesMessageTest.cs b/openwire-dotnet/tests/JMS/BytesMessageTest.cs similarity index 79% rename from openwire-dotnet/tests/ActiveMQ/BytesMessageTest.cs rename to openwire-dotnet/tests/JMS/BytesMessageTest.cs index 5c650d53e9..33a3965c36 100644 --- a/openwire-dotnet/tests/ActiveMQ/BytesMessageTest.cs +++ b/openwire-dotnet/tests/JMS/BytesMessageTest.cs @@ -13,26 +13,38 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. -*/ -using System; -using System.IO; - + */ +using JMS; using NUnit.Framework; +using System; -namespace ActiveMQ + +namespace JMS { - [ TestFixture ] - public class BytesMessageTest : TestSupport + [ TestFixture ] + public class BytesMessageTest : JMSTestSupport { byte[] expected = {1, 2, 3, 4, 5, 6, 7, 8}; - + + [SetUp] + virtual public void SetUp() + { + base.SetUp(); + } + + [TearDown] + virtual public void TearDown() + { + base.TearDown(); + } + [ Test ] public override void SendAndSyncReceive() { base.SendAndSyncReceive(); } - protected override IMessage CreateMessage(ISession session) + protected override IMessage CreateMessage() { IBytesMessage request = session.CreateBytesMessage(expected); return request; @@ -53,3 +65,4 @@ namespace ActiveMQ } } + diff --git a/openwire-dotnet/tests/ActiveMQ/ConsumerTest.cs b/openwire-dotnet/tests/JMS/ConsumerTest.cs similarity index 63% rename from openwire-dotnet/tests/ActiveMQ/ConsumerTest.cs rename to openwire-dotnet/tests/JMS/ConsumerTest.cs index cb13fa9380..bea81b7610 100755 --- a/openwire-dotnet/tests/ActiveMQ/ConsumerTest.cs +++ b/openwire-dotnet/tests/JMS/ConsumerTest.cs @@ -14,48 +14,49 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -using System; -using System.IO; - +using JMS; using NUnit.Framework; -namespace ActiveMQ + +namespace JMS { - [TestFixture] - public class ConsumerTest : TestSupport + [TestFixture] + public class ConsumerTest : JMSTestSupport { - IConnectionFactory factory; - IConnection connection; - IDestination destination; - - [SetUp] - protected void SetUp() + [SetUp] + virtual public void SetUp() { - factory = new ConnectionFactory("localhost", 61616); - connection = factory.CreateConnection(); + base.SetUp(); } - + [TearDown] - protected void TearDown() + virtual public void TearDown() { - connection.Dispose(); + base.TearDown(); } - + + protected override IConnection CreateConnection() + { + IConnection connection = base.CreateConnection(); + connection.ClientId = "test"; + return connection; + } + + protected override IDestination CreateDestination() + { + return session.GetTopic(CreateDestinationName()); + } + + [Test] [Ignore("Not fully implemented yet.")] public void testDurableConsumerSelectorChange() { - - // Receive a message with the JMS API - connection.ClientId="test"; - connection.Start(); - ISession session = connection.CreateSession(AcknowledgementMode.AutoAcknowledge); - destination = session.GetTopic("foo"); - IMessageProducer producer = session.CreateProducer(destination); + IMessageProducer producer = session.CreateProducer(Destination); producer.Persistent = true; - IMessageConsumer consumer = session.CreateDurableConsumer((ITopic)destination, "test", "color='red'", false); - + IMessageConsumer consumer = session.CreateDurableConsumer((ITopic)Destination, "test", "color='red'", false); + // Send the messages ITextMessage message = session.CreateTextMessage("1st"); //message.SetStringProperty("color", "red"); @@ -63,19 +64,19 @@ namespace ActiveMQ IMessage m = consumer.Receive(1000); Assert.IsNotNull(m); - Assert.AreEqual("1st", ((ITextMessage)m).Text ); - + Assert.AreEqual("1st", ((ITextMessage)m).Text); + // Change the subscription. consumer.Dispose(); - consumer = session.CreateDurableConsumer((ITopic)destination, "test", "color='blue'", false); + consumer = session.CreateDurableConsumer((ITopic)Destination, "test", "color='blue'", false); message = session.CreateTextMessage("2nd"); // message.setStringProperty("color", "red"); producer.Send(message); message = session.CreateTextMessage("3rd"); - // message.setStringProperty("color", "blue"); + // message.setStringProperty("color", "blue"); producer.Send(message); - + // Selector should skip the 2nd message. m = consumer.Receive(1000); Assert.IsNotNull(m); @@ -83,7 +84,8 @@ namespace ActiveMQ Assert.IsNull(consumer.ReceiveNoWait()); } - + } } + diff --git a/openwire-dotnet/tests/ActiveMQ/JMSPropertyTest.cs b/openwire-dotnet/tests/JMS/JMSPropertyTest.cs similarity index 91% rename from openwire-dotnet/tests/ActiveMQ/JMSPropertyTest.cs rename to openwire-dotnet/tests/JMS/JMSPropertyTest.cs index 03dad0d9e3..5e6a6e0c47 100644 --- a/openwire-dotnet/tests/ActiveMQ/JMSPropertyTest.cs +++ b/openwire-dotnet/tests/JMS/JMSPropertyTest.cs @@ -14,15 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -using System; -using System.IO; - +//using ActiveMQ; +using JMS; using NUnit.Framework; +using System; -namespace ActiveMQ + +namespace JMS { - [ TestFixture ] - public class JMSPropertyTest : TestSupport + [ TestFixture ] + public class JMSPropertyTest : JMSTestSupport { // standard JMS properties string expectedText = "Hey this works!"; @@ -43,13 +44,25 @@ namespace ActiveMQ long custom5 = 0x1234567812345678; char custom6 = 'J'; + [SetUp] + virtual public void SetUp() + { + base.SetUp(); + } + + [TearDown] + virtual public void TearDown() + { + base.TearDown(); + } + [ Test ] public override void SendAndSyncReceive() { base.SendAndSyncReceive(); } - protected override IMessage CreateMessage(ISession session) + protected override IMessage CreateMessage() { ITextMessage message = session.CreateTextMessage(expectedText); replyTo = session.CreateTemporaryQueue(); @@ -122,3 +135,4 @@ namespace ActiveMQ } } + diff --git a/openwire-dotnet/tests/JMS/JMSTestSupport.cs b/openwire-dotnet/tests/JMS/JMSTestSupport.cs new file mode 100644 index 0000000000..8f011319d1 --- /dev/null +++ b/openwire-dotnet/tests/JMS/JMSTestSupport.cs @@ -0,0 +1,174 @@ +/* + * Copyright 2006 The Apache Software Foundation or its licensors, as + * applicable. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +using JMS; +using NUnit.Framework; +using System; + +/// +/// useful base class for test cases +/// +namespace JMS +{ + [ TestFixture ] + public abstract class JMSTestSupport + { + + protected IConnectionFactory factory; + protected IConnection connection; + protected ISession session; + private IDestination destination; + protected int receiveTimeout = 1000; + protected AcknowledgementMode acknowledgementMode = AcknowledgementMode.ClientAcknowledge; + + [SetUp] + virtual public void SetUp() + { + Connect(); + } + + [TearDown] + virtual public void TearDown() + { + Disconnect(); + } + + + virtual protected void Connect() + { + Console.WriteLine("Connectting..."); + factory = CreateConnectionFactory(); + Assert.IsNotNull(factory, "no factory created"); + connection = CreateConnection(); + Assert.IsNotNull(connection, "no connection created"); + connection.Start(); + session = connection.CreateSession(acknowledgementMode); + Assert.IsNotNull(connection != null, "no session created"); + Console.WriteLine("Connected."); + } + + + virtual protected void Disconnect() + { + if (connection != null) + { + Console.WriteLine("Disconnectting..."); + connection.Dispose(); + connection = null; + Console.WriteLine("Disconnectted."); + } + } + + virtual protected void Reconnect() + { + Disconnect(); + Connect(); + } + + protected virtual void Drain() + { + using (ISession session = connection.CreateSession()) + { + // Tries to consume any messages on the Destination + IMessageConsumer consumer = session.CreateConsumer(Destination); + + // Should only need to wait for first message to arrive due to the way + // prefetching works. + IMessage msg = consumer.Receive(receiveTimeout); + while (msg!= null) + { + msg = consumer.ReceiveNoWait(); + } + } + } + + public virtual void SendAndSyncReceive() + { + using (ISession session = connection.CreateSession()) + { + + IMessageConsumer consumer = session.CreateConsumer(Destination); + IMessageProducer producer = session.CreateProducer(Destination); + + IMessage request = CreateMessage(); + producer.Send(request); + + IMessage message = consumer.Receive(receiveTimeout); + Assert.IsNotNull(message, "No message returned!"); + AssertValidMessage(message); + } + } + + protected virtual IConnectionFactory CreateConnectionFactory() { + return new ActiveMQ.ConnectionFactory("localhost", 61616); + } + + protected virtual IConnection CreateConnection() + { + return factory.CreateConnection(); + } + + protected virtual IMessageProducer CreateProducer() + { + IMessageProducer producer = session.CreateProducer(destination); + return producer; + } + + protected virtual IMessageConsumer CreateConsumer() + { + IMessageConsumer consumer = session.CreateConsumer(destination); + return consumer; + } + + protected virtual IDestination CreateDestination() + { + return session.GetQueue(CreateDestinationName()); + } + + protected virtual string CreateDestinationName() + { + return "Test.DotNet." + GetType().Name; + } + + protected virtual IMessage CreateMessage() + { + return session.CreateMessage(); + } + + protected virtual void AssertValidMessage(IMessage message) + { + Assert.IsNotNull(message, "Null Message!"); + } + + + public IDestination Destination + { + get { + if( destination == null ) { + destination = CreateDestination(); + Assert.IsNotNull(destination, "No destination available!"); + Console.WriteLine("Using destination: " + destination); + } + return destination; + } + set { + destination = value; + } + } + + } +} + diff --git a/openwire-dotnet/tests/ActiveMQ/MapMessageTest.cs b/openwire-dotnet/tests/JMS/MapMessageTest.cs similarity index 88% rename from openwire-dotnet/tests/ActiveMQ/MapMessageTest.cs rename to openwire-dotnet/tests/JMS/MapMessageTest.cs index 6092105975..3a385d0dc0 100644 --- a/openwire-dotnet/tests/ActiveMQ/MapMessageTest.cs +++ b/openwire-dotnet/tests/JMS/MapMessageTest.cs @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -using System; -using System.IO; - +using JMS; using NUnit.Framework; +using System; -namespace ActiveMQ + +namespace JMS { - [ TestFixture ] - public class MapMessageTest : TestSupport + [ TestFixture ] + public class MapMessageTest : JMSTestSupport { bool a = true; byte b = 123; @@ -32,13 +32,25 @@ namespace ActiveMQ long f = 0x1234567812345678; string g = "Hello World!"; + [SetUp] + virtual public void SetUp() + { + base.SetUp(); + } + + [TearDown] + virtual public void TearDown() + { + base.TearDown(); + } + [ Test ] public override void SendAndSyncReceive() { base.SendAndSyncReceive(); } - - protected override IMessage CreateMessage(ISession session) + + protected override IMessage CreateMessage() { IMapMessage message = session.CreateMapMessage(); @@ -60,7 +72,7 @@ namespace ActiveMQ Console.WriteLine("Received MapMessage: " + message); Console.WriteLine("Received Count: " + mapMessage.Body.Count); - + Assert.AreEqual(ToHex(f), ToHex(mapMessage.Body.GetLong("f")), "map entry: f as hex"); // use generic API to access entries @@ -90,3 +102,4 @@ namespace ActiveMQ } } } + diff --git a/openwire-dotnet/tests/ActiveMQ/ClientTest.cs b/openwire-dotnet/tests/JMS/TextMessage.cs similarity index 77% rename from openwire-dotnet/tests/ActiveMQ/ClientTest.cs rename to openwire-dotnet/tests/JMS/TextMessage.cs index edc6f5365d..217261fbed 100644 --- a/openwire-dotnet/tests/ActiveMQ/ClientTest.cs +++ b/openwire-dotnet/tests/JMS/TextMessage.cs @@ -1,51 +1,64 @@ -/* - * Copyright 2006 The Apache Software Foundation or its licensors, as - * applicable. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -using System; -using System.IO; - -using NUnit.Framework; - -namespace ActiveMQ -{ - [ TestFixture ] - public class ClientTest : TestSupport - { - string expected = "Hello World!"; - - [ Test ] - public override void SendAndSyncReceive() - { - base.SendAndSyncReceive(); - } - - protected override IMessage CreateMessage(ISession session) - { - IMessage request = session.CreateTextMessage(expected); - return request; - } - - protected override void AssertValidMessage(IMessage message) - { - ITextMessage textMessage = (ITextMessage) message; - String text = textMessage.Text; - Console.WriteLine("Received message with text: " + text); - Assert.AreEqual(expected, text, "the message text"); - } - - } -} - +/* + * Copyright 2006 The Apache Software Foundation or its licensors, as + * applicable. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +using JMS; +using NUnit.Framework; +using System; + + +namespace JMS +{ + [ TestFixture ] + public class TextMessage : JMSTestSupport + { + string expected = "Hello World!"; + + [SetUp] + virtual public void SetUp() + { + base.SetUp(); + } + + [TearDown] + virtual public void TearDown() + { + base.TearDown(); + } + + [ Test ] + public override void SendAndSyncReceive() + { + base.SendAndSyncReceive(); + } + + protected override IMessage CreateMessage() + { + IMessage request = session.CreateTextMessage(expected); + return request; + } + + protected override void AssertValidMessage(IMessage message) + { + ITextMessage textMessage = (ITextMessage) message; + String text = textMessage.Text; + Console.WriteLine("Received message with text: " + text); + Assert.AreEqual(expected, text, "the message text"); + } + + } +} + + diff --git a/openwire-dotnet/tests/ActiveMQ/TransactionTest.cs b/openwire-dotnet/tests/JMS/TransactionTest.cs similarity index 83% rename from openwire-dotnet/tests/ActiveMQ/TransactionTest.cs rename to openwire-dotnet/tests/JMS/TransactionTest.cs index 1f784fc2ec..06a60b0da8 100644 --- a/openwire-dotnet/tests/ActiveMQ/TransactionTest.cs +++ b/openwire-dotnet/tests/JMS/TransactionTest.cs @@ -14,45 +14,36 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -using System; -using System.IO; - +using JMS; using NUnit.Framework; +using System; using System.Collections; -namespace ActiveMQ +namespace JMS { - [TestFixture] - public class TransactionTest : TestSupport + [TestFixture] + public class TransactionTest : JMSTestSupport { private static int destinationCounter; - IDestination destination; - IConnection connection; - ISession session; IMessageProducer producer; IMessageConsumer consumer; [SetUp] - public void SetUp() + public override void SetUp() { - Connect(); - - // lets consume any outstanding messages from previous test runs - while (consumer.Receive(1000) != null) - { - } - session.Commit(); + acknowledgementMode = AcknowledgementMode.Transactional; + base.SetUp(); + Drain(); } - - - + [TearDown] - public void TearDown() + virtual public void TearDown() { - Disconnect(); + base.TearDown(); } - + + [Test] public void TestSendRollback() { @@ -248,40 +239,13 @@ namespace ActiveMQ Assert.AreEqual(expectedText, actualText, message); } - protected void Connect() + protected override void Connect() { - IConnectionFactory factory = new ConnectionFactory("localhost", 61616); - - connection = factory.CreateConnection(); - - session = connection.CreateSession(AcknowledgementMode.Transactional); - - // reuse the same destination if we reconnect - if (destination == null) - { - destination = CreateDestination(session); - } - - consumer = session.CreateConsumer(destination); - - producer = session.CreateProducer(destination); - } - - - protected void Disconnect() - { - if (connection != null) - { - connection.Dispose(); - connection = null; - } - } - - protected void Reconnect() - { - Disconnect(); - Connect(); + base.Connect(); + consumer = session.CreateConsumer(Destination); + producer = session.CreateProducer(Destination); } } } + diff --git a/openwire-dotnet/tests/tests.csproj b/openwire-dotnet/tests/tests.csproj index 429ef3d4d2..b7123cc091 100644 --- a/openwire-dotnet/tests/tests.csproj +++ b/openwire-dotnet/tests/tests.csproj @@ -41,18 +41,18 @@ - - - - - - - - - + + - - + + + + + + + + +