Get it to compile after refactor

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@383071 13f79535-47bb-0310-9956-ffa450edef68

openwire-dotnet/src/ActiveMQ/BrokerException.cs

@@ -16,10 +16,11 @@
  */
 using System;
 using System.Collections;
-using OpenWire.Client.Commands;
-using OpenWire.Client.Core;
 
-namespace OpenWire.Client
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
+
+namespace ActiveMQ
 {
     /// <summary>
     /// Exception thrown when the broker returns an error

openwire-dotnet/src/ActiveMQ/Connection.cs

@@ -1,10 +1,11 @@
 using System;
 using System.Collections;
-using OpenWire.Client.Commands;
-using OpenWire.Client.Core;
 using System.Threading;
 
-namespace OpenWire.Client
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
+
+namespace ActiveMQ
 {
     /// <summary>
     /// Represents a connection with a message broker

openwire-dotnet/src/ActiveMQ/ConnectionClosedException.cs

@@ -16,15 +16,17 @@
  */
 using System;
 using System.Collections;
-using OpenWire.Client.Commands;
-using OpenWire.Client.Core;
 
-namespace OpenWire.Client {
+using ActiveMQ.OpenWire;
-        /// <summary>
+using ActiveMQ.OpenWire.Commands;
+
+namespace ActiveMQ
+{
+	/// <summary>
         /// Exception thrown when a connection is used that it already closed
         /// </summary>
         public class ConnectionClosedException : OpenWireException {
                 public ConnectionClosedException() : base("The connection is already closed!") {
                 }
-        } 
+        }
 }

openwire-dotnet/src/ActiveMQ/ConnectionFactory.cs

@@ -16,10 +16,11 @@
  */
 using System;
 using System.Collections;
-using OpenWire.Client.Commands;
-using OpenWire.Client.Core;
 
-namespace OpenWire.Client
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
+
+namespace ActiveMQ
 {
     /// <summary>
     /// Represents a connection with a message broker

openwire-dotnet/src/ActiveMQ/ConsumerClosedException.cs

@@ -16,15 +16,17 @@
  */
 using System;
 using System.Collections;
-using OpenWire.Client.Commands;
-using OpenWire.Client.Core;
 
-namespace OpenWire.Client {
+using ActiveMQ.OpenWire;
-        /// <summary>
+using ActiveMQ.OpenWire.Commands;
+
+namespace ActiveMQ
+{
+	/// <summary>
         /// Exception thrown when a consumer is used that it already closed
         /// </summary>
         public class ConsumerClosedException : OpenWireException {
                 public ConsumerClosedException() : base("The consumer is already closed!") {
                 }
-        } 
+        }
 }

openwire-dotnet/src/ActiveMQ/DestinationFilter.cs

@@ -15,11 +15,13 @@
  * limitations under the License.
  */
 using System;
-using OpenWire.Client.Commands;
-using OpenWire.Client.Core;
 
-namespace OpenWire.Client {
+using ActiveMQ.OpenWire;
-        /// <summary>
+using ActiveMQ.OpenWire.Commands;
+
+namespace ActiveMQ
+{
+	/// <summary>
         /// Summary description for DestinationFilter.
         /// </summary>
         public abstract class DestinationFilter {
@@ -27,9 +29,9 @@ namespace OpenWire.Client {
                 public const String ANY_CHILD = "*";
 
                 public bool matches(ActiveMQMessage message) {
-                        return matches(message.Destination); 
+                        return matches(message.Destination);
                 }
 
-                public abstract bool matches(ActiveMQDestination destination); 
+                public abstract bool matches(ActiveMQDestination destination);
-        } 
+        }
 }

openwire-dotnet/src/ActiveMQ/IBytesMessage.cs

@@ -1,34 +1,33 @@
-/*
+/*
- * Copyright 2006 The Apache Software Foundation or its licensors, as
+ * Copyright 2006 The Apache Software Foundation or its licensors, as
- * applicable.
+ * applicable.
- *
+ *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
+ * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * You may obtain a copy of the License at
- *
+ *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
- * Unless required by applicable law or agreed to in writing, software
+ * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
+ * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
+ * See the License for the specific language governing permissions and
- * limitations under the License.
+ * limitations under the License.
-*/
+*/
-using System;
+using System;
-using OpenWire.Client.Commands;
+
-
+namespace ActiveMQ
-namespace OpenWire.Client
+{
-{
+    /// <summary>
-    /// <summary>
+    /// Represents a binary based message
-    /// Represents a binary based message
+    /// </summary>
-    /// </summary>
+    public interface IBytesMessage : IMessage
-    public interface IBytesMessage : IMessage
+    {
-    {
+        
-        
+        byte[] Content
-        byte[] Content
+        {
-        {
+            get;
-            get;
+            set;
-            set;
+        }
-        }
+    }
-    }
+}
-}

openwire-dotnet/src/ActiveMQ/IConnection.cs

@@ -15,9 +15,8 @@
  * limitations under the License.
  */
 using System;
-using OpenWire.Client.Commands;
 
-namespace OpenWire.Client
+namespace ActiveMQ
 {
     
     public enum AcknowledgementMode

openwire-dotnet/src/ActiveMQ/IConnectionFactory.cs

@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 using System;
-using OpenWire.Client.Commands;
-
-namespace OpenWire.Client {
 
+namespace ActiveMQ
+{
+	
         /// <summary>
         /// A Factory of IConnection objects
         /// </summary>
@@ -33,5 +33,5 @@ namespace OpenWire.Client {
                 /// Creates a new connection with the given user name and password
                 /// </summary>
                 IConnection CreateConnection(string userName, string password);
-        } 
+        }
 }

openwire-dotnet/src/ActiveMQ/IDestination.cs

@@ -15,12 +15,12 @@
  * limitations under the License.
  */
 using System;
-using OpenWire.Client.Commands;
 
-namespace OpenWire.Client {
+namespace ActiveMQ
-        /// <summary>
+{
+	/// <summary>
         /// Summary description for Destination.
         /// </summary>
         public interface IDestination {
-        } 
+        }
 }

openwire-dotnet/src/ActiveMQ/IMapMessage.cs

@@ -1,33 +1,32 @@
-/*
+/*
- * Copyright 2006 The Apache Software Foundation or its licensors, as
+ * Copyright 2006 The Apache Software Foundation or its licensors, as
- * applicable.
+ * applicable.
- *
+ *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
+ * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * You may obtain a copy of the License at
- *
+ *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
- * Unless required by applicable law or agreed to in writing, software
+ * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
+ * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
+ * See the License for the specific language governing permissions and
- * limitations under the License.
+ * limitations under the License.
-*/
+*/
-using System;
+using System;
-using OpenWire.Client.Commands;
+
-
+namespace ActiveMQ
-namespace OpenWire.Client
+{
-{
+    /// <summary>
-    /// <summary>
+    /// Represents a Map message which contains key and value pairs which are
-    /// Represents a Map message which contains key and value pairs which are
+    /// of primitive types
-    /// of primitive types
+    /// </summary>
-    /// </summary>
+    public interface IMapMessage : IMessage
-    public interface IMapMessage : IMessage
+    {
-    {
+        IPrimitiveMap Body {
-        IPrimitiveMap Body {
+            get;
-            get;
+        }
-        }
+    }
-    }
+}
-}
+
-

openwire-dotnet/src/ActiveMQ/IMessage.cs

@@ -15,9 +15,8 @@
  * limitations under the License.
  */
 using System;
-using OpenWire.Client.Commands;
 
-namespace OpenWire.Client
+namespace ActiveMQ
 {
     /// <summary>
     /// Represents a message either to be sent to a message broker or received from a message broker

openwire-dotnet/src/ActiveMQ/IMessageConsumer.cs

@@ -15,9 +15,8 @@
  * limitations under the License.
  */
 using System;
-using OpenWire.Client.Commands;
 
-namespace OpenWire.Client
+namespace ActiveMQ
 {
     public delegate void MessageListener(IMessage message);
     

openwire-dotnet/src/ActiveMQ/IMessageProducer.cs

@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 using System;
-using OpenWire.Client.Commands;
 
-namespace OpenWire.Client {
+namespace ActiveMQ
+{
     /// <summary>
     /// An object capable of sending messages to some destination
     /// </summary>
@@ -31,37 +31,37 @@ namespace OpenWire.Client {
         /// <summary>
         /// Sends the message to the given destination
         /// </summary>
-        void Send(IDestination destination, IMessage message); 
+        void Send(IDestination destination, IMessage message);
 
 		bool Persistent
 		{
 			get;
-			set; 
+			set;
 		}
 
 		long TimeToLive
 		{
 			get;
-			set; 
+			set;
 		}
 
 		int Priority
 		{
 			get;
-			set; 
+			set;
 		}
 
 		bool DisableMessageID
 		{
 			get;
-			set; 
+			set;
 		}
 		
 		bool DisableMessageTimestamp
 		{
 			get;
-			set; 
+			set;
 		}
 
-    } 
+    }
 }

openwire-dotnet/src/ActiveMQ/IPrimitiveMap.cs

@@ -1,86 +1,84 @@
-/*
+/*
- * Copyright 2006 The Apache Software Foundation or its licensors, as
+ * Copyright 2006 The Apache Software Foundation or its licensors, as
- * applicable.
+ * applicable.
- *
+ *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
+ * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * You may obtain a copy of the License at
- *
+ *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
- * Unless required by applicable law or agreed to in writing, software
+ * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
+ * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
+ * See the License for the specific language governing permissions and
- * limitations under the License.
+ * limitations under the License.
-*/
+*/
-using System;
+using System;
-using System.Collections;
+using System.Collections;
-
+
-using OpenWire.Client.Commands;
+namespace ActiveMQ
-
+{
-namespace OpenWire.Client
+    /// <summary>
-{
+    /// Represents a Map of primitive types where the keys are all string instances
-    /// <summary>
+    /// and the values are strings or numbers.
-    /// Represents a Map of primitive types where the keys are all string instances
+    /// </summary>
-    /// and the values are strings or numbers.
+    public interface IPrimitiveMap
-    /// </summary>
+    {
-    public interface IPrimitiveMap
+        
-    {
+        void Clear();
-        
+        
-        void Clear();
+        bool Contains(object key);
-        
+        
-        bool Contains(object key);
+        void Remove(object key);
-        
+        
-        void Remove(object key);
+        int Count
-        
+        {
-        int Count
+            get;
-        {
+        }
-            get;
+        
-        }
+        ICollection Keys
-        
+        {
-        ICollection Keys
+            get;
-        {
+        }
-            get;
+        
-        }
+        ICollection Values
-        
+        {
-        ICollection Values
+            get;
-        {
+        }
-            get;
+        
-        }
+        object this[string key]
-        
+        {
-        object this[string key]
+            get;
-        {
+            set;
-            get;
+        }
-            set;
+        
-        }
+        string GetString(string key);
-        
+        void SetString(string key, string value);
-        string GetString(string key);
+        
-        void SetString(string key, string value);
+        bool GetBool(string key);
-        
+        void SetByte(string key, bool value);
-        bool GetBool(string key);
+        
-        void SetByte(string key, bool value);
+        byte GetByte(string key);
-        
+        void SetByte(string key, byte value);
-        byte GetByte(string key);
+        
-        void SetByte(string key, byte value);
+        char GetChar(string key);
-        
+        void SetChar(string key, char value);
-        char GetChar(string key);
+        
-        void SetChar(string key, char value);
+        short GetShort(string key);
-        
+        void SetShort(string key, short value);
-        short GetShort(string key);
+        
-        void SetShort(string key, short value);
+        int GetInt(string key);
-        
+        void SetInt(string key, int value);
-        int GetInt(string key);
+        
-        void SetInt(string key, int value);
+        long GetLong(string key);
-        
+        void SetLong(string key, long value);
-        long GetLong(string key);
+        
-        void SetLong(string key, long value);
+        float GetFloat(string key);
-        
+        void SetFloat(string key, float value);
-        float GetFloat(string key);
+        
-        void SetFloat(string key, float value);
+        double GetDouble(string key);
-        
+        void SetDouble(string key, double value);
-        double GetDouble(string key);
+        
-        void SetDouble(string key, double value);
+    }
-        
+}
-    }
-}

openwire-dotnet/src/ActiveMQ/IQueue.cs

@@ -15,16 +15,16 @@
  * limitations under the License.
  */
 using System;
-using OpenWire.Client.Commands;
 
-namespace OpenWire.Client {
+namespace ActiveMQ
-        /// <summary>
+{
+	/// <summary>
         /// Summary description for IQueue.
         /// </summary>
         public interface IQueue : IDestination {
 
                 String QueueName {
-                        get; 
+                        get;
-                } 
+                }
-        } 
+        }
 }

openwire-dotnet/src/ActiveMQ/ISession.cs

@@ -15,9 +15,8 @@
  * limitations under the License.
  */
 using System;
-using OpenWire.Client.Commands;
 
-namespace OpenWire.Client
+namespace ActiveMQ
 {
     /// <summary>
     /// Represents a single unit of work on an IConnection.

openwire-dotnet/src/ActiveMQ/IStartable.cs

@@ -1,23 +1,23 @@
-/*
+/*
- * Copyright 2006 The Apache Software Foundation or its licensors, as
+ * Copyright 2006 The Apache Software Foundation or its licensors, as
- * applicable.
+ * applicable.
- *
+ *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
+ * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * You may obtain a copy of the License at
- *
+ *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
- * Unless required by applicable law or agreed to in writing, software
+ * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
+ * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
+ * See the License for the specific language governing permissions and
- * limitations under the License.
+ * limitations under the License.
- */
+ */
-namespace OpenWire.Client
+namespace ActiveMQ
-{
+{
-    public interface IStartable
+    public interface IStartable
-    {
+    {
-        void Start();
+        void Start();
-    }
+    }
-}
+}

openwire-dotnet/src/ActiveMQ/ITemporaryQueue.cs

@@ -15,12 +15,12 @@
  * limitations under the License.
  */
 using System;
-using OpenWire.Client.Commands;
 
-namespace OpenWire.Client {
+namespace ActiveMQ
-        /// <summary>
+{
+	/// <summary>
         /// Summary description for ITemporaryQueue.
         /// </summary>
         public interface ITemporaryQueue : IDestination {
-        } 
+        }
 }

openwire-dotnet/src/ActiveMQ/ITemporaryTopic.cs

@@ -15,12 +15,12 @@
  * limitations under the License.
  */
 using System;
-using OpenWire.Client.Commands;
 
-namespace OpenWire.Client {
+namespace ActiveMQ
-        /// <summary>
+{
+	/// <summary>
         /// Summary description for TemporaryTopic.
         /// </summary>
         public interface ITemporaryTopic : IDestination {
-        } 
+        }
 }

openwire-dotnet/src/ActiveMQ/ITextMessage.cs

@@ -15,9 +15,8 @@
  * limitations under the License.
  */
 using System;
-using OpenWire.Client.Commands;
 
-namespace OpenWire.Client
+namespace ActiveMQ
 {
     /// <summary>
     /// Represents a text based message

openwire-dotnet/src/ActiveMQ/ITopic.cs

@@ -15,16 +15,16 @@
  * limitations under the License.
  */
 using System;
-using OpenWire.Client.Commands;
 
-namespace OpenWire.Client {
+namespace ActiveMQ
-        /// <summary>
+{
+	/// <summary>
         /// Summary description for ITopic.
         /// </summary>
         public interface ITopic : IDestination {
 
                 String TopicName {
-                        get; 
+                        get;
-                } 
+                }
-        } 
+        }
 }

openwire-dotnet/src/ActiveMQ/MessageConsumer.cs

@@ -17,10 +17,11 @@
 using System;
 using System.Collections;
 using System.Threading;
-using OpenWire.Client.Commands;
-using OpenWire.Client.Core;
 
-namespace OpenWire.Client
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
+
+namespace ActiveMQ
 {
     public enum AckType
     {

openwire-dotnet/src/ActiveMQ/MessageProducer.cs

@@ -15,9 +15,11 @@
  * limitations under the License.
  */
 using System;
-using OpenWire.Client.Commands;
 
-namespace OpenWire.Client
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
+
+namespace ActiveMQ
 {
     /// <summary>
     /// An object capable of sending messages to some destination

openwire-dotnet/src/ActiveMQ/OpenWireException.cs

@@ -16,15 +16,14 @@
  */
 using System;
 using System.Collections;
-using OpenWire.Client.Commands;
-using OpenWire.Client.Core;
 
-namespace OpenWire.Client {
+namespace ActiveMQ
-        /// <summary>
+{
+	/// <summary>
         /// Represents an OpenWire exception
         /// </summary>
         public class OpenWireException : Exception {
                 public OpenWireException(string message) : base(message) {
                 }
-        } 
+        }
 }

openwire-dotnet/src/ActiveMQ/Session.cs

@@ -15,11 +15,12 @@
  * limitations under the License.
  */
 using System;
-using OpenWire.Client.Commands;
-using OpenWire.Client.Core;
 using System.Collections;
 
-namespace OpenWire.Client
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
+
+namespace ActiveMQ
 {
     /// <summary>
     /// Default provider of ISession