activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jstrac...@apache.org
Subject svn commit: r367566 [1/2] - in /incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core: ./ Commands/ IO/ Transport/
Date Tue, 10 Jan 2006 10:57:04 GMT
Author: jstrachan
Date: Tue Jan 10 02:56:34 2006
New Revision: 367566

URL: http://svn.apache.org/viewcvs?rev=367566&view=rev
Log:
latest generated OpenWire.Net code together with an early plugin for the transport

Added:
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Transport/
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Transport/FutureResponse.cs   (with props)
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Transport/Transport.cs   (with props)
Removed:
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/CommandConstants.cs
Modified:
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/AbstractCommand.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/AbstractCommandMarshaller.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/ActiveMQDestination.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/ActiveMQQueue.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/ActiveMQTempQueue.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/ActiveMQTempTopic.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/ActiveMQTopic.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Command.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/BaseCommand.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/BrokerId.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/BrokerInfo.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ConnectionError.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ConnectionId.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ConnectionInfo.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ConsumerId.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ConsumerInfo.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ControlCommand.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/DataArrayResponse.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/DataResponse.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/DestinationInfo.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/DiscoveryEvent.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ExceptionResponse.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/IntegerResponse.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/JournalQueueAck.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/JournalTopicAck.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/JournalTrace.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/JournalTransaction.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/LocalTransactionId.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/Message.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/MessageAck.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/MessageDispatch.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/MessageId.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ProducerId.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ProducerInfo.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/RemoveInfo.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/RemoveSubscriptionInfo.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/Response.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/SessionId.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/SessionInfo.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/SubscriptionInfo.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/TransactionInfo.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/WireFormatInfo.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/XATransactionId.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/DataStructure.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Destination.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/DestinationFilter.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/ProducerIdMarshaller.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Queue.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/TemporaryQueue.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/TemporaryTopic.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Topic.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/TransactionConstants.cs

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/AbstractCommand.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/AbstractCommand.cs?rev=367566&r1=367565&r2=367566&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/AbstractCommand.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/AbstractCommand.cs Tue Jan 10 02:56:34 2006
@@ -1,155 +1,82 @@
 using System;
+using OpenWire.Core;
+using OpenWire.Core.Commands;
 
-namespace OpenWire.Core
-{
-	/// <summary>
-	/// Summary description for AbstractCommand.
-	/// </summary>
-	public abstract class AbstractCommand : Command {
-		
-		//public const int 	NON_PERSISTENT = 	1;
-		//public const int 	PERSISTENT 	= 2;
-    
-		 /**
-		  * Message flag indexes (used for writing/reading to/from a Stream
-		  */
-		public const int RECEIPT_REQUIRED_INDEX = 0;
-		public const int BROKERS_VISITED_INDEX =1;
-		private short id = 0;
-		private  bool receiptRequired;
-
-		protected AbstractCommand()
-		{
-			
-		}
-		
-         public virtual byte GetCommandType()
-         {
-         	    return 0;
- 	    }
-
-		public short GetId() 
-		{
-			return this.id;
-		}
-
-		public virtual void SetId(short newId) 
-		{
-			this.id = newId;
-		}
-
-		public virtual bool IsReceiptRequired() 
-		{
-			return this.receiptRequired;
-		}
-
-		
-		public virtual bool IsReceipt() 
-		{
-			return false;
-		}
-
-		public void SetReceiptRequired(bool value) 
-		{
-			this.receiptRequired = value;
-		}
-
-		public virtual bool IsJMSMessage() 
-		{
-			return false;
-		}
-
-		public override int GetHashCode() 
-		{
-			return this.id;
-		}
-
-		public override String ToString() 
-		{
-			return GetCommandTypeAsString(GetCommandType()) + ": id = " + GetId();
-		}
-
-
-		public static String GetCommandTypeAsString(int type) 
-		{
-			String packetTypeStr = "";
-			switch (type) 
-			{
-				case CommandConstants.ACTIVEMQ_MESSAGE:
-					packetTypeStr = "ACTIVEMQ_MESSAGE";
-					break;
-				case CommandConstants.ACTIVEMQ_TEXT_MESSAGE:
-					packetTypeStr = "ACTIVEMQ_TEXT_MESSAGE";
-					break;
-				case CommandConstants.ACTIVEMQ_OBJECT_MESSAGE:
-					packetTypeStr = "ACTIVEMQ_OBJECT_MESSAGE";
-					break;
-				case CommandConstants.ACTIVEMQ_BYTES_MESSAGE:
-					packetTypeStr = "ACTIVEMQ_BYTES_MESSAGE";
-					break;
-				case CommandConstants.ACTIVEMQ_STREAM_MESSAGE:
-					packetTypeStr = "ACTIVEMQ_STREAM_MESSAGE";
-					break;
-				case CommandConstants.ACTIVEMQ_MAP_MESSAGE:
-					packetTypeStr = "ACTIVEMQ_MAP_MESSAGE";
-					break;
-				case CommandConstants.ACTIVEMQ_MSG_ACK:
-					packetTypeStr = "ACTIVEMQ_MSG_ACK";
-					break;
-				case CommandConstants.RECEIPT_INFO:
-					packetTypeStr = "RECEIPT_INFO";
-					break;
-				case CommandConstants.CONSUMER_INFO:
-					packetTypeStr = "CONSUMER_INFO";
-					break;
-				case CommandConstants.PRODUCER_INFO:
-					packetTypeStr = "PRODUCER_INFO";
-					break;
-				case CommandConstants.TRANSACTION_INFO:
-					packetTypeStr = "TRANSACTION_INFO";
-					break;
-				case CommandConstants.XA_TRANSACTION_INFO:
-					packetTypeStr = "XA_TRANSACTION_INFO";
-					break;
-				case CommandConstants.ACTIVEMQ_BROKER_INFO:
-					packetTypeStr = "ACTIVEMQ_BROKER_INFO";
-					break;
-				case CommandConstants.ACTIVEMQ_CONNECTION_INFO:
-					packetTypeStr = "ACTIVEMQ_CONNECTION_INFO";
-					break;
-				case CommandConstants.SESSION_INFO:
-					packetTypeStr = "SESSION_INFO";
-					break;
-				case CommandConstants.DURABLE_UNSUBSCRIBE:
-					packetTypeStr = "DURABLE_UNSUBSCRIBE";
-					break;
-				case CommandConstants.RESPONSE_RECEIPT_INFO:
-					packetTypeStr = "RESPONSE_RECEIPT_INFO";
-					break;
-				case CommandConstants.INT_RESPONSE_RECEIPT_INFO:
-					packetTypeStr = "INT_RESPONSE_RECEIPT_INFO";
-					break;
-				case CommandConstants.CAPACITY_INFO:
-					packetTypeStr = "CAPACITY_INFO";
-					break;
-				case CommandConstants.CAPACITY_INFO_REQUEST:
-					packetTypeStr = "CAPACITY_INFO_REQUEST";
-					break;
-				case CommandConstants.WIRE_FORMAT_INFO:
-					packetTypeStr = "WIRE_FORMAT_INFO";
-					break;
-				case CommandConstants.KEEP_ALIVE:
-					packetTypeStr = "KEEP_ALIVE";
-					break;
-				case CommandConstants.CACHED_VALUE_COMMAND:
-					packetTypeStr = "CachedValue";
-					break;
-				default :
-					packetTypeStr = "UNKNOWN PACKET TYPE: " + type;
-					break;
-			}
-			return packetTypeStr;
-		}
-	}
+namespace OpenWire.Core {
+        /// <summary>
+        /// Summary description for AbstractCommand.
+        /// </summary>
+        public abstract class AbstractCommand : Command {
+
+                protected AbstractCommand() {
+                }
+
+                public virtual byte GetCommandType() {
+                        return 0; 
+                }
+
+                public static String GetCommandTypeAsString(int type) {
+                        String packetTypeStr = "";
+                        switch (type) {
+                                case ActiveMQMessage.ID_ActiveMQMessage :
+                                        packetTypeStr = "ACTIVEMQ_MESSAGE";
+                                        break;
+                                case ActiveMQTextMessage.ID_ActiveMQTextMessage :
+                                        packetTypeStr = "ACTIVEMQ_TEXT_MESSAGE";
+                                        break;
+                                case ActiveMQObjectMessage.ID_ActiveMQObjectMessage:
+                                        packetTypeStr = "ACTIVEMQ_OBJECT_MESSAGE";
+                                        break;
+                                case ActiveMQBytesMessage.ID_ActiveMQBytesMessage :
+                                        packetTypeStr = "ACTIVEMQ_BYTES_MESSAGE";
+                                        break;
+                                case ActiveMQStreamMessage.ID_ActiveMQStreamMessage :
+                                        packetTypeStr = "ACTIVEMQ_STREAM_MESSAGE";
+                                        break;
+                                case ActiveMQMapMessage.ID_ActiveMQMapMessage :
+                                        packetTypeStr = "ACTIVEMQ_MAP_MESSAGE";
+                                        break;
+                                case MessageAck.ID_MessageAck :
+                                        packetTypeStr = "ACTIVEMQ_MSG_ACK";
+                                        break;
+                                case Response.ID_Response :
+                                        packetTypeStr = "RESPONSE";
+                                        break;
+                                case ConsumerInfo.ID_ConsumerInfo :
+                                        packetTypeStr = "CONSUMER_INFO";
+                                        break;
+                                case ProducerInfo.ID_ProducerInfo :
+                                        packetTypeStr = "PRODUCER_INFO";
+                                        break;
+                                case TransactionInfo.ID_TransactionInfo :
+                                        packetTypeStr = "TRANSACTION_INFO";
+                                        break;
+                                case BrokerInfo.ID_BrokerInfo :
+                                        packetTypeStr = "BROKER_INFO";
+                                        break;
+                                case ConnectionInfo.ID_ConnectionInfo :
+                                        packetTypeStr = "CONNECTION_INFO";
+                                        break;
+                                case SessionInfo.ID_SessionInfo :
+                                        packetTypeStr = "SESSION_INFO";
+                                        break;
+                                case RemoveSubscriptionInfo.ID_RemoveSubscriptionInfo :
+                                        packetTypeStr = "DURABLE_UNSUBSCRIBE";
+                                        break;
+                                case IntegerResponse.ID_IntegerResponse :
+                                        packetTypeStr = "INT_RESPONSE_RECEIPT_INFO";
+                                        break;
+                                case WireFormatInfo.ID_WireFormatInfo :
+                                        packetTypeStr = "WIRE_FORMAT_INFO";
+                                        break;
+                                case RemoveInfo.ID_RemoveInfo :
+                                        packetTypeStr = "REMOVE_INFO";
+                                        break;
+                                case KeepAliveInfo.ID_KeepAliveInfo :
+                                        packetTypeStr = "KEEP_ALIVE";
+                                        break;
+                        }
+                        return packetTypeStr; 
+                } 
+        } 
 }
-

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/AbstractCommandMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/AbstractCommandMarshaller.cs?rev=367566&r1=367565&r2=367566&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/AbstractCommandMarshaller.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/AbstractCommandMarshaller.cs Tue Jan 10 02:56:34 2006
@@ -4,115 +4,101 @@
 using OpenWire.Core.Commands;
 using OpenWire.Core.IO;
 
-namespace OpenWire.Core
-{
-	/// <summary>
-	/// A base class with useful implementation inheritence methods 
-	/// for creating marshallers of the OpenWire protocol
-	/// </summary>
-	public abstract class AbstractCommandMarshaller {
-
-        public abstract Command CreateCommand();
-
-        public virtual Command ReadCommand(BinaryReader dataIn) 
-        {
-            Command command = CreateCommand();
-            BuildCommand(command, dataIn);
-            return command;
-        }
-        
-        public virtual void BuildCommand(Command command, BinaryReader dataIn) 
-        {
-        		// empty body to allow generated code to call base method
-        }
-        
-        public virtual void WriteCommand(Command command, BinaryWriter dataOut)
-        {
-        		// empty body to allow generated code to call base method
-        }
-        
-        protected virtual ActiveMQDestination ReadDestination(BinaryReader dataIn)
-        {
-        		return (ActiveMQDestination) CommandMarshallerRegistry.ReadCommand(dataIn);
-        }
-        
-        protected virtual void WriteDestination(ActiveMQDestination command, BinaryWriter dataOut)
-        {
-        		CommandMarshallerRegistry.WriteCommand(command, dataOut);
-        }
-        
-        protected virtual BrokerId[] ReadBrokerIds(BinaryReader dataIn)
-        {
-            int size = dataIn.ReadInt32();
-            BrokerId[] answer = new BrokerId[size];
-            for (int i = 0; i < size; i++) {
-                answer[i] = (BrokerId) CommandMarshallerRegistry.BrokerIdMarshaller.ReadCommand(dataIn);
-            }
-            return answer;
-        }
-
-        protected virtual void WriteBrokerIds(BrokerId[] commands, BinaryWriter dataOut)
-        {
-            int size = commands.Length;
-            dataOut.Write(size);
-            for (int i = 0; i < size; i++) {
-                CommandMarshallerRegistry.BrokerIdMarshaller.WriteCommand(commands[i], dataOut);
-            }
-        }
-
-	        
-        protected virtual BrokerInfo[] ReadBrokerInfos(BinaryReader dataIn)
-        {
-            int size = dataIn.ReadInt32();
-            BrokerInfo[] answer = new BrokerInfo[size];
-            for (int i = 0; i < size; i++) {
-                answer[i] = (BrokerInfo) CommandMarshallerRegistry.BrokerInfoMarshaller.ReadCommand(dataIn);
-            }
-            return answer;
-        }
-
-        protected virtual void WriteBrokerInfos(BrokerInfo[] commands, BinaryWriter dataOut)
-        {
-            int size = commands.Length;
-            dataOut.Write(size);
-            for (int i = 0; i < size; i++) {
-                CommandMarshallerRegistry.BrokerInfoMarshaller.WriteCommand(commands[i], dataOut);
-            }
-        }
-
-	        
-        protected virtual DataStructure[] ReadDataStructures(BinaryReader dataIn)
-        {
-            int size = dataIn.ReadInt32();
-            DataStructure[] answer = new DataStructure[size];
-            for (int i = 0; i < size; i++) {
-                answer[i] = (DataStructure) CommandMarshallerRegistry.ReadCommand(dataIn);
-            }
-            return answer;
-        }
-
-        protected virtual void WriteDataStructures(DataStructure[] commands, BinaryWriter dataOut)
-        {
-            int size = commands.Length;
-            dataOut.Write(size);
-            for (int i = 0; i < size; i++) {
-                CommandMarshallerRegistry.WriteCommand((Command) commands[i], dataOut);
-            }
-        }
-
-	        
-        protected virtual byte[] ReadBytes(BinaryReader dataIn)
-        {
-            int size = dataIn.ReadInt32();
-        	   return dataIn.ReadBytes(size);
-        }
-        
-        protected virtual void WriteBytes(byte[] command, BinaryWriter dataOut)
-        {
-        	  dataOut.Write(command.Length);
-        	  dataOut.Write(command);
-        }
-        
-	}
+namespace OpenWire.Core {
+        /// <summary>
+        /// A base class with useful implementation inheritence methods 
+        /// for creating marshallers of the OpenWire protocol
+        /// </summary>
+        public abstract class AbstractCommandMarshaller {
+
+                public abstract Command CreateCommand();
+
+                public virtual Command ReadCommand(BinaryReader dataIn) {
+                        Command command = CreateCommand();
+                        BuildCommand(command, dataIn);
+                        return command; 
+                }
+
+                public virtual void BuildCommand(Command command, BinaryReader dataIn) {
+                        // empty body to allow generated code to call base method
+                }
+
+                public virtual void WriteCommand(Command command, BinaryWriter dataOut) {
+                        // empty body to allow generated code to call base method
+                }
+
+                protected virtual ActiveMQDestination ReadDestination(BinaryReader dataIn) {
+                        return (ActiveMQDestination) CommandMarshallerRegistry.ReadCommand(dataIn); 
+                }
+
+                protected virtual void WriteDestination(ActiveMQDestination command, BinaryWriter dataOut) {
+                        CommandMarshallerRegistry.WriteCommand(command, dataOut); 
+                }
+
+                protected virtual BrokerId[] ReadBrokerIds(BinaryReader dataIn) {
+                        int size = dataIn.ReadInt32();
+                        BrokerId[] answer = new BrokerId[size];
+                        for (int i = 0; i < size; i++) {
+                                answer[i] = (BrokerId) CommandMarshallerRegistry.BrokerIdMarshaller.ReadCommand(dataIn); 
+                        }
+                        return answer; 
+                }
+
+                protected virtual void WriteBrokerIds(BrokerId[] commands, BinaryWriter dataOut) {
+                        int size = commands.Length;
+                        dataOut.Write(size);
+                        for (int i = 0; i < size; i++) {
+                                CommandMarshallerRegistry.BrokerIdMarshaller.WriteCommand(commands[i], dataOut); 
+                        } 
+                }
+
+
+                protected virtual BrokerInfo[] ReadBrokerInfos(BinaryReader dataIn) {
+                        int size = dataIn.ReadInt32();
+                        BrokerInfo[] answer = new BrokerInfo[size];
+                        for (int i = 0; i < size; i++) {
+                                answer[i] = (BrokerInfo) CommandMarshallerRegistry
+                                        .BrokerInfoMarshaller
+                                        .ReadCommand(dataIn); 
+                        }
+                        return answer; 
+                }
+
+                protected virtual void WriteBrokerInfos(BrokerInfo[] commands, BinaryWriter dataOut) {
+                        int size = commands.Length;
+                        dataOut.Write(size);
+                        for (int i = 0; i < size; i++) {
+                                CommandMarshallerRegistry.BrokerInfoMarshaller.WriteCommand(commands[i], dataOut); 
+                        } 
+                }
+
+
+                protected virtual DataStructure[] ReadDataStructures(BinaryReader dataIn) {
+                        int size = dataIn.ReadInt32();
+                        DataStructure[] answer = new DataStructure[size];
+                        for (int i = 0; i < size; i++) {
+                                answer[i] = (DataStructure) CommandMarshallerRegistry.ReadCommand(dataIn); 
+                        }
+                        return answer; 
+                }
+
+                protected virtual void WriteDataStructures(DataStructure[] commands, BinaryWriter dataOut) {
+                        int size = commands.Length;
+                        dataOut.Write(size);
+                        for (int i = 0; i < size; i++) {
+                                CommandMarshallerRegistry.WriteCommand((Command) commands[i], dataOut); 
+                        } 
+                }
+
+
+                protected virtual byte[] ReadBytes(BinaryReader dataIn) {
+                        int size = dataIn.ReadInt32();
+                        return dataIn.ReadBytes(size); 
+                }
+
+                protected virtual void WriteBytes(byte[] command, BinaryWriter dataOut) {
+                        dataOut.Write(command.Length);
+                        dataOut.Write(command); 
+                } 
+        } 
 }
-

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/ActiveMQDestination.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/ActiveMQDestination.cs?rev=367566&r1=367565&r2=367566&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/ActiveMQDestination.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/ActiveMQDestination.cs Tue Jan 10 02:56:34 2006
@@ -1,463 +1,443 @@
 using System;
 using OpenWire.Core.Commands;
 
-namespace OpenWire.Core
-{
-	/// <summary>
-	/// Summary description for ActiveMQDestination.
-	/// </summary>
-	public abstract class ActiveMQDestination : AbstractCommand, Destination {
-
-    /**
-     * 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 Topic) {
-            return "Topic(" + destination.ToString() + ")";
-        }
-        else {
-            return "Queue(" + destination.ToString() + ")";
-        }
-    }
-
-    /**
-     * @param destination
-     * @return @throws JMSException
-     * @throws javax.jms.JMSException
-     */
-    public static ActiveMQDestination transformDestination(Destination destination) {
-        ActiveMQDestination result = null;
-        if (destination != null) {
-            if (destination is ActiveMQDestination) {
-                result = (ActiveMQDestination) destination;
-            }
-            else {
-                if (destination is TemporaryQueue) {
-                    result = new ActiveMQTempQueue(((Queue) destination).QueueName);
-                }
-                else if (destination is TemporaryTopic) {
-                    result = new ActiveMQTempTopic(((Topic) destination).TopicName);
-                }
-                else if (destination is Queue) {
-                    result = new ActiveMQQueue(((Queue) destination).QueueName);
-                }
-                else if (destination is Topic) {
-                    result = new ActiveMQTopic(((Topic) 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.
-     * <p/>
-     * 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);
+namespace OpenWire.Core {
+        
+        /// <summary>
+        /// Summary description for ActiveMQDestination.
+        /// </summary>
+        public abstract class ActiveMQDestination : AbstractCommand, Destination {
+
+                /**
+                 * 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 Topic) {
+                                return "Topic(" + destination.ToString() + ")"; 
+                        } else {
+                                return "Queue(" + destination.ToString() + ")"; 
+                        } 
+                }
+
+                /**
+                 * @param destination
+                 * @return @throws JMSException
+                 * @throws javax.jms.JMSException
+                 */
+                public static ActiveMQDestination transformDestination(Destination destination) {
+                        ActiveMQDestination result = null;
+                        if (destination != null) {
+                                if (destination is ActiveMQDestination) {
+                                        result = (ActiveMQDestination) destination; 
+                                } else {
+                                        if (destination is TemporaryQueue) {
+                                                result = new ActiveMQTempQueue(((Queue) destination).QueueName); 
+                                        } else if (destination is TemporaryTopic) {
+                                                result = new ActiveMQTempTopic(((Topic) destination).TopicName); 
+                                        } else if (destination is Queue) {
+                                                result = new ActiveMQQueue(((Queue) destination).QueueName); 
+                                        } else if (destination is Topic) {
+                                                result = new ActiveMQTopic(((Topic) 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.
+                 * <p/>
+                 * 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); 
+        } 
 }

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/ActiveMQQueue.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/ActiveMQQueue.cs?rev=367566&r1=367565&r2=367566&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/ActiveMQQueue.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/ActiveMQQueue.cs Tue Jan 10 02:56:34 2006
@@ -2,31 +2,28 @@
 using OpenWire.Core;
 using OpenWire.Core.Commands;
 
-namespace OpenWire.Core
-{
-	/// <summary>
-	/// Summary description for ActiveMQQueue.
-	/// </summary>
-	public class ActiveMQQueue : ActiveMQDestination, Queue 
-	{
-		public const byte ID_ActiveMQQueue = 100;
-		
-		public ActiveMQQueue() : base(){}
-		public ActiveMQQueue(String name) : base(name){}
-		
-		public String QueueName
-		{
-			get {
-				return PhysicalName;
-			}
-		}
-		
-		public override int GetDestinationType() {
-			return ACTIVEMQ_QUEUE;
-		}
+namespace OpenWire.Core {
+        /// <summary>
+        /// Summary description for ActiveMQQueue.
+        /// </summary>
+        public class ActiveMQQueue : ActiveMQDestination, Queue {
+                public const byte ID_ActiveMQQueue = 100;
 
-		public override ActiveMQDestination CreateDestination(String name) {
-			return new ActiveMQQueue(name);
-		}
-	}
-}
\ No newline at end of file
+                public ActiveMQQueue() : base() {
+                }
+                public ActiveMQQueue(String name) : base(name) {
+                }
+
+                public String QueueName {
+                        get { return PhysicalName; } 
+                }
+
+                public override int GetDestinationType() {
+                        return ACTIVEMQ_QUEUE; 
+                }
+
+                public override ActiveMQDestination CreateDestination(String name) {
+                        return new ActiveMQQueue(name); 
+                } 
+        } 
+}

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/ActiveMQTempQueue.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/ActiveMQTempQueue.cs?rev=367566&r1=367565&r2=367566&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/ActiveMQTempQueue.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/ActiveMQTempQueue.cs Tue Jan 10 02:56:34 2006
@@ -2,28 +2,28 @@
 using OpenWire.Core;
 using OpenWire.Core.Commands;
 
-namespace OpenWire.Core
-{
-	/// <summary>
-	/// Summary description for ActiveMQTempQueue.
-	/// </summary>
-	public class ActiveMQTempQueue : ActiveMQDestination, TemporaryQueue
-	{
-		public const byte ID_ActiveMQTempQueue = 102;
-		
-		public ActiveMQTempQueue() : base(){}
-		public ActiveMQTempQueue(String name) : base(name){}
-		
-		public String GetQueueName() {
-			return PhysicalName;
-		}
-		
-		public override int GetDestinationType() {
-			return ACTIVEMQ_QUEUE;
-		}
+namespace OpenWire.Core {
+        /// <summary>
+        /// Summary description for ActiveMQTempQueue.
+        /// </summary>
+        public class ActiveMQTempQueue : ActiveMQDestination, TemporaryQueue {
+                public const byte ID_ActiveMQTempQueue = 102;
 
-		public override ActiveMQDestination CreateDestination(String name) {
-			return new ActiveMQTempQueue(name);
-		}
-	}
-}
\ No newline at end of file
+                public ActiveMQTempQueue() : base() {
+                }
+                public ActiveMQTempQueue(String name) : base(name) {
+                }
+
+                public String GetQueueName() {
+                        return PhysicalName; 
+                }
+
+                public override int GetDestinationType() {
+                        return ACTIVEMQ_QUEUE; 
+                }
+
+                public override ActiveMQDestination CreateDestination(String name) {
+                        return new ActiveMQTempQueue(name); 
+                } 
+        } 
+}

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/ActiveMQTempTopic.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/ActiveMQTempTopic.cs?rev=367566&r1=367565&r2=367566&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/ActiveMQTempTopic.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/ActiveMQTempTopic.cs Tue Jan 10 02:56:34 2006
@@ -2,31 +2,27 @@
 using OpenWire.Core;
 using OpenWire.Core.Commands;
 
-namespace OpenWire.Core
-{
-	/// <summary>
-	/// Summary description for ActiveMQTempTopic.
-	/// </summary>
-	public class ActiveMQTempTopic : ActiveMQDestination, TemporaryTopic
-	{
-		public const byte ID_ActiveMQTempTopic = 103;
-		
-		public ActiveMQTempTopic(): base()	{}
-		public ActiveMQTempTopic(String name):base(name){}
-		
-		public String GetTopicName() 
-		{
-			return PhysicalName;
-		}
-		public override int GetDestinationType() 
-		{
-			return ACTIVEMQ_TOPIC;
-		}
+namespace OpenWire.Core {
+        /// <summary>
+        /// Summary description for ActiveMQTempTopic.
+        /// </summary>
+        public class ActiveMQTempTopic : ActiveMQDestination, TemporaryTopic {
+                public const byte ID_ActiveMQTempTopic = 103;
 
-		public override ActiveMQDestination CreateDestination(String name) 
-		{
-			return new ActiveMQTempTopic(name);
-		}
+                public ActiveMQTempTopic() : base() {
+                }
+                public ActiveMQTempTopic(String name) : base(name) {
+                }
 
-	}
+                public String GetTopicName() {
+                        return PhysicalName; 
+                }
+                public override int GetDestinationType() {
+                        return ACTIVEMQ_TOPIC; 
+                }
+
+                public override ActiveMQDestination CreateDestination(String name) {
+                        return new ActiveMQTempTopic(name); 
+                } 
+        } 
 }

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/ActiveMQTopic.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/ActiveMQTopic.cs?rev=367566&r1=367565&r2=367566&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/ActiveMQTopic.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/ActiveMQTopic.cs Tue Jan 10 02:56:34 2006
@@ -2,34 +2,28 @@
 using OpenWire.Core;
 using OpenWire.Core.Commands;
 
-namespace OpenWire.Core
-{
-	/// <summary>
-	/// Summary description for ActiveMQTopic.
-	/// </summary>
-	public class ActiveMQTopic : ActiveMQDestination, Topic
-	{
-		public const byte ID_ActiveMQTopic = 101;
-		
-		public ActiveMQTopic(): base()	{}
-		public ActiveMQTopic(String name):base(name){}
-		
-		public String TopicName
-		{
-			get {
-				return PhysicalName;
-			}
-		}
-		
-		public override int GetDestinationType() 
-		{
-			return ACTIVEMQ_TOPIC;
-		}
+namespace OpenWire.Core {
+        /// <summary>
+        /// Summary description for ActiveMQTopic.
+        /// </summary>
+        public class ActiveMQTopic : ActiveMQDestination, Topic {
+                public const byte ID_ActiveMQTopic = 101;
 
-		public override ActiveMQDestination CreateDestination(String name) 
-		{
-			return new ActiveMQTopic(name);
-		}
+                public ActiveMQTopic() : base() {
+                }
+                public ActiveMQTopic(String name) : base(name) {
+                }
 
-	}
+                public String TopicName {
+                        get { return PhysicalName; } 
+                }
+
+                public override int GetDestinationType() {
+                        return ACTIVEMQ_TOPIC; 
+                }
+
+                public override ActiveMQDestination CreateDestination(String name) {
+                        return new ActiveMQTopic(name); 
+                } 
+        } 
 }

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Command.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Command.cs?rev=367566&r1=367565&r2=367566&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Command.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Command.cs Tue Jan 10 02:56:34 2006
@@ -1,12 +1,9 @@
 using System;
 
-namespace OpenWire.Core
-{
-	/// <summary>
-	/// An OpenWire command
-	/// </summary>
-	public interface Command : DataStructure {
-	
-	}
+namespace OpenWire.Core {
+        /// <summary>
+        /// An OpenWire command
+        /// </summary>
+        public interface Command : DataStructure {
+        } 
 }
-

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/BaseCommand.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/BaseCommand.cs?rev=367566&r1=367565&r2=367566&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/BaseCommand.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/BaseCommand.cs Tue Jan 10 02:56:34 2006
@@ -12,52 +12,51 @@
 
 using OpenWire.Core;
 
-namespace OpenWire.Core.Commands
-{
-    public class BaseCommand : AbstractCommand
-    {
-    			public const byte ID_BaseCommand = 0;
-    			
-        short commandId;
-        bool responseRequired;
+namespace OpenWire.Core.Commands {
 
+        public class BaseCommand : AbstractCommand {
+                public const byte ID_BaseCommand = 0;
 
+                short commandId;
+                bool responseRequired;
 
-        // TODO generate Equals method
-        // TODO generate GetHashCode method
-        // TODO generate ToString method
-
-
-        public override byte GetCommandType() {
-            return ID_BaseCommand;
-        }
-
-
-        // Properties
-
-        public short CommandId
-        {
-            get
-            {
-                return commandId;
-            }
-            set
-            {
-                commandId = value;
-            }            
-        }
-
-        public bool ResponseRequired
-        {
-            get
-            {
-                return responseRequired;
-            }
-            set
-            {
-                responseRequired = value;
-            }            
-        }
 
-    }
+                public override int GetHashCode() {
+                        return commandId;
+                }
+
+                public override bool Equals(Object that) {
+                        if (that is BaseCommand) {
+                                BaseCommand thatCommand = (BaseCommand) that;
+                                return this.GetCommandType() == thatCommand.GetCommandType()
+                                        && this.CommandId == thatCommand.CommandId; 
+                        }
+                        return false; 
+                }
+
+                public override String ToString() {
+                        string answer = GetCommandTypeAsString(GetCommandType());
+                        if (answer.Length == 0) {
+                                answer = base.ToString(); 
+                        }
+                        return answer + ": id = " + CommandId; 
+                }
+
+                public override byte GetCommandType() {
+                        return ID_BaseCommand; 
+                }
+
+
+                // Properties
+
+                public short CommandId {
+                        get { return commandId; }
+                        set { this.commandId = value; } 
+                }
+
+                public bool ResponseRequired {
+                        get { return responseRequired; }
+                        set { this.responseRequired = value; } 
+                } 
+        } 
 }

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/BrokerId.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/BrokerId.cs?rev=367566&r1=367565&r2=367566&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/BrokerId.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/BrokerId.cs Tue Jan 10 02:56:34 2006
@@ -36,14 +36,8 @@
 
         public string Value
         {
-            get
-            {
-                return value;
-            }
-            set
-            {
-                value = value;
-            }            
+            get { return value; }
+            set { this.value = value; }            
         }
 
     }

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/BrokerInfo.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/BrokerInfo.cs?rev=367566&r1=367565&r2=367566&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/BrokerInfo.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/BrokerInfo.cs Tue Jan 10 02:56:34 2006
@@ -39,50 +39,26 @@
 
         public BrokerId BrokerId
         {
-            get
-            {
-                return brokerId;
-            }
-            set
-            {
-                brokerId = value;
-            }            
+            get { return brokerId; }
+            set { this.brokerId = value; }            
         }
 
         public string BrokerURL
         {
-            get
-            {
-                return brokerURL;
-            }
-            set
-            {
-                brokerURL = value;
-            }            
+            get { return brokerURL; }
+            set { this.brokerURL = value; }            
         }
 
         public BrokerInfo[] PeerBrokerInfos
         {
-            get
-            {
-                return peerBrokerInfos;
-            }
-            set
-            {
-                peerBrokerInfos = value;
-            }            
+            get { return peerBrokerInfos; }
+            set { this.peerBrokerInfos = value; }            
         }
 
         public string BrokerName
         {
-            get
-            {
-                return brokerName;
-            }
-            set
-            {
-                brokerName = value;
-            }            
+            get { return brokerName; }
+            set { this.brokerName = value; }            
         }
 
     }

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ConnectionError.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ConnectionError.cs?rev=367566&r1=367565&r2=367566&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ConnectionError.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ConnectionError.cs Tue Jan 10 02:56:34 2006
@@ -37,26 +37,14 @@
 
         public byte[] Exception
         {
-            get
-            {
-                return exception;
-            }
-            set
-            {
-                exception = value;
-            }            
+            get { return exception; }
+            set { this.exception = value; }            
         }
 
         public ConnectionId ConnectionId
         {
-            get
-            {
-                return connectionId;
-            }
-            set
-            {
-                connectionId = value;
-            }            
+            get { return connectionId; }
+            set { this.connectionId = value; }            
         }
 
     }

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ConnectionId.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ConnectionId.cs?rev=367566&r1=367565&r2=367566&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ConnectionId.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ConnectionId.cs Tue Jan 10 02:56:34 2006
@@ -36,14 +36,8 @@
 
         public string Value
         {
-            get
-            {
-                return value;
-            }
-            set
-            {
-                value = value;
-            }            
+            get { return value; }
+            set { this.value = value; }            
         }
 
     }

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ConnectionInfo.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ConnectionInfo.cs?rev=367566&r1=367565&r2=367566&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ConnectionInfo.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ConnectionInfo.cs Tue Jan 10 02:56:34 2006
@@ -40,62 +40,32 @@
 
         public ConnectionId ConnectionId
         {
-            get
-            {
-                return connectionId;
-            }
-            set
-            {
-                connectionId = value;
-            }            
+            get { return connectionId; }
+            set { this.connectionId = value; }            
         }
 
         public string ClientId
         {
-            get
-            {
-                return clientId;
-            }
-            set
-            {
-                clientId = value;
-            }            
+            get { return clientId; }
+            set { this.clientId = value; }            
         }
 
         public string Password
         {
-            get
-            {
-                return password;
-            }
-            set
-            {
-                password = value;
-            }            
+            get { return password; }
+            set { this.password = value; }            
         }
 
         public string UserName
         {
-            get
-            {
-                return userName;
-            }
-            set
-            {
-                userName = value;
-            }            
+            get { return userName; }
+            set { this.userName = value; }            
         }
 
         public BrokerId[] BrokerPath
         {
-            get
-            {
-                return brokerPath;
-            }
-            set
-            {
-                brokerPath = value;
-            }            
+            get { return brokerPath; }
+            set { this.brokerPath = value; }            
         }
 
     }

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ConsumerId.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ConsumerId.cs?rev=367566&r1=367565&r2=367566&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ConsumerId.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ConsumerId.cs Tue Jan 10 02:56:34 2006
@@ -38,38 +38,20 @@
 
         public string ConnectionId
         {
-            get
-            {
-                return connectionId;
-            }
-            set
-            {
-                connectionId = value;
-            }            
+            get { return connectionId; }
+            set { this.connectionId = value; }            
         }
 
         public long SessionId
         {
-            get
-            {
-                return sessionId;
-            }
-            set
-            {
-                sessionId = value;
-            }            
+            get { return sessionId; }
+            set { this.sessionId = value; }            
         }
 
         public long Value
         {
-            get
-            {
-                return value;
-            }
-            set
-            {
-                value = value;
-            }            
+            get { return value; }
+            set { this.value = value; }            
         }
 
     }

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ConsumerInfo.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ConsumerInfo.cs?rev=367566&r1=367565&r2=367566&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ConsumerInfo.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ConsumerInfo.cs Tue Jan 10 02:56:34 2006
@@ -48,158 +48,80 @@
 
         public ConsumerId ConsumerId
         {
-            get
-            {
-                return consumerId;
-            }
-            set
-            {
-                consumerId = value;
-            }            
+            get { return consumerId; }
+            set { this.consumerId = value; }            
         }
 
         public bool Browser
         {
-            get
-            {
-                return browser;
-            }
-            set
-            {
-                browser = value;
-            }            
+            get { return browser; }
+            set { this.browser = value; }            
         }
 
         public ActiveMQDestination Destination
         {
-            get
-            {
-                return destination;
-            }
-            set
-            {
-                destination = value;
-            }            
+            get { return destination; }
+            set { this.destination = value; }            
         }
 
         public int PrefetchSize
         {
-            get
-            {
-                return prefetchSize;
-            }
-            set
-            {
-                prefetchSize = value;
-            }            
+            get { return prefetchSize; }
+            set { this.prefetchSize = value; }            
         }
 
         public bool DispatchAsync
         {
-            get
-            {
-                return dispatchAsync;
-            }
-            set
-            {
-                dispatchAsync = value;
-            }            
+            get { return dispatchAsync; }
+            set { this.dispatchAsync = value; }            
         }
 
         public string Selector
         {
-            get
-            {
-                return selector;
-            }
-            set
-            {
-                selector = value;
-            }            
+            get { return selector; }
+            set { this.selector = value; }            
         }
 
         public string SubcriptionName
         {
-            get
-            {
-                return subcriptionName;
-            }
-            set
-            {
-                subcriptionName = value;
-            }            
+            get { return subcriptionName; }
+            set { this.subcriptionName = value; }            
         }
 
         public bool NoLocal
         {
-            get
-            {
-                return noLocal;
-            }
-            set
-            {
-                noLocal = value;
-            }            
+            get { return noLocal; }
+            set { this.noLocal = value; }            
         }
 
         public bool Exclusive
         {
-            get
-            {
-                return exclusive;
-            }
-            set
-            {
-                exclusive = value;
-            }            
+            get { return exclusive; }
+            set { this.exclusive = value; }            
         }
 
         public bool Retroactive
         {
-            get
-            {
-                return retroactive;
-            }
-            set
-            {
-                retroactive = value;
-            }            
+            get { return retroactive; }
+            set { this.retroactive = value; }            
         }
 
         public byte Priority
         {
-            get
-            {
-                return priority;
-            }
-            set
-            {
-                priority = value;
-            }            
+            get { return priority; }
+            set { this.priority = value; }            
         }
 
         public BrokerId[] BrokerPath
         {
-            get
-            {
-                return brokerPath;
-            }
-            set
-            {
-                brokerPath = value;
-            }            
+            get { return brokerPath; }
+            set { this.brokerPath = value; }            
         }
 
         public bool NetworkSubscription
         {
-            get
-            {
-                return networkSubscription;
-            }
-            set
-            {
-                networkSubscription = value;
-            }            
+            get { return networkSubscription; }
+            set { this.networkSubscription = value; }            
         }
 
     }

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ControlCommand.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ControlCommand.cs?rev=367566&r1=367565&r2=367566&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ControlCommand.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ControlCommand.cs Tue Jan 10 02:56:34 2006
@@ -36,14 +36,8 @@
 
         public string Command
         {
-            get
-            {
-                return command;
-            }
-            set
-            {
-                command = value;
-            }            
+            get { return command; }
+            set { this.command = value; }            
         }
 
     }

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/DataArrayResponse.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/DataArrayResponse.cs?rev=367566&r1=367565&r2=367566&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/DataArrayResponse.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/DataArrayResponse.cs Tue Jan 10 02:56:34 2006
@@ -36,14 +36,8 @@
 
         public DataStructure[] Data
         {
-            get
-            {
-                return data;
-            }
-            set
-            {
-                data = value;
-            }            
+            get { return data; }
+            set { this.data = value; }            
         }
 
     }

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/DataResponse.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/DataResponse.cs?rev=367566&r1=367565&r2=367566&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/DataResponse.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/DataResponse.cs Tue Jan 10 02:56:34 2006
@@ -36,14 +36,8 @@
 
         public DataStructure Data
         {
-            get
-            {
-                return data;
-            }
-            set
-            {
-                data = value;
-            }            
+            get { return data; }
+            set { this.data = value; }            
         }
 
     }

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/DestinationInfo.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/DestinationInfo.cs?rev=367566&r1=367565&r2=367566&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/DestinationInfo.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/DestinationInfo.cs Tue Jan 10 02:56:34 2006
@@ -40,62 +40,32 @@
 
         public ConnectionId ConnectionId
         {
-            get
-            {
-                return connectionId;
-            }
-            set
-            {
-                connectionId = value;
-            }            
+            get { return connectionId; }
+            set { this.connectionId = value; }            
         }
 
         public ActiveMQDestination Destination
         {
-            get
-            {
-                return destination;
-            }
-            set
-            {
-                destination = value;
-            }            
+            get { return destination; }
+            set { this.destination = value; }            
         }
 
         public byte OperationType
         {
-            get
-            {
-                return operationType;
-            }
-            set
-            {
-                operationType = value;
-            }            
+            get { return operationType; }
+            set { this.operationType = value; }            
         }
 
         public long Timeout
         {
-            get
-            {
-                return timeout;
-            }
-            set
-            {
-                timeout = value;
-            }            
+            get { return timeout; }
+            set { this.timeout = value; }            
         }
 
         public BrokerId[] BrokerPath
         {
-            get
-            {
-                return brokerPath;
-            }
-            set
-            {
-                brokerPath = value;
-            }            
+            get { return brokerPath; }
+            set { this.brokerPath = value; }            
         }
 
     }

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/DiscoveryEvent.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/DiscoveryEvent.cs?rev=367566&r1=367565&r2=367566&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/DiscoveryEvent.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/DiscoveryEvent.cs Tue Jan 10 02:56:34 2006
@@ -37,26 +37,14 @@
 
         public string ServiceName
         {
-            get
-            {
-                return serviceName;
-            }
-            set
-            {
-                serviceName = value;
-            }            
+            get { return serviceName; }
+            set { this.serviceName = value; }            
         }
 
         public string BrokerName
         {
-            get
-            {
-                return brokerName;
-            }
-            set
-            {
-                brokerName = value;
-            }            
+            get { return brokerName; }
+            set { this.brokerName = value; }            
         }
 
     }

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ExceptionResponse.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ExceptionResponse.cs?rev=367566&r1=367565&r2=367566&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ExceptionResponse.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ExceptionResponse.cs Tue Jan 10 02:56:34 2006
@@ -36,14 +36,8 @@
 
         public byte[] Exception
         {
-            get
-            {
-                return exception;
-            }
-            set
-            {
-                exception = value;
-            }            
+            get { return exception; }
+            set { this.exception = value; }            
         }
 
     }

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/IntegerResponse.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/IntegerResponse.cs?rev=367566&r1=367565&r2=367566&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/IntegerResponse.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/IntegerResponse.cs Tue Jan 10 02:56:34 2006
@@ -36,14 +36,8 @@
 
         public int Result
         {
-            get
-            {
-                return result;
-            }
-            set
-            {
-                result = value;
-            }            
+            get { return result; }
+            set { this.result = value; }            
         }
 
     }



Mime
View raw message