activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r589629 [2/7] - in /activemq/activemq-dotnet/trunk: ./ src/main/csharp/ActiveMQ/ src/main/csharp/ActiveMQ/Commands/ src/main/csharp/ActiveMQ/OpenWire/ src/main/csharp/ActiveMQ/OpenWire/V1/ src/main/csharp/ActiveMQ/OpenWire/V2/ src/main/csha...
Date Mon, 29 Oct 2007 13:55:57 GMT
Modified: activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/Commands/WireFormatInfo.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/Commands/WireFormatInfo.cs?rev=589629&r1=589628&r2=589629&view=diff
==============================================================================
--- activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/Commands/WireFormatInfo.cs (original)
+++ activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/Commands/WireFormatInfo.cs Mon Oct 29 06:55:09 2007
@@ -16,10 +16,10 @@
 */
 
 using System;
-using ActiveMQ.OpenWire;
-using NMS;
+using Apache.ActiveMQ.OpenWire;
+using Apache.NMS;
 
-namespace ActiveMQ.Commands
+namespace Apache.ActiveMQ.Commands
 {
     //
     //  Marshalling code for Open Wire Format for WireFormatInfo

Modified: activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/Commands/XATransactionId.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/Commands/XATransactionId.cs?rev=589629&r1=589628&r2=589629&view=diff
==============================================================================
--- activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/Commands/XATransactionId.cs (original)
+++ activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/Commands/XATransactionId.cs Mon Oct 29 06:55:09 2007
@@ -23,10 +23,10 @@
 using System;
 using System.Collections;
 
-using ActiveMQ.OpenWire;
-using ActiveMQ.Commands;
+using Apache.ActiveMQ.OpenWire;
+using Apache.ActiveMQ.Commands;
 
-namespace ActiveMQ.Commands
+namespace Apache.ActiveMQ.Commands
 {
     /// <summary>
     ///  The ActiveMQ XATransactionId Command

Modified: activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/Commands/Xid.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/Commands/Xid.cs?rev=589629&r1=589628&r2=589629&view=diff
==============================================================================
--- activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/Commands/Xid.cs (original)
+++ activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/Commands/Xid.cs Mon Oct 29 06:55:09 2007
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-namespace ActiveMQ.Commands
+namespace Apache.ActiveMQ.Commands
 {
 	public interface Xid
 	{

Modified: activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/CommonAssemblyInfo.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/CommonAssemblyInfo.cs?rev=589629&r1=589628&r2=589629&view=diff
==============================================================================
--- activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/CommonAssemblyInfo.cs (original)
+++ activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/CommonAssemblyInfo.cs Mon Oct 29 06:55:09 2007
@@ -5,7 +5,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:2.0.50727.42
+//     Runtime Version:2.0.50727.832
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.

Modified: activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/Connection.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/Connection.cs?rev=589629&r1=589628&r2=589629&view=diff
==============================================================================
--- activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/Connection.cs (original)
+++ activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/Connection.cs Mon Oct 29 06:55:09 2007
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-using ActiveMQ.Commands;
-using ActiveMQ.Transport;
-using NMS;
+using Apache.ActiveMQ.Commands;
+using Apache.ActiveMQ.Transport;
+using Apache.NMS;
 using System;
 using System.Collections;
 
-namespace ActiveMQ
+namespace Apache.ActiveMQ
 {
     /// <summary>
     /// Represents a connection with a message broker
@@ -42,6 +42,7 @@
         private long localTransactionCounter;
         private bool closing;
         private Util.AtomicBoolean started = new ActiveMQ.Util.AtomicBoolean(true);
+    	private bool disposed = false;
         
         public Connection(ITransport transport, ConnectionInfo info)
         {
@@ -51,7 +52,12 @@
 			this.transport.Exception = new ExceptionHandler(OnException);
             this.transport.Start();
         }
-        
+
+        ~Connection()
+        {
+        	Dispose(false);
+        }
+
         public event ExceptionListener ExceptionListener;
 
 
@@ -148,14 +154,39 @@
 			}
 		}
 
-        public void Dispose()
-        {
-			// For now we do not distinguish between Dispose() and Close().
-			// In theory Dispose should possibly be lighter-weight and perform a (faster)
-			// disorderly close.
-			Close();
-        }
-        
+		public void Dispose()
+		{
+			Dispose(true);
+			GC.SuppressFinalize(this);
+		}
+
+		protected void Dispose(bool disposing)
+		{
+			if(disposed)
+			{
+				return;
+			}
+
+			if(disposing)
+			{
+				// Dispose managed code here.
+			}
+
+			try
+			{
+				// For now we do not distinguish between Dispose() and Close().
+				// In theory Dispose should possibly be lighter-weight and perform a (faster)
+				// disorderly close.
+				Close();
+			}
+			catch
+			{
+				// Ignore network errors.
+			}
+
+			disposed = true;
+		}
+		
         // Properties
         
         public ITransport ITransport

Modified: activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/ConnectionClosedException.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/ConnectionClosedException.cs?rev=589629&r1=589628&r2=589629&view=diff
==============================================================================
--- activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/ConnectionClosedException.cs (original)
+++ activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/ConnectionClosedException.cs Mon Oct 29 06:55:09 2007
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-using NMS;
+using Apache.NMS;
 
-namespace ActiveMQ
+namespace Apache.ActiveMQ
 {
 	/// <summary>
         /// Exception thrown when a connection is used that it already closed

Modified: activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/ConnectionFactory.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/ConnectionFactory.cs?rev=589629&r1=589628&r2=589629&view=diff
==============================================================================
--- activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/ConnectionFactory.cs (original)
+++ activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/ConnectionFactory.cs Mon Oct 29 06:55:09 2007
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-using ActiveMQ.Commands;
-using ActiveMQ.Transport;
-using ActiveMQ.Transport.Tcp;
-using ActiveMQ.Util;
-using NMS;
+using Apache.ActiveMQ.Commands;
+using Apache.ActiveMQ.Transport;
+using Apache.ActiveMQ.Transport.Tcp;
+using Apache.ActiveMQ.Util;
+using Apache.NMS;
 using System;
 
-namespace ActiveMQ
+namespace Apache.ActiveMQ
 {
     /// <summary>
     /// Represents a connection with a message broker
@@ -32,8 +32,8 @@
 		public const string ENV_BROKER_URL = "ACTIVEMQ_BROKER_URL";
 		
         private Uri brokerUri;
-        private string userName;
-        private string password;
+        private string connectionUserName;
+        private string connectionPassword;
         private string clientId;
         
 		public static string GetDefaultBrokerUrl()
@@ -50,33 +50,44 @@
 		}
 		
         public ConnectionFactory()
+			: this(GetDefaultBrokerUrl())
         {
-			this.brokerUri = new Uri(GetDefaultBrokerUrl());
         }
-        
-        public ConnectionFactory(Uri brokerUri)
-        {
-			this.brokerUri=brokerUri;
-        }
-        
-        public ConnectionFactory(string brokerUri)
-        {
-			this.brokerUri=new Uri(brokerUri);
-        }
-        
-        public IConnection CreateConnection()
+
+		public ConnectionFactory(string brokerUri)
+			: this(brokerUri, CreateNewGuid())
+		{
+		}
+
+		public ConnectionFactory(string brokerUri, string clientID)
+			: this(new Uri(brokerUri), clientID)
+		{
+		}
+
+		public ConnectionFactory(Uri brokerUri)
+			: this(brokerUri, CreateNewGuid())
+		{
+		}
+
+		public ConnectionFactory(Uri brokerUri, string clientID)
+		{
+			this.brokerUri = brokerUri;
+			this.clientId = clientID;
+		}
+
+		public IConnection CreateConnection()
         {
-            return CreateConnection(userName, password);
+            return CreateConnection(connectionUserName, connectionPassword);
         }
-        
-        public IConnection CreateConnection(string userName, string password)
+
+    	public IConnection CreateConnection(string userName, string password)
         {
-            ConnectionInfo info = CreateConnectionInfo(userName, password);
+			ConnectionInfo info = CreateConnectionInfo(userName, password);
 
-            TcpTransportFactory tcpTransportFactory = new TcpTransportFactory();
+			ITransportFactory tcpTransportFactory = new TcpTransportFactory();
 			ITransport transport = tcpTransportFactory.CreateTransport(brokerUri);
 
-            Connection connection = new Connection(transport, info);
+			IConnection connection = new Connection(transport, info);
 			connection.ClientId = info.ClientId;
 
 			// Set properties on connection using parameters prefixed with "jms."
@@ -96,17 +107,17 @@
                 
         public string UserName
         {
-            get { return userName; }
-            set { userName = value; }
+            get { return connectionUserName; }
+            set { connectionUserName = value; }
         }
         
         public string Password
         {
-            get { return password; }
-            set { password = value; }
+            get { return connectionPassword; }
+            set { connectionPassword = value; }
         }
-        
-        public string ClientId
+
+		public string ClientId
         {
             get { return clientId; }
             set { clientId = value; }
@@ -131,7 +142,7 @@
             return answer;
         }
         
-        protected string CreateNewGuid()
+        protected static string CreateNewGuid()
         {
             return Guid.NewGuid().ToString();
         }

Modified: activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/ConsumerClosedException.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/ConsumerClosedException.cs?rev=589629&r1=589628&r2=589629&view=diff
==============================================================================
--- activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/ConsumerClosedException.cs (original)
+++ activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/ConsumerClosedException.cs Mon Oct 29 06:55:09 2007
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-using NMS;
+using Apache.NMS;
 
-namespace ActiveMQ
+namespace Apache.ActiveMQ
 {
 	/// <summary>
         /// Exception thrown when a consumer is used that it already closed

Modified: activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/DestinationFilter.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/DestinationFilter.cs?rev=589629&r1=589628&r2=589629&view=diff
==============================================================================
--- activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/DestinationFilter.cs (original)
+++ activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/DestinationFilter.cs Mon Oct 29 06:55:09 2007
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-using ActiveMQ.Commands;
+using Apache.ActiveMQ.Commands;
 using System;
 
-namespace ActiveMQ
+namespace Apache.ActiveMQ
 {
 	/// <summary>
         /// Summary description for DestinationFilter.

Modified: activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/Dispatcher.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/Dispatcher.cs?rev=589629&r1=589628&r2=589629&view=diff
==============================================================================
--- activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/Dispatcher.cs (original)
+++ activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/Dispatcher.cs Mon Oct 29 06:55:09 2007
@@ -14,23 +14,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-using ActiveMQ.Commands;
-using NMS;
+using Apache.NMS;
 using System;
 using System.Collections;
 using System.Threading;
 
-namespace ActiveMQ
+namespace Apache.ActiveMQ
 {
-	
 	/// <summary>
 	/// Handles the multi-threaded dispatching between the transport and the consumers
 	/// </summary>
 	public class Dispatcher
     {
         Queue queue = new Queue();
-        Object semaphore = new Object();
-        ArrayList messagesToRedeliver = new ArrayList();
+		readonly Object semaphore = new Object();
+		readonly ArrayList messagesToRedeliver = new ArrayList();
         
         // TODO can't use EventWaitHandle on MONO 1.0
         AutoResetEvent messageReceivedEventHandle = new AutoResetEvent(false);
@@ -44,7 +42,9 @@
 				messageReceivedEventHandle = eventHandle;
 				m_bAsyncDelivery = true;
 				if (queue.Count > 0)
+				{
 					messageReceivedEventHandle.Set();
+				}
 			}
 		}
 
@@ -56,7 +56,7 @@
             lock (semaphore)
             {
                 Queue replacement = new Queue(queue.Count + messagesToRedeliver.Count);
-                foreach (ActiveMQMessage element in messagesToRedeliver)
+                foreach (IMessage element in messagesToRedeliver)
                 {
                     replacement.Enqueue(element);
                 }
@@ -64,19 +64,22 @@
                 
                 while (queue.Count > 0)
                 {
-                    ActiveMQMessage element = (ActiveMQMessage) queue.Dequeue();
+                    IMessage element = (IMessage) queue.Dequeue();
                     replacement.Enqueue(element);
                 }
-                queue = replacement;
+
+				queue = replacement;
                 if (queue.Count > 0)
-                    messageReceivedEventHandle.Set();
+                {
+                	messageReceivedEventHandle.Set();
+                }
             }
         }
         
         /// <summary>
         /// Redeliver the given message, putting it at the head of the queue
         /// </summary>
-        public void Redeliver(ActiveMQMessage message)
+        public void Redeliver(IMessage message)
         {
             lock (semaphore)
 			{
@@ -87,7 +90,7 @@
         /// <summary>
         /// Method Enqueue
         /// </summary>
-        public void Enqueue(ActiveMQMessage message)
+        public void Enqueue(IMessage message)
         {
             lock (semaphore)
             {
@@ -127,10 +130,11 @@
 
             while (!bClosed && rc == null)
             {
-                if( !messageReceivedEventHandle.WaitOne((int)timeout.TotalMilliseconds, false) )
+                if( !messageReceivedEventHandle.WaitOne(timeout, false))
                 {
                     break;
                 }
+
 				lock (semaphore)
 				{
 					rc = DequeueNoWait();
@@ -145,16 +149,20 @@
         /// </summary>
         public IMessage Dequeue()
         {
-			return Dequeue(TimeSpan.MaxValue);
+			TimeSpan indefiniteWait = TimeSpan.FromMilliseconds(Timeout.Infinite);
+			return Dequeue(indefiniteWait);
         }
 
-		internal void Close()
+		public void Close()
 		{
 			lock (semaphore)
 			{
 				m_bClosed = true;
+				queue.Clear();
 				if(m_bAsyncDelivery)
+				{
 					messageReceivedEventHandle.Set();
+				}
 			}
 		}
 	}

Modified: activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/DispatchingThread.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/DispatchingThread.cs?rev=589629&r1=589628&r2=589629&view=diff
==============================================================================
--- activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/DispatchingThread.cs (original)
+++ activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/DispatchingThread.cs Mon Oct 29 06:55:09 2007
@@ -16,9 +16,10 @@
  */
 using System;
 using System.Threading;
+using Apache.NMS;
 
 
-namespace ActiveMQ
+namespace Apache.ActiveMQ
 {
 	internal class DispatchingThread
 	{

Modified: activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/ISynchronization.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/ISynchronization.cs?rev=589629&r1=589628&r2=589629&view=diff
==============================================================================
--- activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/ISynchronization.cs (original)
+++ activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/ISynchronization.cs Mon Oct 29 06:55:09 2007
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-namespace ActiveMQ
+namespace Apache.ActiveMQ
 {
 	public interface ISynchronization
     {

Modified: activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/MessageConsumer.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/MessageConsumer.cs?rev=589629&r1=589628&r2=589629&view=diff
==============================================================================
--- activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/MessageConsumer.cs (original)
+++ activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/MessageConsumer.cs Mon Oct 29 06:55:09 2007
@@ -15,260 +15,298 @@
  * limitations under the License.
  */
 using System;
-using ActiveMQ.Commands;
-using NMS;
-using System.Threading;
+using Apache.ActiveMQ.Commands;
+using Apache.NMS;
 
-namespace ActiveMQ
+namespace Apache.ActiveMQ
 {
-    public enum AckType
-    {
-        DeliveredAck = 0, // Message delivered but not consumed
-        PoisonAck = 1,    // Message could not be processed due to poison pill but discard anyway
-        ConsumedAck = 2   // Message consumed, discard
-    }
-    
-    
-    /// <summary>
-    /// An object capable of receiving messages from some destination
-    /// </summary>
-    public class MessageConsumer : IMessageConsumer
-    {
-        
-        private Session session;
-        private ConsumerInfo info;
-        private AcknowledgementMode acknowledgementMode;
-        private bool closed = false;
-        private Dispatcher dispatcher = new Dispatcher();
-        private int maximumRedeliveryCount = 10;
-        private int redeliveryTimeout = 500;
-        private event MessageListener listener;
-        
-        public event MessageListener Listener
-        {
-              add {
-                  listener += value;
-                  session.StartAsyncDelivery(dispatcher);
-              }
-              remove {
-                  listener -= value;
-              }
-        }
-        
-        // Constructor internal to prevent clients from creating an instance.
-        internal MessageConsumer(Session session, ConsumerInfo info, AcknowledgementMode acknowledgementMode)
-        {
-            this.session = session;
-            this.info = info;
-            this.acknowledgementMode = acknowledgementMode;
-        }
-        
-        internal Dispatcher Dispatcher
-        {
-            get { return this.dispatcher; }
-        }
-
-        public ConsumerId ConsumerId
-        {
-            get {
-                return info.ConsumerId;
-            }
-        }
-        
-        public int MaximumRedeliveryCount
-        {
-            get { return maximumRedeliveryCount; }
-            set { maximumRedeliveryCount = value; }
-        }
-        
-        public int RedeliveryTimeout
-        {
-            get { return redeliveryTimeout; }
-            set { redeliveryTimeout = value; }
-        }
-
-        
-        public void RedeliverRolledBackMessages()
-        {
-            dispatcher.RedeliverRolledBackMessages();
-        }
-        
-        /// <summary>
-        /// Method Dispatch
-        /// </summary>
-        /// <param name="message">An ActiveMQMessage</param>
-        public void Dispatch(ActiveMQMessage message)
-        {
-            dispatcher.Enqueue(message);
-        }
-
-        public IMessage Receive()
-        {
-            CheckClosed();
-            return AutoAcknowledge(dispatcher.Dequeue());
-        }
-        
-        public IMessage Receive(System.TimeSpan timeout)
-        {
-            CheckClosed();
-            return AutoAcknowledge(dispatcher.Dequeue(timeout));
-        }
-        
-        public IMessage ReceiveNoWait()
-        {
-            CheckClosed();
-            return AutoAcknowledge(dispatcher.DequeueNoWait());
-        }
-        
-        public void Dispose()
-        {
-            session.DisposeOf(info.ConsumerId);
-            Close();
-        }
-        
-        /// <summary>
-        /// Dispatch any pending messages to the asynchronous listener
-        /// </summary>
-        internal void DispatchAsyncMessages()
-        {
-            while (listener != null)
-            {
-                IMessage message = dispatcher.DequeueNoWait();
-                if (message == null)
-                    break;
-                    
-                //here we add the code that if do acknowledge action.
-                message = AutoAcknowledge(message);
-                // invoke listener. Exceptions caught by the dispatcher thread
-                listener(message); 
-            }
-        }
-        
-        protected void CheckClosed()
-        {
-            if (closed)
-            {
-                throw new ConnectionClosedException();
-            }
-        }
-        
-        protected IMessage AutoAcknowledge(IMessage message)
-        {
-            if (message is ActiveMQMessage)
-            {
-                ActiveMQMessage activeMessage = (ActiveMQMessage) message;
-                
-                // lets register the handler for client acknowledgment
-                activeMessage.Acknowledger += new AcknowledgeHandler(DoClientAcknowledge);
-                
-                if (acknowledgementMode != AcknowledgementMode.ClientAcknowledge)
-                {
-                    DoAcknowledge(activeMessage);
-                }
-            }
-            return message;
-        }
-        
-        protected void DoClientAcknowledge(ActiveMQMessage message)
-        {
-            if (acknowledgementMode == AcknowledgementMode.ClientAcknowledge)
-            {
-                DoAcknowledge(message);
-            }
-        }
-        
-        protected void DoAcknowledge(Message message)
-        {
-            MessageAck ack = CreateMessageAck(message);
-            //Console.WriteLine("Sending Ack: " + ack);
-            session.Connection.OneWay(ack);
-        }
-        
-        
-        protected virtual MessageAck CreateMessageAck(Message message)
-        {
-            MessageAck ack = new MessageAck();
-            ack.AckType = (int) AckType.ConsumedAck;
-            ack.ConsumerId = info.ConsumerId;
-            ack.Destination = message.Destination;
-            ack.FirstMessageId = message.MessageId;
-            ack.LastMessageId = message.MessageId;
-            ack.MessageCount = 1;
-            
-            if (session.Transacted)
-            {
-                session.DoStartTransaction();
-                ack.TransactionId = session.TransactionContext.TransactionId;
-                session.TransactionContext.AddSynchronization(new MessageConsumerSynchronization(this, message));
-            }
-            return ack;
-        }
-        
-        public void AfterRollback(ActiveMQMessage message)
-        {
-            // lets redeliver the message again
-            message.RedeliveryCounter += 1;
-            if (message.RedeliveryCounter > MaximumRedeliveryCount)
-            {
-                // lets send back a poisoned pill
-                MessageAck ack = new MessageAck();
-                ack.AckType = (int) AckType.PoisonAck;
-                ack.ConsumerId = info.ConsumerId;
-                ack.Destination = message.Destination;
-                ack.FirstMessageId = message.MessageId;
-                ack.LastMessageId = message.MessageId;
-                ack.MessageCount = 1;
-                session.Connection.OneWay(ack);
-            }
-            else
-            {
-                dispatcher.Redeliver(message);
-            }
-        }
+	public enum AckType
+	{
+		DeliveredAck = 0, // Message delivered but not consumed
+		PoisonAck = 1, // Message could not be processed due to poison pill but discard anyway
+		ConsumedAck = 2 // Message consumed, discard
+	}
+
+
+	/// <summary>
+	/// An object capable of receiving messages from some destination
+	/// </summary>
+	public class MessageConsumer : IMessageConsumer
+	{
+		private readonly AcknowledgementMode acknowledgementMode;
+		private bool closed = false;
+		private readonly Dispatcher dispatcher = new Dispatcher();
+		private readonly ConsumerInfo info;
+		private int maximumRedeliveryCount = 10;
+		private int redeliveryTimeout = 500;
+		private readonly Session session;
+		protected bool disposed = false;
+
+		// Constructor internal to prevent clients from creating an instance.
+		internal MessageConsumer(Session session, ConsumerInfo info,
+		                         AcknowledgementMode acknowledgementMode)
+		{
+			this.session = session;
+			this.info = info;
+			this.acknowledgementMode = acknowledgementMode;
+		}
+
+		~MessageConsumer()
+		{
+			Dispose(false);
+		}
+
+		internal Dispatcher Dispatcher
+		{
+			get { return this.dispatcher; }
+		}
+
+		public ConsumerId ConsumerId
+		{
+			get { return info.ConsumerId; }
+		}
+
+		public int MaximumRedeliveryCount
+		{
+			get { return maximumRedeliveryCount; }
+			set { maximumRedeliveryCount = value; }
+		}
+
+		public int RedeliveryTimeout
+		{
+			get { return redeliveryTimeout; }
+			set { redeliveryTimeout = value; }
+		}
+
+		#region IMessageConsumer Members
+
+		public event MessageListener Listener
+		{
+			add
+			{
+				listener += value;
+				session.StartAsyncDelivery(dispatcher);
+			}
+			remove { listener -= value; }
+		}
+
+
+		public IMessage Receive()
+		{
+			CheckClosed();
+			return AutoClientAcknowledge(dispatcher.Dequeue());
+		}
+
+		public IMessage Receive(System.TimeSpan timeout)
+		{
+			CheckClosed();
+			return AutoClientAcknowledge(dispatcher.Dequeue(timeout));
+		}
+
+		public IMessage ReceiveNoWait()
+		{
+			CheckClosed();
+			return AutoClientAcknowledge(dispatcher.DequeueNoWait());
+		}
+
+		public void Dispose()
+		{
+			Dispose(true);
+			GC.SuppressFinalize(this);
+		}
+
+		protected void Dispose(bool disposing)
+		{
+			if(disposed)
+			{
+				return;
+			}
+
+			if(disposing)
+			{
+				// Dispose managed code here.
+			}
+
+			try
+			{
+				session.Connection.DisposeOf(info.ConsumerId);
+				Close();
+			}
+			catch
+			{
+				// Ignore network errors.
+			}
+
+			disposed = true;
+		}
 
 		public void Close()
 		{
 			lock(this)
 			{
 				if(closed)
+				{
 					return;
+				}
 			}
 
 			// wake up any pending dequeue() call on the dispatcher
 			dispatcher.Close();
 
-			lock (this)
+			lock(this)
 			{
 				closed = true;
 			}
 		}
+
+		#endregion
+
+		private event MessageListener listener;
+
+		public void RedeliverRolledBackMessages()
+		{
+			dispatcher.RedeliverRolledBackMessages();
+		}
+
+		/// <summary>
+		/// Method Dispatch
+		/// </summary>
+		/// <param name="message">An ActiveMQMessage</param>
+		public void Dispatch(ActiveMQMessage message)
+		{
+			dispatcher.Enqueue(message);
+		}
+
+		/// <summary>
+		/// Dispatch any pending messages to the asynchronous listener
+		/// </summary>
+		internal void DispatchAsyncMessages()
+		{
+			while(listener != null)
+			{
+				IMessage message = dispatcher.DequeueNoWait();
+				if(message == null)
+				{
+					break;
+				}
+
+				message = AutoClientAcknowledge(message);
+				// invoke listener. Exceptions caught by the dispatcher thread
+				listener(message);
+			}
+		}
+
+		protected void CheckClosed()
+		{
+			lock(this)
+			{
+				if(closed)
+				{
+					throw new ConnectionClosedException();
+				}
+			}
+		}
+
+		protected IMessage AutoClientAcknowledge(IMessage message)
+		{
+			if(AcknowledgementMode.AutoAcknowledge != acknowledgementMode)
+			{
+				if(message is ActiveMQMessage)
+				{
+					ActiveMQMessage activeMessage = (ActiveMQMessage) message;
+
+					// lets register the handler for client acknowledgment
+					activeMessage.Acknowledger += new AcknowledgeHandler(DoClientAcknowledge);
+				}
+
+				message.Acknowledge();
+			}
+			return message;
+		}
+
+		protected void DoClientAcknowledge(ActiveMQMessage message)
+		{
+			if(AcknowledgementMode.AutoClientAcknowledge == acknowledgementMode
+				|| AcknowledgementMode.DupsOkAcknowledge == acknowledgementMode
+				|| AcknowledgementMode.ClientAcknowledge == acknowledgementMode)
+			{
+				MessageAck ack = CreateMessageAck(message);
+				Tracer.Debug("Sending Ack: " + ack);
+				session.Connection.OneWay(ack);
+			}
+		}
+
+		protected virtual MessageAck CreateMessageAck(Message message)
+		{
+			MessageAck ack = new MessageAck();
+			ack.AckType = (int) AckType.ConsumedAck;
+			ack.ConsumerId = info.ConsumerId;
+			ack.Destination = message.Destination;
+			ack.FirstMessageId = message.MessageId;
+			ack.LastMessageId = message.MessageId;
+			ack.MessageCount = 1;
+
+			if(session.Transacted)
+			{
+				session.DoStartTransaction();
+				ack.TransactionId = session.TransactionContext.TransactionId;
+				session.TransactionContext.AddSynchronization(
+						new MessageConsumerSynchronization(this, message));
+			}
+			return ack;
+		}
+
+		public void AfterRollback(ActiveMQMessage message)
+		{
+			// lets redeliver the message again
+			message.RedeliveryCounter += 1;
+			if(message.RedeliveryCounter > MaximumRedeliveryCount)
+			{
+				// lets send back a poisoned pill
+				MessageAck ack = new MessageAck();
+				ack.AckType = (int) AckType.PoisonAck;
+				ack.ConsumerId = info.ConsumerId;
+				ack.Destination = message.Destination;
+				ack.FirstMessageId = message.MessageId;
+				ack.LastMessageId = message.MessageId;
+				ack.MessageCount = 1;
+				session.Connection.OneWay(ack);
+			}
+			else
+			{
+				dispatcher.Redeliver(message);
+			}
+		}
 	}
 
-    
-    // TODO maybe there's a cleaner way of creating stateful delegates to make this code neater
-    class MessageConsumerSynchronization : ISynchronization
-    {
-        private MessageConsumer consumer;
-        private Message message;
-        
-        public MessageConsumerSynchronization(MessageConsumer consumer, Message message)
-        {
-            this.message = message;
-            this.consumer = consumer;
-        }
-        
-        public void BeforeCommit()
-        {
-        }
-        
-        public void AfterCommit()
-        {
-        }
-        
-        public void AfterRollback()
-        {
-            consumer.AfterRollback((ActiveMQMessage) message);
-        }
-        
-    }
-}
+
+	// TODO maybe there's a cleaner way of creating stateful delegates to make this code neater
+	internal class MessageConsumerSynchronization : ISynchronization
+	{
+		private readonly MessageConsumer consumer;
+		private readonly Message message;
+
+		public MessageConsumerSynchronization(MessageConsumer consumer, Message message)
+		{
+			this.message = message;
+			this.consumer = consumer;
+		}
+
+		#region ISynchronization Members
+
+		public void BeforeCommit()
+		{
+		}
+
+		public void AfterCommit()
+		{
+		}
+
+		public void AfterRollback()
+		{
+			consumer.AfterRollback((ActiveMQMessage) message);
+		}
+
+		#endregion
+	}
+}
\ No newline at end of file

Modified: activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/MessageProducer.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/MessageProducer.cs?rev=589629&r1=589628&r2=589629&view=diff
==============================================================================
--- activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/MessageProducer.cs (original)
+++ activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/MessageProducer.cs Mon Oct 29 06:55:09 2007
@@ -14,56 +14,93 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-using ActiveMQ.Commands;
-using NMS;
+using Apache.ActiveMQ.Commands;
+using Apache.ActiveMQ.Util;
+using Apache.NMS;
 using System;
 
-namespace ActiveMQ
+namespace Apache.ActiveMQ
 {
-    /// <summary>
-    /// An object capable of sending messages to some destination
-    /// </summary>
-    public class MessageProducer : IMessageProducer
-    {
-        private Session session;
-        private ProducerInfo info;
-        private long messageCounter;
-        
-        private bool persistent = NMSConstants.defaultPersistence;
-        private TimeSpan timeToLive;
-		private bool specifiedTimeToLive;
-        private byte priority = NMSConstants.defaultPriority;
-        private bool disableMessageID = false;
-        private bool disableMessageTimestamp = false;
-        
-        public MessageProducer(Session session, ProducerInfo info)
-        {
-            this.session = session;
-            this.info = info;
-        }
-        
-        public void Send(IMessage message)
-        {
-            Send(info.Destination, message);
-        }
-        
-        public void Send(IDestination destination, IMessage message)
-        {
-			Send(destination, message, Persistent, Priority, TimeToLive, specifiedTimeToLive);
-		}
-		
-        public void Send(IMessage message, bool persistent, byte priority, TimeSpan timeToLive)
-        {
+	/// <summary>
+	/// An object capable of sending messages to some destination
+	/// </summary>
+	public class MessageProducer : IMessageProducer
+	{
+		private readonly Session session;
+		private readonly ProducerInfo info;
+		private long messageCounter = 0;
+
+		private bool msgPersistent = NMSConstants.defaultPersistence;
+		private TimeSpan msgTimeToLive;
+		private readonly bool defaultSpecifiedTimeToLive = false;
+		private byte msgPriority = NMSConstants.defaultPriority;
+		private bool disableMessageID = false;
+		private bool disableMessageTimestamp = false;
+		protected bool disposed = false;
+
+		public MessageProducer(Session session, ProducerInfo info)
+		{
+			this.session = session;
+			this.info = info;
+		}
+
+		~MessageProducer()
+		{
+			Dispose(false);
+		}
+
+		public void Dispose()
+		{
+			Dispose(true);
+			GC.SuppressFinalize(this);
+		}
+
+		protected void Dispose(bool disposing)
+		{
+			if(disposed)
+			{
+				return;
+			}
+
+			if(disposing)
+			{
+				// Dispose managed code here.
+			}
+
+			try
+			{
+				session.Connection.DisposeOf(info.ProducerId);
+			}
+			catch
+			{
+				// Ignore network errors.
+			}
+
+			disposed = true;
+		}
+
+		public void Send(IMessage message)
+		{
+			Send(info.Destination, message);
+		}
+
+		public void Send(IDestination destination, IMessage message)
+		{
+			Send(destination, message, Persistent, Priority, TimeToLive, defaultSpecifiedTimeToLive);
+		}
+
+		public void Send(IMessage message, bool persistent, byte priority, TimeSpan timeToLive)
+		{
 			Send(info.Destination, message, persistent, priority, timeToLive);
 		}
-		
-        public void Send(IDestination destination, IMessage message, bool persistent, byte priority, TimeSpan timeToLive)
-        {
+
+		public void Send(IDestination destination, IMessage message, bool persistent, byte priority, TimeSpan timeToLive)
+		{
 			Send(destination, message, persistent, priority, timeToLive, true);
 		}
-		
-        public void Send(IDestination destination, IMessage message, bool persistent, byte priority, TimeSpan timeToLive, bool specifiedTimeToLive)
-        {
+
+		protected void Send(IDestination destination, IMessage message, bool persistent, byte priority, TimeSpan timeToLive, bool specifiedTimeToLive)
+		{
 			ActiveMQMessage activeMessage = (ActiveMQMessage)message;
 
 			if (!disableMessageID)
@@ -74,104 +111,97 @@
 				{
 					id.ProducerSequenceId = ++messageCounter;
 				}
+
 				activeMessage.MessageId = id;
 			}
 
-			if (!disableMessageTimestamp && specifiedTimeToLive)
+			activeMessage.ProducerId = info.ProducerId;
+			activeMessage.FromDestination = destination;
+			activeMessage.NMSPersistent = persistent;
+			activeMessage.NMSPriority = priority;
+
+			if (session.Transacted)
 			{
-				Console.WriteLine(">>> sending message with Timestamp: " + activeMessage.Timestamp + " and timeToLive:  " + timeToLive);
-				activeMessage.Timestamp = ActiveMQ.Util.DateUtils.ToJavaTime(DateTime.UtcNow);
+				session.DoStartTransaction();
+				activeMessage.TransactionId = session.TransactionContext.TransactionId;
 			}
-			
+
 			if (specifiedTimeToLive)
 			{
-				activeMessage.Expiration = ActiveMQ.Util.DateUtils.ToJavaTime(timeToLive);
+				activeMessage.NMSTimeToLive = timeToLive;
+			}
+
+			if (!disableMessageTimestamp)
+			{
+				activeMessage.NMSTimestamp = DateTime.UtcNow;
 			}
-				
-            activeMessage.ProducerId = info.ProducerId;
-            activeMessage.Destination = ActiveMQDestination.Transform(destination);
-            
-            if (session.Transacted)
-            {
-                session.DoStartTransaction();
-                activeMessage.TransactionId = session.TransactionContext.TransactionId;
-            }
-			
-			activeMessage.Persistent = persistent;
-			activeMessage.Priority = priority;
-			activeMessage.Destination = ActiveMQDestination.Transform(destination);
-		    
-            session.DoSend(activeMessage);
-        }
-        
-        public void Dispose()
-        {
-            session.Connection.DisposeOf(info.ProducerId);
-        }
-        
-        public bool Persistent
-        {
-            get { return persistent; }
-            set { this.persistent = value; }
-        }
-
-        public TimeSpan TimeToLive
-        {
-            get { return timeToLive; }
-            set { this.timeToLive = value; }
-        }
-
-        public byte Priority
-        {
-            get { return priority; }
-            set { this.priority = value; }
-        }
-        
-        public bool DisableMessageID
-        {
-            get { return disableMessageID; }
-            set { this.disableMessageID = value; }
-        }
-        
-        public bool DisableMessageTimestamp
-        {
-            get { return disableMessageTimestamp; }
-            set { this.disableMessageTimestamp = value; }
-        }
-        
+
+			session.DoSend(activeMessage);
+		}
+
+		public bool Persistent
+		{
+			get { return msgPersistent; }
+			set { this.msgPersistent = value; }
+		}
+
+		public TimeSpan TimeToLive
+		{
+			get { return msgTimeToLive; }
+			set { this.msgTimeToLive = value; }
+		}
+
+		public byte Priority
+		{
+			get { return msgPriority; }
+			set { this.msgPriority = value; }
+		}
+
+		public bool DisableMessageID
+		{
+			get { return disableMessageID; }
+			set { this.disableMessageID = value; }
+		}
+
+		public bool DisableMessageTimestamp
+		{
+			get { return disableMessageTimestamp; }
+			set { this.disableMessageTimestamp = value; }
+		}
+
 		public IMessage CreateMessage()
 		{
 			return session.CreateMessage();
 		}
-		
+
 		public ITextMessage CreateTextMessage()
 		{
 			return session.CreateTextMessage();
 		}
-		
-		public ITextMessage CreateTextMessage(String text)
+
+		public ITextMessage CreateTextMessage(string text)
 		{
 			return session.CreateTextMessage(text);
 		}
-		
+
 		public IMapMessage CreateMapMessage()
 		{
 			return session.CreateMapMessage();
 		}
-		
-		public IObjectMessage CreateObjectMessage(Object body)
+
+		public IObjectMessage CreateObjectMessage(object body)
 		{
 			return session.CreateObjectMessage(body);
 		}
-		
+
 		public IBytesMessage CreateBytesMessage()
 		{
 			return session.CreateBytesMessage();
 		}
-		
+
 		public IBytesMessage CreateBytesMessage(byte[] body)
 		{
 			return session.CreateBytesMessage(body);
 		}
-    }
+	}
 }

Modified: activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/BaseDataStreamMarshaller.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/BaseDataStreamMarshaller.cs?rev=589629&r1=589628&r2=589629&view=diff
==============================================================================
--- activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/BaseDataStreamMarshaller.cs (original)
+++ activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/BaseDataStreamMarshaller.cs Mon Oct 29 06:55:09 2007
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-using ActiveMQ.Commands;
+using Apache.ActiveMQ.Commands;
 using System;
 using System.Collections;
 using System.IO;
 using System.Text;
 
-namespace ActiveMQ.OpenWire
+namespace Apache.ActiveMQ.OpenWire
 
 {
     /// <summary>

Modified: activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/BooleanStream.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/BooleanStream.cs?rev=589629&r1=589628&r2=589629&view=diff
==============================================================================
--- activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/BooleanStream.cs (original)
+++ activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/BooleanStream.cs Mon Oct 29 06:55:09 2007
@@ -17,9 +17,9 @@
 using System;
 using System.IO;
 
-using ActiveMQ.OpenWire;
+using Apache.ActiveMQ.OpenWire;
 
-namespace ActiveMQ.OpenWire
+namespace Apache.ActiveMQ.OpenWire
 
 {
     /// <summary>

Modified: activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/EndianSupport.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/EndianSupport.cs?rev=589629&r1=589628&r2=589629&view=diff
==============================================================================
--- activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/EndianSupport.cs (original)
+++ activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/EndianSupport.cs Mon Oct 29 06:55:09 2007
@@ -17,7 +17,7 @@
 using System.IO;
 using System;
 
-namespace ActiveMQ.OpenWire
+namespace Apache.ActiveMQ.OpenWire
 {
 	/// <summary>
 	/// Support class that switches from one endian to the other.

Modified: activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/IMarshallerFactory.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/IMarshallerFactory.cs?rev=589629&r1=589628&r2=589629&view=diff
==============================================================================
--- activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/IMarshallerFactory.cs (original)
+++ activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/IMarshallerFactory.cs Mon Oct 29 06:55:09 2007
@@ -16,9 +16,9 @@
  */
 using System;
 using System.Text;
-using ActiveMQ.OpenWire;
+using Apache.ActiveMQ.OpenWire;
 
-namespace ActiveMQ.OpenWire
+namespace Apache.ActiveMQ.OpenWire
 {
     interface IMarshallerFactory
     {

Modified: activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/MessagePropertyHelper.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/MessagePropertyHelper.cs?rev=589629&r1=589628&r2=589629&view=diff
==============================================================================
--- activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/MessagePropertyHelper.cs (original)
+++ activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/MessagePropertyHelper.cs Mon Oct 29 06:55:09 2007
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
 */
-using ActiveMQ.Commands;
+using Apache.ActiveMQ.Commands;
 using System.Collections;
 
-namespace ActiveMQ.OpenWire
+namespace Apache.ActiveMQ.OpenWire
 {
     public delegate object PropertyGetter(ActiveMQMessage message);
     public delegate void PropertySetter(ActiveMQMessage message, object value);

Modified: activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/OpenWireBinaryReader.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/OpenWireBinaryReader.cs?rev=589629&r1=589628&r2=589629&view=diff
==============================================================================
--- activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/OpenWireBinaryReader.cs (original)
+++ activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/OpenWireBinaryReader.cs Mon Oct 29 06:55:09 2007
@@ -18,7 +18,7 @@
 using System.IO;
 using System.Text;
 
-namespace ActiveMQ.OpenWire
+namespace Apache.ActiveMQ.OpenWire
 {
     /// <summary>
 	/// A BinaryWriter that switches the endian orientation of the read opperations so that they

Modified: activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/OpenWireBinaryWriter.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/OpenWireBinaryWriter.cs?rev=589629&r1=589628&r2=589629&view=diff
==============================================================================
--- activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/OpenWireBinaryWriter.cs (original)
+++ activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/OpenWireBinaryWriter.cs Mon Oct 29 06:55:09 2007
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-using ActiveMQ.Commands;
+using Apache.ActiveMQ.Commands;
 using System;
 using System.Collections;
 using System.IO;
 using System.Text;
 
-namespace ActiveMQ.OpenWire
+namespace Apache.ActiveMQ.OpenWire
 {
     /// <summary>
 	/// A BinaryWriter that switches the endian orientation of the write opperations so that they

Modified: activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/OpenWireFormat.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/OpenWireFormat.cs?rev=589629&r1=589628&r2=589629&view=diff
==============================================================================
--- activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/OpenWireFormat.cs (original)
+++ activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/OpenWireFormat.cs Mon Oct 29 06:55:09 2007
@@ -15,13 +15,14 @@
  * limitations under the License.
  */
 using System.Reflection;
-using ActiveMQ.Commands;
-using ActiveMQ.OpenWire.V1;
-using ActiveMQ.Transport;
+using Apache.ActiveMQ.Commands;
+using Apache.ActiveMQ.OpenWire.V1;
+using Apache.ActiveMQ.Transport;
 using System;
 using System.IO;
+using Apache.NMS;
 
-namespace ActiveMQ.OpenWire
+namespace Apache.ActiveMQ.OpenWire
 {
     /// <summary>
     /// Implements the <a href="http://activemq.apache.org/openwire.html">OpenWire</a> protocol.
@@ -171,7 +172,7 @@
                 BaseDataStreamMarshaller dsm = dataMarshallers[dataType & 0xFF];
                 if (dsm == null)
                     throw new IOException("Unknown data type: " + dataType);
-                //Console.WriteLine("Parsing type: " + dataType + " with: " + dsm);
+                Tracer.Debug("Parsing type: " + dataType + " with: " + dsm);
                 Object data = dsm.CreateObject();
 				
 				if(tightEncodingEnabled) {
@@ -214,7 +215,7 @@
             BaseDataStreamMarshaller dsm = (BaseDataStreamMarshaller) dataMarshallers[type & 0xFF];
             if (dsm == null)
                 throw new IOException("Unknown data type: " + type);
-            //Console.WriteLine("Marshalling type: " + type + " with structure: " + o);
+            Tracer.Debug("Marshalling type: " + type + " with structure: " + o);
             return 1 + dsm.TightMarshal1(this, o, bs);
         }
         

Modified: activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/PrimitiveMap.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/PrimitiveMap.cs?rev=589629&r1=589628&r2=589629&view=diff
==============================================================================
--- activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/PrimitiveMap.cs (original)
+++ activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/PrimitiveMap.cs Mon Oct 29 06:55:09 2007
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
 */
-using NMS;
+using Apache.NMS;
 using System;
 using System.Collections;
 using System.IO;
 
-namespace ActiveMQ.OpenWire
+namespace Apache.ActiveMQ.OpenWire
 {
     /// <summary>
     /// A default implementation of IPrimitiveMap
@@ -94,6 +94,10 @@
         public string GetString(string key)
         {
             Object value = GetValue(key);
+			if( value == null )
+			{
+				return null;
+			}
             CheckValueType(value, typeof(string));
             return (string) value;
         }
@@ -485,6 +489,9 @@
             byte type = dataIn.ReadByte();
             switch (type)
             {
+                case NULL:
+                    value = null;
+                    break;
                 case BYTE_TYPE:
                     value = dataIn.ReadByte();
                     break;

Modified: activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQBytesMessageMarshaller.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQBytesMessageMarshaller.cs?rev=589629&r1=589628&r2=589629&view=diff
==============================================================================
--- activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQBytesMessageMarshaller.cs (original)
+++ activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQBytesMessageMarshaller.cs Mon Oct 29 06:55:09 2007
@@ -25,11 +25,11 @@
 using System.Collections;
 using System.IO;
 
-using ActiveMQ.Commands;
-using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.V1;
+using Apache.ActiveMQ.Commands;
+using Apache.ActiveMQ.OpenWire;
+using Apache.ActiveMQ.OpenWire.V1;
 
-namespace ActiveMQ.OpenWire.V1
+namespace Apache.ActiveMQ.OpenWire.V1
 {
   /// <summary>
   ///  Marshalling code for Open Wire Format for ActiveMQBytesMessage

Modified: activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQDestinationMarshaller.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQDestinationMarshaller.cs?rev=589629&r1=589628&r2=589629&view=diff
==============================================================================
--- activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQDestinationMarshaller.cs (original)
+++ activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQDestinationMarshaller.cs Mon Oct 29 06:55:09 2007
@@ -25,11 +25,11 @@
 using System.Collections;
 using System.IO;
 
-using ActiveMQ.Commands;
-using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.V1;
+using Apache.ActiveMQ.Commands;
+using Apache.ActiveMQ.OpenWire;
+using Apache.ActiveMQ.OpenWire.V1;
 
-namespace ActiveMQ.OpenWire.V1
+namespace Apache.ActiveMQ.OpenWire.V1
 {
   /// <summary>
   ///  Marshalling code for Open Wire Format for ActiveMQDestination

Modified: activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQMapMessageMarshaller.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQMapMessageMarshaller.cs?rev=589629&r1=589628&r2=589629&view=diff
==============================================================================
--- activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQMapMessageMarshaller.cs (original)
+++ activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQMapMessageMarshaller.cs Mon Oct 29 06:55:09 2007
@@ -25,11 +25,11 @@
 using System.Collections;
 using System.IO;
 
-using ActiveMQ.Commands;
-using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.V1;
+using Apache.ActiveMQ.Commands;
+using Apache.ActiveMQ.OpenWire;
+using Apache.ActiveMQ.OpenWire.V1;
 
-namespace ActiveMQ.OpenWire.V1
+namespace Apache.ActiveMQ.OpenWire.V1
 {
   /// <summary>
   ///  Marshalling code for Open Wire Format for ActiveMQMapMessage

Modified: activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQMessageMarshaller.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQMessageMarshaller.cs?rev=589629&r1=589628&r2=589629&view=diff
==============================================================================
--- activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQMessageMarshaller.cs (original)
+++ activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQMessageMarshaller.cs Mon Oct 29 06:55:09 2007
@@ -25,11 +25,11 @@
 using System.Collections;
 using System.IO;
 
-using ActiveMQ.Commands;
-using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.V1;
+using Apache.ActiveMQ.Commands;
+using Apache.ActiveMQ.OpenWire;
+using Apache.ActiveMQ.OpenWire.V1;
 
-namespace ActiveMQ.OpenWire.V1
+namespace Apache.ActiveMQ.OpenWire.V1
 {
   /// <summary>
   ///  Marshalling code for Open Wire Format for ActiveMQMessage

Modified: activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQObjectMessageMarshaller.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQObjectMessageMarshaller.cs?rev=589629&r1=589628&r2=589629&view=diff
==============================================================================
--- activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQObjectMessageMarshaller.cs (original)
+++ activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQObjectMessageMarshaller.cs Mon Oct 29 06:55:09 2007
@@ -25,11 +25,11 @@
 using System.Collections;
 using System.IO;
 
-using ActiveMQ.Commands;
-using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.V1;
+using Apache.ActiveMQ.Commands;
+using Apache.ActiveMQ.OpenWire;
+using Apache.ActiveMQ.OpenWire.V1;
 
-namespace ActiveMQ.OpenWire.V1
+namespace Apache.ActiveMQ.OpenWire.V1
 {
   /// <summary>
   ///  Marshalling code for Open Wire Format for ActiveMQObjectMessage

Modified: activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQQueueMarshaller.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQQueueMarshaller.cs?rev=589629&r1=589628&r2=589629&view=diff
==============================================================================
--- activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQQueueMarshaller.cs (original)
+++ activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQQueueMarshaller.cs Mon Oct 29 06:55:09 2007
@@ -25,11 +25,11 @@
 using System.Collections;
 using System.IO;
 
-using ActiveMQ.Commands;
-using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.V1;
+using Apache.ActiveMQ.Commands;
+using Apache.ActiveMQ.OpenWire;
+using Apache.ActiveMQ.OpenWire.V1;
 
-namespace ActiveMQ.OpenWire.V1
+namespace Apache.ActiveMQ.OpenWire.V1
 {
   /// <summary>
   ///  Marshalling code for Open Wire Format for ActiveMQQueue

Modified: activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQStreamMessageMarshaller.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQStreamMessageMarshaller.cs?rev=589629&r1=589628&r2=589629&view=diff
==============================================================================
--- activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQStreamMessageMarshaller.cs (original)
+++ activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQStreamMessageMarshaller.cs Mon Oct 29 06:55:09 2007
@@ -25,11 +25,11 @@
 using System.Collections;
 using System.IO;
 
-using ActiveMQ.Commands;
-using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.V1;
+using Apache.ActiveMQ.Commands;
+using Apache.ActiveMQ.OpenWire;
+using Apache.ActiveMQ.OpenWire.V1;
 
-namespace ActiveMQ.OpenWire.V1
+namespace Apache.ActiveMQ.OpenWire.V1
 {
   /// <summary>
   ///  Marshalling code for Open Wire Format for ActiveMQStreamMessage

Modified: activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQTempDestinationMarshaller.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQTempDestinationMarshaller.cs?rev=589629&r1=589628&r2=589629&view=diff
==============================================================================
--- activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQTempDestinationMarshaller.cs (original)
+++ activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQTempDestinationMarshaller.cs Mon Oct 29 06:55:09 2007
@@ -25,11 +25,11 @@
 using System.Collections;
 using System.IO;
 
-using ActiveMQ.Commands;
-using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.V1;
+using Apache.ActiveMQ.Commands;
+using Apache.ActiveMQ.OpenWire;
+using Apache.ActiveMQ.OpenWire.V1;
 
-namespace ActiveMQ.OpenWire.V1
+namespace Apache.ActiveMQ.OpenWire.V1
 {
   /// <summary>
   ///  Marshalling code for Open Wire Format for ActiveMQTempDestination

Modified: activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQTempQueueMarshaller.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQTempQueueMarshaller.cs?rev=589629&r1=589628&r2=589629&view=diff
==============================================================================
--- activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQTempQueueMarshaller.cs (original)
+++ activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQTempQueueMarshaller.cs Mon Oct 29 06:55:09 2007
@@ -25,11 +25,11 @@
 using System.Collections;
 using System.IO;
 
-using ActiveMQ.Commands;
-using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.V1;
+using Apache.ActiveMQ.Commands;
+using Apache.ActiveMQ.OpenWire;
+using Apache.ActiveMQ.OpenWire.V1;
 
-namespace ActiveMQ.OpenWire.V1
+namespace Apache.ActiveMQ.OpenWire.V1
 {
   /// <summary>
   ///  Marshalling code for Open Wire Format for ActiveMQTempQueue

Modified: activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQTempTopicMarshaller.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQTempTopicMarshaller.cs?rev=589629&r1=589628&r2=589629&view=diff
==============================================================================
--- activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQTempTopicMarshaller.cs (original)
+++ activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQTempTopicMarshaller.cs Mon Oct 29 06:55:09 2007
@@ -25,11 +25,11 @@
 using System.Collections;
 using System.IO;
 
-using ActiveMQ.Commands;
-using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.V1;
+using Apache.ActiveMQ.Commands;
+using Apache.ActiveMQ.OpenWire;
+using Apache.ActiveMQ.OpenWire.V1;
 
-namespace ActiveMQ.OpenWire.V1
+namespace Apache.ActiveMQ.OpenWire.V1
 {
   /// <summary>
   ///  Marshalling code for Open Wire Format for ActiveMQTempTopic

Modified: activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQTextMessageMarshaller.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQTextMessageMarshaller.cs?rev=589629&r1=589628&r2=589629&view=diff
==============================================================================
--- activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQTextMessageMarshaller.cs (original)
+++ activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQTextMessageMarshaller.cs Mon Oct 29 06:55:09 2007
@@ -25,11 +25,11 @@
 using System.Collections;
 using System.IO;
 
-using ActiveMQ.Commands;
-using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.V1;
+using Apache.ActiveMQ.Commands;
+using Apache.ActiveMQ.OpenWire;
+using Apache.ActiveMQ.OpenWire.V1;
 
-namespace ActiveMQ.OpenWire.V1
+namespace Apache.ActiveMQ.OpenWire.V1
 {
   /// <summary>
   ///  Marshalling code for Open Wire Format for ActiveMQTextMessage

Modified: activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQTopicMarshaller.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQTopicMarshaller.cs?rev=589629&r1=589628&r2=589629&view=diff
==============================================================================
--- activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQTopicMarshaller.cs (original)
+++ activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQTopicMarshaller.cs Mon Oct 29 06:55:09 2007
@@ -25,11 +25,11 @@
 using System.Collections;
 using System.IO;
 
-using ActiveMQ.Commands;
-using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.V1;
+using Apache.ActiveMQ.Commands;
+using Apache.ActiveMQ.OpenWire;
+using Apache.ActiveMQ.OpenWire.V1;
 
-namespace ActiveMQ.OpenWire.V1
+namespace Apache.ActiveMQ.OpenWire.V1
 {
   /// <summary>
   ///  Marshalling code for Open Wire Format for ActiveMQTopic

Modified: activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/BaseCommandMarshaller.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/BaseCommandMarshaller.cs?rev=589629&r1=589628&r2=589629&view=diff
==============================================================================
--- activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/BaseCommandMarshaller.cs (original)
+++ activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/BaseCommandMarshaller.cs Mon Oct 29 06:55:09 2007
@@ -25,11 +25,11 @@
 using System.Collections;
 using System.IO;
 
-using ActiveMQ.Commands;
-using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.V1;
+using Apache.ActiveMQ.Commands;
+using Apache.ActiveMQ.OpenWire;
+using Apache.ActiveMQ.OpenWire.V1;
 
-namespace ActiveMQ.OpenWire.V1
+namespace Apache.ActiveMQ.OpenWire.V1
 {
   /// <summary>
   ///  Marshalling code for Open Wire Format for BaseCommand

Modified: activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/BrokerIdMarshaller.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/BrokerIdMarshaller.cs?rev=589629&r1=589628&r2=589629&view=diff
==============================================================================
--- activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/BrokerIdMarshaller.cs (original)
+++ activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/BrokerIdMarshaller.cs Mon Oct 29 06:55:09 2007
@@ -25,11 +25,11 @@
 using System.Collections;
 using System.IO;
 
-using ActiveMQ.Commands;
-using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.V1;
+using Apache.ActiveMQ.Commands;
+using Apache.ActiveMQ.OpenWire;
+using Apache.ActiveMQ.OpenWire.V1;
 
-namespace ActiveMQ.OpenWire.V1
+namespace Apache.ActiveMQ.OpenWire.V1
 {
   /// <summary>
   ///  Marshalling code for Open Wire Format for BrokerId

Modified: activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/BrokerInfoMarshaller.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/BrokerInfoMarshaller.cs?rev=589629&r1=589628&r2=589629&view=diff
==============================================================================
--- activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/BrokerInfoMarshaller.cs (original)
+++ activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/BrokerInfoMarshaller.cs Mon Oct 29 06:55:09 2007
@@ -25,11 +25,11 @@
 using System.Collections;
 using System.IO;
 
-using ActiveMQ.Commands;
-using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.V1;
+using Apache.ActiveMQ.Commands;
+using Apache.ActiveMQ.OpenWire;
+using Apache.ActiveMQ.OpenWire.V1;
 
-namespace ActiveMQ.OpenWire.V1
+namespace Apache.ActiveMQ.OpenWire.V1
 {
   /// <summary>
   ///  Marshalling code for Open Wire Format for BrokerInfo

Modified: activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/ConnectionControlMarshaller.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/ConnectionControlMarshaller.cs?rev=589629&r1=589628&r2=589629&view=diff
==============================================================================
--- activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/ConnectionControlMarshaller.cs (original)
+++ activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/ConnectionControlMarshaller.cs Mon Oct 29 06:55:09 2007
@@ -25,11 +25,11 @@
 using System.Collections;
 using System.IO;
 
-using ActiveMQ.Commands;
-using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.V1;
+using Apache.ActiveMQ.Commands;
+using Apache.ActiveMQ.OpenWire;
+using Apache.ActiveMQ.OpenWire.V1;
 
-namespace ActiveMQ.OpenWire.V1
+namespace Apache.ActiveMQ.OpenWire.V1
 {
   /// <summary>
   ///  Marshalling code for Open Wire Format for ConnectionControl

Modified: activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/ConnectionErrorMarshaller.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/ConnectionErrorMarshaller.cs?rev=589629&r1=589628&r2=589629&view=diff
==============================================================================
--- activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/ConnectionErrorMarshaller.cs (original)
+++ activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/ConnectionErrorMarshaller.cs Mon Oct 29 06:55:09 2007
@@ -25,11 +25,11 @@
 using System.Collections;
 using System.IO;
 
-using ActiveMQ.Commands;
-using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.V1;
+using Apache.ActiveMQ.Commands;
+using Apache.ActiveMQ.OpenWire;
+using Apache.ActiveMQ.OpenWire.V1;
 
-namespace ActiveMQ.OpenWire.V1
+namespace Apache.ActiveMQ.OpenWire.V1
 {
   /// <summary>
   ///  Marshalling code for Open Wire Format for ConnectionError

Modified: activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/ConnectionIdMarshaller.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/ConnectionIdMarshaller.cs?rev=589629&r1=589628&r2=589629&view=diff
==============================================================================
--- activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/ConnectionIdMarshaller.cs (original)
+++ activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/ConnectionIdMarshaller.cs Mon Oct 29 06:55:09 2007
@@ -25,11 +25,11 @@
 using System.Collections;
 using System.IO;
 
-using ActiveMQ.Commands;
-using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.V1;
+using Apache.ActiveMQ.Commands;
+using Apache.ActiveMQ.OpenWire;
+using Apache.ActiveMQ.OpenWire.V1;
 
-namespace ActiveMQ.OpenWire.V1
+namespace Apache.ActiveMQ.OpenWire.V1
 {
   /// <summary>
   ///  Marshalling code for Open Wire Format for ConnectionId

Modified: activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/ConnectionInfoMarshaller.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/ConnectionInfoMarshaller.cs?rev=589629&r1=589628&r2=589629&view=diff
==============================================================================
--- activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/ConnectionInfoMarshaller.cs (original)
+++ activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/ConnectionInfoMarshaller.cs Mon Oct 29 06:55:09 2007
@@ -25,11 +25,11 @@
 using System.Collections;
 using System.IO;
 
-using ActiveMQ.Commands;
-using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.V1;
+using Apache.ActiveMQ.Commands;
+using Apache.ActiveMQ.OpenWire;
+using Apache.ActiveMQ.OpenWire.V1;
 
-namespace ActiveMQ.OpenWire.V1
+namespace Apache.ActiveMQ.OpenWire.V1
 {
   /// <summary>
   ///  Marshalling code for Open Wire Format for ConnectionInfo

Modified: activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/ConsumerControlMarshaller.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/ConsumerControlMarshaller.cs?rev=589629&r1=589628&r2=589629&view=diff
==============================================================================
--- activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/ConsumerControlMarshaller.cs (original)
+++ activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/ConsumerControlMarshaller.cs Mon Oct 29 06:55:09 2007
@@ -25,11 +25,11 @@
 using System.Collections;
 using System.IO;
 
-using ActiveMQ.Commands;
-using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.V1;
+using Apache.ActiveMQ.Commands;
+using Apache.ActiveMQ.OpenWire;
+using Apache.ActiveMQ.OpenWire.V1;
 
-namespace ActiveMQ.OpenWire.V1
+namespace Apache.ActiveMQ.OpenWire.V1
 {
   /// <summary>
   ///  Marshalling code for Open Wire Format for ConsumerControl

Modified: activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/ConsumerIdMarshaller.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/ConsumerIdMarshaller.cs?rev=589629&r1=589628&r2=589629&view=diff
==============================================================================
--- activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/ConsumerIdMarshaller.cs (original)
+++ activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/ConsumerIdMarshaller.cs Mon Oct 29 06:55:09 2007
@@ -25,11 +25,11 @@
 using System.Collections;
 using System.IO;
 
-using ActiveMQ.Commands;
-using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.V1;
+using Apache.ActiveMQ.Commands;
+using Apache.ActiveMQ.OpenWire;
+using Apache.ActiveMQ.OpenWire.V1;
 
-namespace ActiveMQ.OpenWire.V1
+namespace Apache.ActiveMQ.OpenWire.V1
 {
   /// <summary>
   ///  Marshalling code for Open Wire Format for ConsumerId

Modified: activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/ConsumerInfoMarshaller.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/ConsumerInfoMarshaller.cs?rev=589629&r1=589628&r2=589629&view=diff
==============================================================================
--- activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/ConsumerInfoMarshaller.cs (original)
+++ activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/ConsumerInfoMarshaller.cs Mon Oct 29 06:55:09 2007
@@ -25,11 +25,11 @@
 using System.Collections;
 using System.IO;
 
-using ActiveMQ.Commands;
-using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.V1;
+using Apache.ActiveMQ.Commands;
+using Apache.ActiveMQ.OpenWire;
+using Apache.ActiveMQ.OpenWire.V1;
 
-namespace ActiveMQ.OpenWire.V1
+namespace Apache.ActiveMQ.OpenWire.V1
 {
   /// <summary>
   ///  Marshalling code for Open Wire Format for ConsumerInfo

Modified: activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/ControlCommandMarshaller.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/ControlCommandMarshaller.cs?rev=589629&r1=589628&r2=589629&view=diff
==============================================================================
--- activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/ControlCommandMarshaller.cs (original)
+++ activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/ControlCommandMarshaller.cs Mon Oct 29 06:55:09 2007
@@ -25,11 +25,11 @@
 using System.Collections;
 using System.IO;
 
-using ActiveMQ.Commands;
-using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.V1;
+using Apache.ActiveMQ.Commands;
+using Apache.ActiveMQ.OpenWire;
+using Apache.ActiveMQ.OpenWire.V1;
 
-namespace ActiveMQ.OpenWire.V1
+namespace Apache.ActiveMQ.OpenWire.V1
 {
   /// <summary>
   ///  Marshalling code for Open Wire Format for ControlCommand

Modified: activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/DataArrayResponseMarshaller.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/DataArrayResponseMarshaller.cs?rev=589629&r1=589628&r2=589629&view=diff
==============================================================================
--- activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/DataArrayResponseMarshaller.cs (original)
+++ activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/DataArrayResponseMarshaller.cs Mon Oct 29 06:55:09 2007
@@ -25,11 +25,11 @@
 using System.Collections;
 using System.IO;
 
-using ActiveMQ.Commands;
-using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.V1;
+using Apache.ActiveMQ.Commands;
+using Apache.ActiveMQ.OpenWire;
+using Apache.ActiveMQ.OpenWire.V1;
 
-namespace ActiveMQ.OpenWire.V1
+namespace Apache.ActiveMQ.OpenWire.V1
 {
   /// <summary>
   ///  Marshalling code for Open Wire Format for DataArrayResponse

Modified: activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/DataResponseMarshaller.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/DataResponseMarshaller.cs?rev=589629&r1=589628&r2=589629&view=diff
==============================================================================
--- activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/DataResponseMarshaller.cs (original)
+++ activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/DataResponseMarshaller.cs Mon Oct 29 06:55:09 2007
@@ -25,11 +25,11 @@
 using System.Collections;
 using System.IO;
 
-using ActiveMQ.Commands;
-using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.V1;
+using Apache.ActiveMQ.Commands;
+using Apache.ActiveMQ.OpenWire;
+using Apache.ActiveMQ.OpenWire.V1;
 
-namespace ActiveMQ.OpenWire.V1
+namespace Apache.ActiveMQ.OpenWire.V1
 {
   /// <summary>
   ///  Marshalling code for Open Wire Format for DataResponse

Modified: activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/DataStructureSupportMarshaller.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/DataStructureSupportMarshaller.cs?rev=589629&r1=589628&r2=589629&view=diff
==============================================================================
--- activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/DataStructureSupportMarshaller.cs (original)
+++ activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/DataStructureSupportMarshaller.cs Mon Oct 29 06:55:09 2007
@@ -16,11 +16,11 @@
  * limitations under the License.
  */
 
-using ActiveMQ.Commands;
+using Apache.ActiveMQ.Commands;
 using System;
 using System.IO;
 
-namespace ActiveMQ.OpenWire.V1
+namespace Apache.ActiveMQ.OpenWire.V1
 {
   //
   //  Marshalling code for Open Wire Format for DataStructureSupport

Modified: activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/DestinationInfoMarshaller.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/DestinationInfoMarshaller.cs?rev=589629&r1=589628&r2=589629&view=diff
==============================================================================
--- activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/DestinationInfoMarshaller.cs (original)
+++ activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/DestinationInfoMarshaller.cs Mon Oct 29 06:55:09 2007
@@ -25,11 +25,11 @@
 using System.Collections;
 using System.IO;
 
-using ActiveMQ.Commands;
-using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.V1;
+using Apache.ActiveMQ.Commands;
+using Apache.ActiveMQ.OpenWire;
+using Apache.ActiveMQ.OpenWire.V1;
 
-namespace ActiveMQ.OpenWire.V1
+namespace Apache.ActiveMQ.OpenWire.V1
 {
   /// <summary>
   ///  Marshalling code for Open Wire Format for DestinationInfo

Modified: activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/DiscoveryEventMarshaller.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/DiscoveryEventMarshaller.cs?rev=589629&r1=589628&r2=589629&view=diff
==============================================================================
--- activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/DiscoveryEventMarshaller.cs (original)
+++ activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/DiscoveryEventMarshaller.cs Mon Oct 29 06:55:09 2007
@@ -25,11 +25,11 @@
 using System.Collections;
 using System.IO;
 
-using ActiveMQ.Commands;
-using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.V1;
+using Apache.ActiveMQ.Commands;
+using Apache.ActiveMQ.OpenWire;
+using Apache.ActiveMQ.OpenWire.V1;
 
-namespace ActiveMQ.OpenWire.V1
+namespace Apache.ActiveMQ.OpenWire.V1
 {
   /// <summary>
   ///  Marshalling code for Open Wire Format for DiscoveryEvent

Modified: activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/ExceptionResponseMarshaller.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/ExceptionResponseMarshaller.cs?rev=589629&r1=589628&r2=589629&view=diff
==============================================================================
--- activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/ExceptionResponseMarshaller.cs (original)
+++ activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/ExceptionResponseMarshaller.cs Mon Oct 29 06:55:09 2007
@@ -25,11 +25,11 @@
 using System.Collections;
 using System.IO;
 
-using ActiveMQ.Commands;
-using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.V1;
+using Apache.ActiveMQ.Commands;
+using Apache.ActiveMQ.OpenWire;
+using Apache.ActiveMQ.OpenWire.V1;
 
-namespace ActiveMQ.OpenWire.V1
+namespace Apache.ActiveMQ.OpenWire.V1
 {
   /// <summary>
   ///  Marshalling code for Open Wire Format for ExceptionResponse

Modified: activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/FlushCommandMarshaller.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/FlushCommandMarshaller.cs?rev=589629&r1=589628&r2=589629&view=diff
==============================================================================
--- activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/FlushCommandMarshaller.cs (original)
+++ activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/FlushCommandMarshaller.cs Mon Oct 29 06:55:09 2007
@@ -25,11 +25,11 @@
 using System.Collections;
 using System.IO;
 
-using ActiveMQ.Commands;
-using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.V1;
+using Apache.ActiveMQ.Commands;
+using Apache.ActiveMQ.OpenWire;
+using Apache.ActiveMQ.OpenWire.V1;
 
-namespace ActiveMQ.OpenWire.V1
+namespace Apache.ActiveMQ.OpenWire.V1
 {
   /// <summary>
   ///  Marshalling code for Open Wire Format for FlushCommand

Modified: activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/IntegerResponseMarshaller.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/IntegerResponseMarshaller.cs?rev=589629&r1=589628&r2=589629&view=diff
==============================================================================
--- activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/IntegerResponseMarshaller.cs (original)
+++ activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/IntegerResponseMarshaller.cs Mon Oct 29 06:55:09 2007
@@ -25,11 +25,11 @@
 using System.Collections;
 using System.IO;
 
-using ActiveMQ.Commands;
-using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.V1;
+using Apache.ActiveMQ.Commands;
+using Apache.ActiveMQ.OpenWire;
+using Apache.ActiveMQ.OpenWire.V1;
 
-namespace ActiveMQ.OpenWire.V1
+namespace Apache.ActiveMQ.OpenWire.V1
 {
   /// <summary>
   ///  Marshalling code for Open Wire Format for IntegerResponse

Modified: activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/JournalQueueAckMarshaller.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/JournalQueueAckMarshaller.cs?rev=589629&r1=589628&r2=589629&view=diff
==============================================================================
--- activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/JournalQueueAckMarshaller.cs (original)
+++ activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/JournalQueueAckMarshaller.cs Mon Oct 29 06:55:09 2007
@@ -25,11 +25,11 @@
 using System.Collections;
 using System.IO;
 
-using ActiveMQ.Commands;
-using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.V1;
+using Apache.ActiveMQ.Commands;
+using Apache.ActiveMQ.OpenWire;
+using Apache.ActiveMQ.OpenWire.V1;
 
-namespace ActiveMQ.OpenWire.V1
+namespace Apache.ActiveMQ.OpenWire.V1
 {
   /// <summary>
   ///  Marshalling code for Open Wire Format for JournalQueueAck

Modified: activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/JournalTopicAckMarshaller.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/JournalTopicAckMarshaller.cs?rev=589629&r1=589628&r2=589629&view=diff
==============================================================================
--- activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/JournalTopicAckMarshaller.cs (original)
+++ activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/JournalTopicAckMarshaller.cs Mon Oct 29 06:55:09 2007
@@ -25,11 +25,11 @@
 using System.Collections;
 using System.IO;
 
-using ActiveMQ.Commands;
-using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.V1;
+using Apache.ActiveMQ.Commands;
+using Apache.ActiveMQ.OpenWire;
+using Apache.ActiveMQ.OpenWire.V1;
 
-namespace ActiveMQ.OpenWire.V1
+namespace Apache.ActiveMQ.OpenWire.V1
 {
   /// <summary>
   ///  Marshalling code for Open Wire Format for JournalTopicAck

Modified: activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/JournalTraceMarshaller.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/JournalTraceMarshaller.cs?rev=589629&r1=589628&r2=589629&view=diff
==============================================================================
--- activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/JournalTraceMarshaller.cs (original)
+++ activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/JournalTraceMarshaller.cs Mon Oct 29 06:55:09 2007
@@ -25,11 +25,11 @@
 using System.Collections;
 using System.IO;
 
-using ActiveMQ.Commands;
-using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.V1;
+using Apache.ActiveMQ.Commands;
+using Apache.ActiveMQ.OpenWire;
+using Apache.ActiveMQ.OpenWire.V1;
 
-namespace ActiveMQ.OpenWire.V1
+namespace Apache.ActiveMQ.OpenWire.V1
 {
   /// <summary>
   ///  Marshalling code for Open Wire Format for JournalTrace

Modified: activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/JournalTransactionMarshaller.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/JournalTransactionMarshaller.cs?rev=589629&r1=589628&r2=589629&view=diff
==============================================================================
--- activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/JournalTransactionMarshaller.cs (original)
+++ activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/JournalTransactionMarshaller.cs Mon Oct 29 06:55:09 2007
@@ -25,11 +25,11 @@
 using System.Collections;
 using System.IO;
 
-using ActiveMQ.Commands;
-using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.V1;
+using Apache.ActiveMQ.Commands;
+using Apache.ActiveMQ.OpenWire;
+using Apache.ActiveMQ.OpenWire.V1;
 
-namespace ActiveMQ.OpenWire.V1
+namespace Apache.ActiveMQ.OpenWire.V1
 {
   /// <summary>
   ///  Marshalling code for Open Wire Format for JournalTransaction

Modified: activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/KeepAliveInfoMarshaller.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/KeepAliveInfoMarshaller.cs?rev=589629&r1=589628&r2=589629&view=diff
==============================================================================
--- activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/KeepAliveInfoMarshaller.cs (original)
+++ activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/KeepAliveInfoMarshaller.cs Mon Oct 29 06:55:09 2007
@@ -25,11 +25,11 @@
 using System.Collections;
 using System.IO;
 
-using ActiveMQ.Commands;
-using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.V1;
+using Apache.ActiveMQ.Commands;
+using Apache.ActiveMQ.OpenWire;
+using Apache.ActiveMQ.OpenWire.V1;
 
-namespace ActiveMQ.OpenWire.V1
+namespace Apache.ActiveMQ.OpenWire.V1
 {
   /// <summary>
   ///  Marshalling code for Open Wire Format for KeepAliveInfo

Modified: activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/LastPartialCommandMarshaller.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/LastPartialCommandMarshaller.cs?rev=589629&r1=589628&r2=589629&view=diff
==============================================================================
--- activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/LastPartialCommandMarshaller.cs (original)
+++ activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/LastPartialCommandMarshaller.cs Mon Oct 29 06:55:09 2007
@@ -25,11 +25,11 @@
 using System.Collections;
 using System.IO;
 
-using ActiveMQ.Commands;
-using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.V1;
+using Apache.ActiveMQ.Commands;
+using Apache.ActiveMQ.OpenWire;
+using Apache.ActiveMQ.OpenWire.V1;
 
-namespace ActiveMQ.OpenWire.V1
+namespace Apache.ActiveMQ.OpenWire.V1
 {
   /// <summary>
   ///  Marshalling code for Open Wire Format for LastPartialCommand

Modified: activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/LocalTransactionIdMarshaller.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/LocalTransactionIdMarshaller.cs?rev=589629&r1=589628&r2=589629&view=diff
==============================================================================
--- activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/LocalTransactionIdMarshaller.cs (original)
+++ activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/LocalTransactionIdMarshaller.cs Mon Oct 29 06:55:09 2007
@@ -25,11 +25,11 @@
 using System.Collections;
 using System.IO;
 
-using ActiveMQ.Commands;
-using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.V1;
+using Apache.ActiveMQ.Commands;
+using Apache.ActiveMQ.OpenWire;
+using Apache.ActiveMQ.OpenWire.V1;
 
-namespace ActiveMQ.OpenWire.V1
+namespace Apache.ActiveMQ.OpenWire.V1
 {
   /// <summary>
   ///  Marshalling code for Open Wire Format for LocalTransactionId

Modified: activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/MarshallerFactory.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/MarshallerFactory.cs?rev=589629&r1=589628&r2=589629&view=diff
==============================================================================
--- activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/MarshallerFactory.cs (original)
+++ activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/MarshallerFactory.cs Mon Oct 29 06:55:09 2007
@@ -25,11 +25,11 @@
 using System.Collections;
 using System.IO;
 
-using ActiveMQ.Commands;
-using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.V1;
+using Apache.ActiveMQ.Commands;
+using Apache.ActiveMQ.OpenWire;
+using Apache.ActiveMQ.OpenWire.V1;
 
-namespace ActiveMQ.OpenWire.V1
+namespace Apache.ActiveMQ.OpenWire.V1
 {
 	/// <summary>
 	/// Used to create marshallers for a specific version of the wire protocol



Mime
View raw message