From bfe91884bea58838f5abc3402de96f3386cce7c0 Mon Sep 17 00:00:00 2001 From: "Hiram R. Chirino" Date: Sun, 5 Mar 2006 13:07:48 +0000 Subject: [PATCH] Fixed up some comments. git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@383314 13f79535-47bb-0310-9956-ffa450edef68 --- .../src/ActiveMQ/BrokerException.cs | 9 +++--- .../src/ActiveMQ/Commands/AbstractCommand.cs | 8 ++--- .../ActiveMQ/Commands/ActiveMQDestination.cs | 10 +++---- .../src/ActiveMQ/Commands/ActiveMQQueue.cs | 8 ++--- .../ActiveMQ/Commands/ActiveMQTempQueue.cs | 8 ++--- .../ActiveMQ/Commands/ActiveMQTempTopic.cs | 8 ++--- .../src/ActiveMQ/Commands/ActiveMQTopic.cs | 8 ++--- .../src/ActiveMQ/Commands/BrokerError.cs | 10 ++----- .../src/ActiveMQ/Commands/Command.cs | 8 ++--- .../src/ActiveMQ/Commands/DataStructure.cs | 10 +++---- .../ActiveMQ/Commands/DataStructureSupport.cs | 8 ++--- .../src/ActiveMQ/Commands/MarshallAware.cs | 8 ++--- openwire-dotnet/src/ActiveMQ/Dispatcher.cs | 8 ++--- .../src/ActiveMQ/Transport/FutureResponse.cs | 8 ++--- .../src/ActiveMQ/Transport/ITransport.cs | 10 +++---- .../ActiveMQ/Transport/LoggingTransport.cs | 11 +++---- .../src/ActiveMQ/Transport/MutexTransport.cs | 7 +++-- .../ActiveMQ/Transport/ResponseCorrelator.cs | 11 +++---- .../ActiveMQ/Transport/Tcp/TcpTransport.cs | 30 +++++++++---------- .../src/ActiveMQ/Transport/TransportFilter.cs | 27 +++++++++-------- openwire-dotnet/src/JMS/IBytesMessage.cs | 8 ++--- openwire-dotnet/src/JMS/IConnectionFactory.cs | 9 +++--- openwire-dotnet/src/JMS/IDestination.cs | 10 +++---- openwire-dotnet/src/JMS/IMapMessage.cs | 10 +++---- openwire-dotnet/src/JMS/IMessage.cs | 8 ++--- openwire-dotnet/src/JMS/IMessageConsumer.cs | 10 ++----- openwire-dotnet/src/JMS/IMessageProducer.cs | 8 ++--- openwire-dotnet/src/JMS/IPrimitiveMap.cs | 10 +++---- openwire-dotnet/src/JMS/IQueue.cs | 8 ++--- openwire-dotnet/src/JMS/ISession.cs | 10 +++---- openwire-dotnet/src/JMS/ITemporaryQueue.cs | 8 ++--- openwire-dotnet/src/JMS/ITemporaryTopic.cs | 8 ++--- openwire-dotnet/src/JMS/ITextMessage.cs | 8 ++--- openwire-dotnet/src/JMS/ITopic.cs | 8 ++--- .../src/JMS/JMSConnectionException.cs | 10 +++---- openwire-dotnet/src/JMS/JMSException.cs | 8 ++--- .../ActiveMQ/OpenWire/BooleanStreamTest.cs | 2 +- 37 files changed, 172 insertions(+), 186 deletions(-) diff --git a/openwire-dotnet/src/ActiveMQ/BrokerException.cs b/openwire-dotnet/src/ActiveMQ/BrokerException.cs index a324c49d2f..428dd2da06 100644 --- a/openwire-dotnet/src/ActiveMQ/BrokerException.cs +++ b/openwire-dotnet/src/ActiveMQ/BrokerException.cs @@ -17,13 +17,12 @@ using ActiveMQ.Commands; using JMS; - -/// -/// Exception thrown when the broker returns an error -/// - namespace ActiveMQ { + + /// + /// Exception thrown when the broker returns an error + /// public class BrokerException : JMSException { diff --git a/openwire-dotnet/src/ActiveMQ/Commands/AbstractCommand.cs b/openwire-dotnet/src/ActiveMQ/Commands/AbstractCommand.cs index 0103b87690..ef058d76cd 100755 --- a/openwire-dotnet/src/ActiveMQ/Commands/AbstractCommand.cs +++ b/openwire-dotnet/src/ActiveMQ/Commands/AbstractCommand.cs @@ -17,12 +17,12 @@ using ActiveMQ.Commands; using System; - -/// -/// Summary description for AbstractCommand. -/// namespace ActiveMQ.Commands { + + /// + /// Summary description for AbstractCommand. + /// public abstract class AbstractCommand : Command { private short commandId; diff --git a/openwire-dotnet/src/ActiveMQ/Commands/ActiveMQDestination.cs b/openwire-dotnet/src/ActiveMQ/Commands/ActiveMQDestination.cs index ac52fc2789..26d855f83d 100644 --- a/openwire-dotnet/src/ActiveMQ/Commands/ActiveMQDestination.cs +++ b/openwire-dotnet/src/ActiveMQ/Commands/ActiveMQDestination.cs @@ -17,14 +17,12 @@ using ActiveMQ.Commands; using JMS; using System; - - - -/// -/// Summary description for ActiveMQDestination. -/// namespace ActiveMQ.Commands { + + /// + /// Summary description for ActiveMQDestination. + /// public abstract class ActiveMQDestination : AbstractCommand, IDestination { diff --git a/openwire-dotnet/src/ActiveMQ/Commands/ActiveMQQueue.cs b/openwire-dotnet/src/ActiveMQ/Commands/ActiveMQQueue.cs index 0031fb27b1..311b69976e 100644 --- a/openwire-dotnet/src/ActiveMQ/Commands/ActiveMQQueue.cs +++ b/openwire-dotnet/src/ActiveMQ/Commands/ActiveMQQueue.cs @@ -18,12 +18,12 @@ using ActiveMQ.Commands; using JMS; using System; - -/// -/// Summary description for ActiveMQQueue. -/// namespace ActiveMQ.Commands { + + /// + /// Summary description for ActiveMQQueue. + /// public class ActiveMQQueue : ActiveMQDestination, IQueue { public const byte ID_ActiveMQQueue = 100; diff --git a/openwire-dotnet/src/ActiveMQ/Commands/ActiveMQTempQueue.cs b/openwire-dotnet/src/ActiveMQ/Commands/ActiveMQTempQueue.cs index 02e393705b..7ee009514c 100644 --- a/openwire-dotnet/src/ActiveMQ/Commands/ActiveMQTempQueue.cs +++ b/openwire-dotnet/src/ActiveMQ/Commands/ActiveMQTempQueue.cs @@ -18,12 +18,12 @@ using ActiveMQ.Commands; using JMS; using System; - -/// -/// A Temporary Queue -/// namespace ActiveMQ.Commands { + + /// + /// A Temporary Queue + /// public class ActiveMQTempQueue : ActiveMQTempDestination, ITemporaryQueue { public const byte ID_ActiveMQTempQueue = 102; diff --git a/openwire-dotnet/src/ActiveMQ/Commands/ActiveMQTempTopic.cs b/openwire-dotnet/src/ActiveMQ/Commands/ActiveMQTempTopic.cs index ad531887cf..49886fd018 100644 --- a/openwire-dotnet/src/ActiveMQ/Commands/ActiveMQTempTopic.cs +++ b/openwire-dotnet/src/ActiveMQ/Commands/ActiveMQTempTopic.cs @@ -18,12 +18,12 @@ using ActiveMQ.Commands; using JMS; using System; - -/// -/// A Temporary Topic -/// namespace ActiveMQ.Commands { + + /// + /// A Temporary Topic + /// public class ActiveMQTempTopic : ActiveMQTempDestination, ITemporaryTopic { public const byte ID_ActiveMQTempTopic = 103; diff --git a/openwire-dotnet/src/ActiveMQ/Commands/ActiveMQTopic.cs b/openwire-dotnet/src/ActiveMQ/Commands/ActiveMQTopic.cs index 43679681b0..5eceae4476 100644 --- a/openwire-dotnet/src/ActiveMQ/Commands/ActiveMQTopic.cs +++ b/openwire-dotnet/src/ActiveMQ/Commands/ActiveMQTopic.cs @@ -18,12 +18,12 @@ using ActiveMQ.Commands; using JMS; using System; - -/// -/// Summary description for ActiveMQTopic. -/// namespace ActiveMQ.Commands { + + /// + /// Summary description for ActiveMQTopic. + /// public class ActiveMQTopic : ActiveMQDestination, ITopic { public const byte ID_ActiveMQTopic = 101; diff --git a/openwire-dotnet/src/ActiveMQ/Commands/BrokerError.cs b/openwire-dotnet/src/ActiveMQ/Commands/BrokerError.cs index e1d5bf3c65..53145873d2 100755 --- a/openwire-dotnet/src/ActiveMQ/Commands/BrokerError.cs +++ b/openwire-dotnet/src/ActiveMQ/Commands/BrokerError.cs @@ -28,14 +28,10 @@ namespace ActiveMQ.Commands public string MethodName; public int LineNumber; } -} - -/// -/// Represents an exception on the broker -/// -namespace ActiveMQ.Commands -{ + /// + /// Represents an exception on the broker + /// public class BrokerError : AbstractCommand { private string message; diff --git a/openwire-dotnet/src/ActiveMQ/Commands/Command.cs b/openwire-dotnet/src/ActiveMQ/Commands/Command.cs index dafef85fd8..8488678776 100755 --- a/openwire-dotnet/src/ActiveMQ/Commands/Command.cs +++ b/openwire-dotnet/src/ActiveMQ/Commands/Command.cs @@ -16,12 +16,12 @@ */ using ActiveMQ.Commands; - -/// -/// An OpenWire command -/// namespace ActiveMQ.Commands { + + /// + /// An OpenWire command + /// public interface Command : DataStructure { short CommandId diff --git a/openwire-dotnet/src/ActiveMQ/Commands/DataStructure.cs b/openwire-dotnet/src/ActiveMQ/Commands/DataStructure.cs index eca11ce96b..69f63adfbe 100755 --- a/openwire-dotnet/src/ActiveMQ/Commands/DataStructure.cs +++ b/openwire-dotnet/src/ActiveMQ/Commands/DataStructure.cs @@ -14,14 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - - -/// -/// An OpenWire command -/// namespace ActiveMQ.Commands { + + /// + /// An OpenWire command + /// public interface DataStructure { diff --git a/openwire-dotnet/src/ActiveMQ/Commands/DataStructureSupport.cs b/openwire-dotnet/src/ActiveMQ/Commands/DataStructureSupport.cs index fd101f4dcb..e2e8ba51a3 100755 --- a/openwire-dotnet/src/ActiveMQ/Commands/DataStructureSupport.cs +++ b/openwire-dotnet/src/ActiveMQ/Commands/DataStructureSupport.cs @@ -16,12 +16,12 @@ */ using ActiveMQ.Commands; - -/// -/// Summary description for DataStructureSupport. -/// namespace ActiveMQ.Commands { + + /// + /// Summary description for DataStructureSupport. + /// public abstract class DataStructureSupport : DataStructure { diff --git a/openwire-dotnet/src/ActiveMQ/Commands/MarshallAware.cs b/openwire-dotnet/src/ActiveMQ/Commands/MarshallAware.cs index c0e372f7f5..f6f5df9fe0 100644 --- a/openwire-dotnet/src/ActiveMQ/Commands/MarshallAware.cs +++ b/openwire-dotnet/src/ActiveMQ/Commands/MarshallAware.cs @@ -16,12 +16,12 @@ */ using ActiveMQ.OpenWire; - -/// -/// Represents a marshallable entity -/// namespace ActiveMQ.Commands { + + /// + /// Represents a marshallable entity + /// public interface MarshallAware { diff --git a/openwire-dotnet/src/ActiveMQ/Dispatcher.cs b/openwire-dotnet/src/ActiveMQ/Dispatcher.cs index 3f633d4678..748c9e08de 100644 --- a/openwire-dotnet/src/ActiveMQ/Dispatcher.cs +++ b/openwire-dotnet/src/ActiveMQ/Dispatcher.cs @@ -20,12 +20,12 @@ using System; using System.Collections; using System.Threading; - -/// -/// Handles the multi-threaded dispatching between the transport and the consumers -/// namespace ActiveMQ { + + /// + /// Handles the multi-threaded dispatching between the transport and the consumers + /// public class Dispatcher { Queue queue = new Queue(); diff --git a/openwire-dotnet/src/ActiveMQ/Transport/FutureResponse.cs b/openwire-dotnet/src/ActiveMQ/Transport/FutureResponse.cs index de431287da..e3788d8c63 100755 --- a/openwire-dotnet/src/ActiveMQ/Transport/FutureResponse.cs +++ b/openwire-dotnet/src/ActiveMQ/Transport/FutureResponse.cs @@ -18,12 +18,12 @@ using ActiveMQ.Commands; using System; using System.Threading; - -/// -/// Handles asynchronous responses -/// namespace ActiveMQ.Transport { + + /// + /// Handles asynchronous responses + /// public class FutureResponse : IAsyncResult { diff --git a/openwire-dotnet/src/ActiveMQ/Transport/ITransport.cs b/openwire-dotnet/src/ActiveMQ/Transport/ITransport.cs index 20c1a2f9c6..211638b4b6 100755 --- a/openwire-dotnet/src/ActiveMQ/Transport/ITransport.cs +++ b/openwire-dotnet/src/ActiveMQ/Transport/ITransport.cs @@ -19,14 +19,14 @@ using ActiveMQ.Transport; using JMS; using System; -/// -/// Represents the logical networking transport layer. -/// namespace ActiveMQ.Transport { public delegate void CommandHandler(ITransport sender, Command command); public delegate void ExceptionHandler(ITransport sender, Exception command); + /// + /// Represents the logical networking transport layer. + /// public interface ITransport : IStartable, IDisposable { void Oneway(Command command); @@ -35,12 +35,12 @@ namespace ActiveMQ.Transport Response Request(Command command); - CommandHandler Command{ + CommandHandler Command { get; set; } - ExceptionHandler Exception{ + ExceptionHandler Exception { get; set; } diff --git a/openwire-dotnet/src/ActiveMQ/Transport/LoggingTransport.cs b/openwire-dotnet/src/ActiveMQ/Transport/LoggingTransport.cs index d71aa7cb74..07f50f93c2 100644 --- a/openwire-dotnet/src/ActiveMQ/Transport/LoggingTransport.cs +++ b/openwire-dotnet/src/ActiveMQ/Transport/LoggingTransport.cs @@ -19,11 +19,12 @@ using ActiveMQ.Transport; using JMS; using System; -/// -/// A Transport filter that is used to log the commands sent and received. -/// namespace ActiveMQ.Transport { + + /// + /// A Transport filter that is used to log the commands sent and received. + /// public class LoggingTransport : TransportFilter { public LoggingTransport(ITransport next) : base(next) { @@ -31,12 +32,12 @@ namespace ActiveMQ.Transport protected override void OnCommand(ITransport sender, Command command) { Console.WriteLine("RECEIVED: " + command); - this.command(sender, command); + this.commandHandler(sender, command); } protected override void OnException(ITransport sender, Exception error) { Console.WriteLine("RECEIVED Exception: " + error); - this.exception(sender, error); + this.exceptionHandler(sender, error); } public override void Oneway(Command command) diff --git a/openwire-dotnet/src/ActiveMQ/Transport/MutexTransport.cs b/openwire-dotnet/src/ActiveMQ/Transport/MutexTransport.cs index f4d02cd85b..8630bfd453 100644 --- a/openwire-dotnet/src/ActiveMQ/Transport/MutexTransport.cs +++ b/openwire-dotnet/src/ActiveMQ/Transport/MutexTransport.cs @@ -19,11 +19,12 @@ using ActiveMQ.Transport; using JMS; using System; -/// -/// A Transport which gaurds access to the next transport using a mutex. -/// namespace ActiveMQ.Transport { + + /// + /// A Transport which gaurds access to the next transport using a mutex. + /// public class MutexTransport : TransportFilter { diff --git a/openwire-dotnet/src/ActiveMQ/Transport/ResponseCorrelator.cs b/openwire-dotnet/src/ActiveMQ/Transport/ResponseCorrelator.cs index c7e3c6d787..ada353d1d0 100644 --- a/openwire-dotnet/src/ActiveMQ/Transport/ResponseCorrelator.cs +++ b/openwire-dotnet/src/ActiveMQ/Transport/ResponseCorrelator.cs @@ -22,11 +22,12 @@ using ActiveMQ.Commands; using ActiveMQ.Transport; using JMS; -/// -/// A Transport which gaurds access to the next transport using a mutex. -/// namespace ActiveMQ.Transport { + + /// + /// A Transport which gaurds access to the next transport using a mutex. + /// public class ResponseCorrelator : TransportFilter { @@ -86,7 +87,7 @@ namespace ActiveMQ.Transport { ExceptionResponse er = (ExceptionResponse) response; BrokerError brokerError = er.Exception; - this.exception(this, new BrokerException(brokerError)); + this.exceptionHandler(this, new BrokerException(brokerError)); } future.Response = response; } @@ -95,7 +96,7 @@ namespace ActiveMQ.Transport Console.WriteLine("ERROR: Unknown response ID: " + response.CommandId + " for response: " + response); } } else { - this.command(sender, command); + this.commandHandler(sender, command); } } diff --git a/openwire-dotnet/src/ActiveMQ/Transport/Tcp/TcpTransport.cs b/openwire-dotnet/src/ActiveMQ/Transport/Tcp/TcpTransport.cs index c79301548c..c75fc0c666 100644 --- a/openwire-dotnet/src/ActiveMQ/Transport/Tcp/TcpTransport.cs +++ b/openwire-dotnet/src/ActiveMQ/Transport/Tcp/TcpTransport.cs @@ -25,14 +25,12 @@ using System.Net; using System.Net.Sockets; using System.Threading; - - -/// -/// An implementation of ITransport that uses sockets to communicate with the broker -/// - namespace ActiveMQ.Transport.Tcp { + + /// + /// An implementation of ITransport that uses sockets to communicate with the broker + /// public class TcpTransport : ITransport { private Socket socket; @@ -43,8 +41,8 @@ namespace ActiveMQ.Transport.Tcp private bool started; volatile private bool closed; - public CommandHandler command; - public ExceptionHandler exception; + private CommandHandler commandHandlerHandlerHandlerHandlerHandler; + private ExceptionHandler exceptionHandler; public TcpTransport(Socket socket) { @@ -58,9 +56,9 @@ namespace ActiveMQ.Transport.Tcp { if (!started) { - if( command == null ) + if( commandHandlerHandlerHandlerHandlerHandler == null ) throw new InvalidOperationException ("command cannot be null when Start is called."); - if( exception == null ) + if( exceptionHandler == null ) throw new InvalidOperationException ("exception cannot be null when Start is called."); started = true; @@ -110,7 +108,7 @@ namespace ActiveMQ.Transport.Tcp try { Command command = (Command) wireformat.Unmarshal(socketReader); - this.command(this, command); + this.commandHandlerHandlerHandlerHandlerHandler(this, command); } catch (ObjectDisposedException) { @@ -118,7 +116,7 @@ namespace ActiveMQ.Transport.Tcp } catch (Exception e) { - this.exception(this,e); + this.exceptionHandler(this,e); } } } @@ -129,13 +127,13 @@ namespace ActiveMQ.Transport.Tcp // Implementation methods public CommandHandler Command { - get { return command; } - set { this.command = value; } + get { return commandHandlerHandlerHandlerHandlerHandler; } + set { this.commandHandlerHandlerHandlerHandlerHandler = value; } } public ExceptionHandler Exception { - get { return exception; } - set { this.exception = value; } + get { return exceptionHandler; } + set { this.exceptionHandler = value; } } } diff --git a/openwire-dotnet/src/ActiveMQ/Transport/TransportFilter.cs b/openwire-dotnet/src/ActiveMQ/Transport/TransportFilter.cs index dbc8b6482b..06ccaac4a2 100644 --- a/openwire-dotnet/src/ActiveMQ/Transport/TransportFilter.cs +++ b/openwire-dotnet/src/ActiveMQ/Transport/TransportFilter.cs @@ -19,16 +19,17 @@ using ActiveMQ.Transport; using JMS; using System; -/// -/// Used to implement a filter on the transport layer. -/// namespace ActiveMQ.Transport { + + /// + /// Used to implement a filter on the transport layer. + /// public class TransportFilter : ITransport { protected readonly ITransport next; - protected CommandHandler command; - protected ExceptionHandler exception; + protected CommandHandler commandHandler; + protected ExceptionHandler exceptionHandler; public TransportFilter(ITransport next) { this.next = next; @@ -37,11 +38,11 @@ namespace ActiveMQ.Transport } protected virtual void OnCommand(ITransport sender, Command command) { - this.command(sender, command); + this.commandHandler(sender, command); } protected virtual void OnException(ITransport sender, Exception command) { - this.exception(sender, command); + this.exceptionHandler(sender, command); } @@ -79,9 +80,9 @@ namespace ActiveMQ.Transport /// public virtual void Start() { - if( command == null ) + if( commandHandler == null ) throw new InvalidOperationException ("command cannot be null when Start is called."); - if( exception == null ) + if( exceptionHandler == null ) throw new InvalidOperationException ("exception cannot be null when Start is called."); this.next.Start(); } @@ -95,13 +96,13 @@ namespace ActiveMQ.Transport } public CommandHandler Command { - get { return command; } - set { this.command = value; } + get { return commandHandler; } + set { this.commandHandler = value; } } public ExceptionHandler Exception { - get { return exception; } - set { this.exception = value; } + get { return exceptionHandler; } + set { this.exceptionHandler = value; } } } diff --git a/openwire-dotnet/src/JMS/IBytesMessage.cs b/openwire-dotnet/src/JMS/IBytesMessage.cs index d82c3dc123..a7005ed826 100644 --- a/openwire-dotnet/src/JMS/IBytesMessage.cs +++ b/openwire-dotnet/src/JMS/IBytesMessage.cs @@ -16,12 +16,12 @@ */ using JMS; - -/// -/// Represents a binary based message -/// namespace JMS { + + /// + /// Represents a binary based message + /// public interface IBytesMessage : IMessage { diff --git a/openwire-dotnet/src/JMS/IConnectionFactory.cs b/openwire-dotnet/src/JMS/IConnectionFactory.cs index a322761b3b..aaaa3187f2 100644 --- a/openwire-dotnet/src/JMS/IConnectionFactory.cs +++ b/openwire-dotnet/src/JMS/IConnectionFactory.cs @@ -16,13 +16,12 @@ */ using JMS; - - -/// -/// A Factory of IConnection objects -/// namespace JMS { + + /// + /// A Factory of IConnection objects + /// public interface IConnectionFactory { diff --git a/openwire-dotnet/src/JMS/IDestination.cs b/openwire-dotnet/src/JMS/IDestination.cs index be1d188222..234e1c1862 100644 --- a/openwire-dotnet/src/JMS/IDestination.cs +++ b/openwire-dotnet/src/JMS/IDestination.cs @@ -14,14 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - - -/// -/// Summary description for Destination. -/// namespace JMS { + + /// + /// Summary description for Destination. + /// public interface IDestination { } diff --git a/openwire-dotnet/src/JMS/IMapMessage.cs b/openwire-dotnet/src/JMS/IMapMessage.cs index 0523dccebb..2bc30f7e1a 100644 --- a/openwire-dotnet/src/JMS/IMapMessage.cs +++ b/openwire-dotnet/src/JMS/IMapMessage.cs @@ -16,13 +16,13 @@ */ using JMS; - -/// -/// Represents a Map message which contains key and value pairs which are -/// of primitive types -/// namespace JMS { + + /// + /// Represents a Map message which contains key and value pairs which are + /// of primitive types + /// public interface IMapMessage : IMessage { IPrimitiveMap Body diff --git a/openwire-dotnet/src/JMS/IMessage.cs b/openwire-dotnet/src/JMS/IMessage.cs index 6364485e67..4569274b6f 100644 --- a/openwire-dotnet/src/JMS/IMessage.cs +++ b/openwire-dotnet/src/JMS/IMessage.cs @@ -16,12 +16,12 @@ */ using JMS; - -/// -/// Represents a message either to be sent to a message broker or received from a message broker -/// namespace JMS { + + /// + /// Represents a message either to be sent to a message broker or received from a message broker + /// public interface IMessage { diff --git a/openwire-dotnet/src/JMS/IMessageConsumer.cs b/openwire-dotnet/src/JMS/IMessageConsumer.cs index bb45c35508..3b698dc2f4 100644 --- a/openwire-dotnet/src/JMS/IMessageConsumer.cs +++ b/openwire-dotnet/src/JMS/IMessageConsumer.cs @@ -17,17 +17,13 @@ using JMS; using System; - namespace JMS { public delegate void MessageListener(IMessage message); -} -/// -/// A consumer of messages -/// -namespace JMS -{ + /// + /// A consumer of messages + /// public interface IMessageConsumer : IDisposable { diff --git a/openwire-dotnet/src/JMS/IMessageProducer.cs b/openwire-dotnet/src/JMS/IMessageProducer.cs index 197cf7170b..640f90752a 100644 --- a/openwire-dotnet/src/JMS/IMessageProducer.cs +++ b/openwire-dotnet/src/JMS/IMessageProducer.cs @@ -17,12 +17,12 @@ using JMS; using System; - -/// -/// An object capable of sending messages to some destination -/// namespace JMS { + + /// + /// An object capable of sending messages to some destination + /// public interface IMessageProducer : IDisposable { diff --git a/openwire-dotnet/src/JMS/IPrimitiveMap.cs b/openwire-dotnet/src/JMS/IPrimitiveMap.cs index 44b75df49a..04aa7ac040 100644 --- a/openwire-dotnet/src/JMS/IPrimitiveMap.cs +++ b/openwire-dotnet/src/JMS/IPrimitiveMap.cs @@ -16,13 +16,13 @@ */ using System.Collections; - -/// -/// Represents a Map of primitive types where the keys are all string instances -/// and the values are strings or numbers. -/// namespace JMS { + + /// + /// Represents a Map of primitive types where the keys are all string instances + /// and the values are strings or numbers. + /// public interface IPrimitiveMap { diff --git a/openwire-dotnet/src/JMS/IQueue.cs b/openwire-dotnet/src/JMS/IQueue.cs index facd8305d8..b176ed8cc8 100644 --- a/openwire-dotnet/src/JMS/IQueue.cs +++ b/openwire-dotnet/src/JMS/IQueue.cs @@ -17,12 +17,12 @@ using JMS; using System; - -/// -/// Summary description for IQueue. -/// namespace JMS { + + /// + /// Summary description for IQueue. + /// public interface IQueue : IDestination { diff --git a/openwire-dotnet/src/JMS/ISession.cs b/openwire-dotnet/src/JMS/ISession.cs index 73978225f9..0417bed4dc 100644 --- a/openwire-dotnet/src/JMS/ISession.cs +++ b/openwire-dotnet/src/JMS/ISession.cs @@ -17,13 +17,13 @@ using JMS; using System; - -/// -/// Represents a single unit of work on an IConnection. -/// So the ISession can be used to perform transactional receive and sends -/// namespace JMS { + + /// + /// Represents a single unit of work on an IConnection. + /// So the ISession can be used to perform transactional receive and sends + /// public interface ISession : IDisposable { diff --git a/openwire-dotnet/src/JMS/ITemporaryQueue.cs b/openwire-dotnet/src/JMS/ITemporaryQueue.cs index ca08c4323e..78497f3aca 100644 --- a/openwire-dotnet/src/JMS/ITemporaryQueue.cs +++ b/openwire-dotnet/src/JMS/ITemporaryQueue.cs @@ -16,12 +16,12 @@ */ using JMS; - -/// -/// Summary description for ITemporaryQueue. -/// namespace JMS { + + /// + /// Summary description for ITemporaryQueue. + /// public interface ITemporaryQueue : IDestination { } diff --git a/openwire-dotnet/src/JMS/ITemporaryTopic.cs b/openwire-dotnet/src/JMS/ITemporaryTopic.cs index b0e7b4f83a..44db537491 100644 --- a/openwire-dotnet/src/JMS/ITemporaryTopic.cs +++ b/openwire-dotnet/src/JMS/ITemporaryTopic.cs @@ -16,12 +16,12 @@ */ using JMS; - -/// -/// Summary description for TemporaryTopic. -/// namespace JMS { + + /// + /// Summary description for TemporaryTopic. + /// public interface ITemporaryTopic : IDestination { } diff --git a/openwire-dotnet/src/JMS/ITextMessage.cs b/openwire-dotnet/src/JMS/ITextMessage.cs index 886ed8cd4b..5a30345009 100644 --- a/openwire-dotnet/src/JMS/ITextMessage.cs +++ b/openwire-dotnet/src/JMS/ITextMessage.cs @@ -16,12 +16,12 @@ */ using JMS; - -/// -/// Represents a text based message -/// namespace JMS { + + /// + /// Represents a text based message + /// public interface ITextMessage : IMessage { diff --git a/openwire-dotnet/src/JMS/ITopic.cs b/openwire-dotnet/src/JMS/ITopic.cs index cd72fcc90e..06d6cb00b6 100644 --- a/openwire-dotnet/src/JMS/ITopic.cs +++ b/openwire-dotnet/src/JMS/ITopic.cs @@ -17,12 +17,12 @@ using JMS; using System; - -/// -/// Summary description for ITopic. -/// namespace JMS { + + /// + /// Summary description for ITopic. + /// public interface ITopic : IDestination { diff --git a/openwire-dotnet/src/JMS/JMSConnectionException.cs b/openwire-dotnet/src/JMS/JMSConnectionException.cs index 99769225fb..18c80c91c5 100644 --- a/openwire-dotnet/src/JMS/JMSConnectionException.cs +++ b/openwire-dotnet/src/JMS/JMSConnectionException.cs @@ -16,15 +16,15 @@ */ using System; - -/// -/// Represents a connection failure. -/// namespace JMS { + + /// + /// Represents a connection failure. + /// public class ConnectionException : JMSException { - public JMSException(string message) : base(message) + public ConnectionException(string message) : base(message) { } } diff --git a/openwire-dotnet/src/JMS/JMSException.cs b/openwire-dotnet/src/JMS/JMSException.cs index 1bf725acd6..3f87dc50a7 100644 --- a/openwire-dotnet/src/JMS/JMSException.cs +++ b/openwire-dotnet/src/JMS/JMSException.cs @@ -16,12 +16,12 @@ */ using System; - -/// -/// Represents a JMS exception -/// namespace JMS { + + /// + /// Represents a JMS exception + /// public class JMSException : Exception { public JMSException(string message) : base(message) diff --git a/openwire-dotnet/tests/ActiveMQ/OpenWire/BooleanStreamTest.cs b/openwire-dotnet/tests/ActiveMQ/OpenWire/BooleanStreamTest.cs index f38276a15f..d806651d7b 100644 --- a/openwire-dotnet/tests/ActiveMQ/OpenWire/BooleanStreamTest.cs +++ b/openwire-dotnet/tests/ActiveMQ/OpenWire/BooleanStreamTest.cs @@ -120,7 +120,7 @@ namespace ActiveMQ.OpenWire dis.ReadByte(); Assert.Fail("Should have reached the end of the stream"); } - catch (IOException e) + catch (IOException) { } }