You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ta...@apache.org on 2013/04/29 20:34:59 UTC
svn commit: r1477260 - in
/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src:
main/csharp/Commands/ main/csharp/State/ test/csharp/State/
Author: tabish
Date: Mon Apr 29 18:34:58 2013
New Revision: 1477260
URL: http://svn.apache.org/r1477260
Log:
Some code cleanups to make formatting more consistent and give the ThreadSimulator class a more sensible name.
Added:
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/State/ResponseHandler.cs (with props)
Removed:
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/State/ThreadSimulator.cs
Modified:
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/ActiveMQMessage.cs
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/BaseCommand.cs
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/BrokerInfo.cs
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/Command.cs
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/ConnectionControl.cs
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/ConnectionError.cs
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/ConnectionInfo.cs
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/ConsumerControl.cs
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/ConsumerInfo.cs
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/ControlCommand.cs
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/DestinationInfo.cs
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/FlushCommand.cs
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/KeepAliveInfo.cs
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/Message.cs
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/MessageAck.cs
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/MessageDispatch.cs
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/MessageDispatchNotification.cs
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/MessagePull.cs
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/ProducerAck.cs
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/ProducerInfo.cs
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/RemoveInfo.cs
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/RemoveSubscriptionInfo.cs
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/ReplayCommand.cs
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/Response.cs
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/SessionInfo.cs
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/ShutdownInfo.cs
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/TransactionInfo.cs
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/WireFormatInfo.cs
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/State/CommandVisitorAdapter.cs
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/State/ConnectionStateTracker.cs
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/State/ICommandVisitor.cs
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/State/Tracked.cs
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/State/ConnectionStateTrackerTest.cs
Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/ActiveMQMessage.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/ActiveMQMessage.cs?rev=1477260&r1=1477259&r2=1477260&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/ActiveMQMessage.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/ActiveMQMessage.cs Mon Apr 29 18:34:58 2013
@@ -404,9 +404,9 @@ namespace Apache.NMS.ActiveMQ.Commands
}
}
- public override Response visit(ICommandVisitor visitor)
+ public override Response Visit(ICommandVisitor visitor)
{
- return visitor.processMessage(this);
+ return visitor.ProcessMessage(this);
}
}
}
Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/BaseCommand.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/BaseCommand.cs?rev=1477260&r1=1477259&r2=1477260&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/BaseCommand.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/BaseCommand.cs Mon Apr 29 18:34:58 2013
@@ -124,7 +124,7 @@ namespace Apache.NMS.ActiveMQ.Commands
return packetTypeStr;
}
- public virtual Response visit(ICommandVisitor visitor)
+ public virtual Response Visit(ICommandVisitor visitor)
{
throw new ApplicationException("BaseCommand.Visit() not implemented");
}
Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/BrokerInfo.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/BrokerInfo.cs?rev=1477260&r1=1477259&r2=1477260&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/BrokerInfo.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/BrokerInfo.cs Mon Apr 29 18:34:58 2013
@@ -171,9 +171,9 @@ namespace Apache.NMS.ActiveMQ.Commands
/// the proper processXXX method in the visitor.
/// </summery>
///
- public override Response visit(ICommandVisitor visitor)
+ public override Response Visit(ICommandVisitor visitor)
{
- return visitor.processBrokerInfo(this);
+ return visitor.ProcessBrokerInfo(this);
}
};
Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/Command.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/Command.cs?rev=1477260&r1=1477259&r2=1477260&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/Command.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/Command.cs Mon Apr 29 18:34:58 2013
@@ -163,7 +163,7 @@ namespace Apache.NMS.ActiveMQ.Commands
get;
}
- Response visit(ICommandVisitor visitor);
+ Response Visit(ICommandVisitor visitor);
}
}
Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/ConnectionControl.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/ConnectionControl.cs?rev=1477260&r1=1477259&r2=1477260&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/ConnectionControl.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/ConnectionControl.cs Mon Apr 29 18:34:58 2013
@@ -147,9 +147,9 @@ namespace Apache.NMS.ActiveMQ.Commands
/// the proper processXXX method in the visitor.
/// </summery>
///
- public override Response visit(ICommandVisitor visitor)
+ public override Response Visit(ICommandVisitor visitor)
{
- return visitor.processConnectionControl(this);
+ return visitor.ProcessConnectionControl(this);
}
};
Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/ConnectionError.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/ConnectionError.cs?rev=1477260&r1=1477259&r2=1477260&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/ConnectionError.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/ConnectionError.cs Mon Apr 29 18:34:58 2013
@@ -91,9 +91,9 @@ namespace Apache.NMS.ActiveMQ.Commands
/// the proper processXXX method in the visitor.
/// </summery>
///
- public override Response visit(ICommandVisitor visitor)
+ public override Response Visit(ICommandVisitor visitor)
{
- return visitor.processConnectionError(this);
+ return visitor.ProcessConnectionError(this);
}
};
Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/ConnectionInfo.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/ConnectionInfo.cs?rev=1477260&r1=1477259&r2=1477260&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/ConnectionInfo.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/ConnectionInfo.cs Mon Apr 29 18:34:58 2013
@@ -163,9 +163,9 @@ namespace Apache.NMS.ActiveMQ.Commands
/// the proper processXXX method in the visitor.
/// </summery>
///
- public override Response visit(ICommandVisitor visitor)
+ public override Response Visit(ICommandVisitor visitor)
{
- return visitor.processAddConnection( this );
+ return visitor.ProcessAddConnection( this );
}
};
Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/ConsumerControl.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/ConsumerControl.cs?rev=1477260&r1=1477259&r2=1477260&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/ConsumerControl.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/ConsumerControl.cs Mon Apr 29 18:34:58 2013
@@ -131,9 +131,9 @@ namespace Apache.NMS.ActiveMQ.Commands
/// the proper processXXX method in the visitor.
/// </summery>
///
- public override Response visit(ICommandVisitor visitor)
+ public override Response Visit(ICommandVisitor visitor)
{
- return visitor.processConsumerControl(this);
+ return visitor.ProcessConsumerControl(this);
}
};
Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/ConsumerInfo.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/ConsumerInfo.cs?rev=1477260&r1=1477259&r2=1477260&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/ConsumerInfo.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/ConsumerInfo.cs Mon Apr 29 18:34:58 2013
@@ -219,9 +219,9 @@ namespace Apache.NMS.ActiveMQ.Commands
/// the proper processXXX method in the visitor.
/// </summery>
///
- public override Response visit(ICommandVisitor visitor)
+ public override Response Visit(ICommandVisitor visitor)
{
- return visitor.processAddConsumer( this );
+ return visitor.ProcessAddConsumer( this );
}
};
Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/ControlCommand.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/ControlCommand.cs?rev=1477260&r1=1477259&r2=1477260&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/ControlCommand.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/ControlCommand.cs Mon Apr 29 18:34:58 2013
@@ -83,9 +83,9 @@ namespace Apache.NMS.ActiveMQ.Commands
/// the proper processXXX method in the visitor.
/// </summery>
///
- public override Response visit(ICommandVisitor visitor)
+ public override Response Visit(ICommandVisitor visitor)
{
- return visitor.processControlCommand(this);
+ return visitor.ProcessControlCommand(this);
}
};
Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/DestinationInfo.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/DestinationInfo.cs?rev=1477260&r1=1477259&r2=1477260&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/DestinationInfo.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/DestinationInfo.cs Mon Apr 29 18:34:58 2013
@@ -132,15 +132,15 @@ namespace Apache.NMS.ActiveMQ.Commands
/// the proper processXXX method in the visitor.
/// </summery>
///
- public override Response visit(ICommandVisitor visitor)
+ public override Response Visit(ICommandVisitor visitor)
{
if(IsAddOperation)
{
- return visitor.processAddDestination(this);
+ return visitor.ProcessAddDestination(this);
}
else if(IsRemoveOperation)
{
- return visitor.processRemoveDestination(this);
+ return visitor.ProcessRemoveDestination(this);
}
throw new IOException("Unknown operation type: " + OperationType);
}
Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/FlushCommand.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/FlushCommand.cs?rev=1477260&r1=1477259&r2=1477260&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/FlushCommand.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/FlushCommand.cs Mon Apr 29 18:34:58 2013
@@ -72,9 +72,9 @@ namespace Apache.NMS.ActiveMQ.Commands
/// the proper processXXX method in the visitor.
/// </summery>
///
- public override Response visit(ICommandVisitor visitor)
+ public override Response Visit(ICommandVisitor visitor)
{
- return visitor.processFlushCommand(this);
+ return visitor.ProcessFlushCommand(this);
}
};
Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/KeepAliveInfo.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/KeepAliveInfo.cs?rev=1477260&r1=1477259&r2=1477260&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/KeepAliveInfo.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/KeepAliveInfo.cs Mon Apr 29 18:34:58 2013
@@ -72,9 +72,9 @@ namespace Apache.NMS.ActiveMQ.Commands
/// the proper processXXX method in the visitor.
/// </summery>
///
- public override Response visit(ICommandVisitor visitor)
+ public override Response Visit(ICommandVisitor visitor)
{
- return visitor.processKeepAliveInfo(this);
+ return visitor.ProcessKeepAliveInfo(this);
}
};
Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/Message.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/Message.cs?rev=1477260&r1=1477259&r2=1477260&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/Message.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/Message.cs Mon Apr 29 18:34:58 2013
@@ -380,9 +380,9 @@ namespace Apache.NMS.ActiveMQ.Commands
/// the proper processXXX method in the visitor.
/// </summery>
///
- public override Response visit(ICommandVisitor visitor)
+ public override Response Visit(ICommandVisitor visitor)
{
- return visitor.processMessage(this);
+ return visitor.ProcessMessage(this);
}
};
Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/MessageAck.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/MessageAck.cs?rev=1477260&r1=1477259&r2=1477260&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/MessageAck.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/MessageAck.cs Mon Apr 29 18:34:58 2013
@@ -160,9 +160,9 @@ namespace Apache.NMS.ActiveMQ.Commands
/// the proper processXXX method in the visitor.
/// </summery>
///
- public override Response visit(ICommandVisitor visitor)
+ public override Response Visit(ICommandVisitor visitor)
{
- return visitor.processMessageAck(this);
+ return visitor.ProcessMessageAck(this);
}
};
Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/MessageDispatch.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/MessageDispatch.cs?rev=1477260&r1=1477259&r2=1477260&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/MessageDispatch.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/MessageDispatch.cs Mon Apr 29 18:34:58 2013
@@ -159,9 +159,9 @@ namespace Apache.NMS.ActiveMQ.Commands
/// the proper processXXX method in the visitor.
/// </summery>
///
- public override Response visit(ICommandVisitor visitor)
+ public override Response Visit(ICommandVisitor visitor)
{
- return visitor.processMessageDispatch(this);
+ return visitor.ProcessMessageDispatch(this);
}
};
Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/MessageDispatchNotification.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/MessageDispatchNotification.cs?rev=1477260&r1=1477259&r2=1477260&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/MessageDispatchNotification.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/MessageDispatchNotification.cs Mon Apr 29 18:34:58 2013
@@ -107,9 +107,9 @@ namespace Apache.NMS.ActiveMQ.Commands
/// the proper processXXX method in the visitor.
/// </summery>
///
- public override Response visit(ICommandVisitor visitor)
+ public override Response Visit(ICommandVisitor visitor)
{
- return visitor.processMessageDispatchNotification(this);
+ return visitor.ProcessMessageDispatchNotification(this);
}
};
Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/MessagePull.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/MessagePull.cs?rev=1477260&r1=1477259&r2=1477260&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/MessagePull.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/MessagePull.cs Mon Apr 29 18:34:58 2013
@@ -115,9 +115,9 @@ namespace Apache.NMS.ActiveMQ.Commands
/// the proper processXXX method in the visitor.
/// </summery>
///
- public override Response visit(ICommandVisitor visitor)
+ public override Response Visit(ICommandVisitor visitor)
{
- return visitor.processMessagePull(this);
+ return visitor.ProcessMessagePull(this);
}
};
Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/ProducerAck.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/ProducerAck.cs?rev=1477260&r1=1477259&r2=1477260&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/ProducerAck.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/ProducerAck.cs Mon Apr 29 18:34:58 2013
@@ -91,9 +91,9 @@ namespace Apache.NMS.ActiveMQ.Commands
/// the proper processXXX method in the visitor.
/// </summery>
///
- public override Response visit(ICommandVisitor visitor)
+ public override Response Visit(ICommandVisitor visitor)
{
- return visitor.processProducerAck(this);
+ return visitor.ProcessProducerAck(this);
}
};
Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/ProducerInfo.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/ProducerInfo.cs?rev=1477260&r1=1477259&r2=1477260&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/ProducerInfo.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/ProducerInfo.cs Mon Apr 29 18:34:58 2013
@@ -115,9 +115,9 @@ namespace Apache.NMS.ActiveMQ.Commands
/// the proper processXXX method in the visitor.
/// </summery>
///
- public override Response visit(ICommandVisitor visitor)
+ public override Response Visit(ICommandVisitor visitor)
{
- return visitor.processAddProducer( this );
+ return visitor.ProcessAddProducer( this );
}
};
Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/RemoveInfo.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/RemoveInfo.cs?rev=1477260&r1=1477259&r2=1477260&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/RemoveInfo.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/RemoveInfo.cs Mon Apr 29 18:34:58 2013
@@ -91,18 +91,18 @@ namespace Apache.NMS.ActiveMQ.Commands
/// the proper processXXX method in the visitor.
/// </summery>
///
- public override Response visit(ICommandVisitor visitor)
+ public override Response Visit(ICommandVisitor visitor)
{
switch(objectId.GetDataStructureType())
{
case ConnectionId.ID_CONNECTIONID:
- return visitor.processRemoveConnection((ConnectionId) objectId);
+ return visitor.ProcessRemoveConnection((ConnectionId) objectId);
case SessionId.ID_SESSIONID:
- return visitor.processRemoveSession((SessionId) objectId);
+ return visitor.ProcessRemoveSession((SessionId) objectId);
case ConsumerId.ID_CONSUMERID:
- return visitor.processRemoveConsumer((ConsumerId) objectId);
+ return visitor.ProcessRemoveConsumer((ConsumerId) objectId);
case ProducerId.ID_PRODUCERID:
- return visitor.processRemoveProducer((ProducerId) objectId);
+ return visitor.ProcessRemoveProducer((ProducerId) objectId);
default:
throw new IOException("Unknown remove command type: " + objectId.GetDataStructureType());
}
Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/RemoveSubscriptionInfo.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/RemoveSubscriptionInfo.cs?rev=1477260&r1=1477259&r2=1477260&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/RemoveSubscriptionInfo.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/RemoveSubscriptionInfo.cs Mon Apr 29 18:34:58 2013
@@ -99,9 +99,9 @@ namespace Apache.NMS.ActiveMQ.Commands
/// the proper processXXX method in the visitor.
/// </summery>
///
- public override Response visit(ICommandVisitor visitor)
+ public override Response Visit(ICommandVisitor visitor)
{
- return visitor.processRemoveSubscriptionInfo(this);
+ return visitor.ProcessRemoveSubscriptionInfo(this);
}
};
Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/ReplayCommand.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/ReplayCommand.cs?rev=1477260&r1=1477259&r2=1477260&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/ReplayCommand.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/ReplayCommand.cs Mon Apr 29 18:34:58 2013
@@ -91,9 +91,9 @@ namespace Apache.NMS.ActiveMQ.Commands
/// the proper processXXX method in the visitor.
/// </summery>
///
- public override Response visit(ICommandVisitor visitor)
+ public override Response Visit(ICommandVisitor visitor)
{
- return visitor.processReplayCommand(this);
+ return visitor.ProcessReplayCommand(this);
}
};
Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/Response.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/Response.cs?rev=1477260&r1=1477259&r2=1477260&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/Response.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/Response.cs Mon Apr 29 18:34:58 2013
@@ -83,9 +83,9 @@ namespace Apache.NMS.ActiveMQ.Commands
/// the proper processXXX method in the visitor.
/// </summery>
///
- public override Response visit(ICommandVisitor visitor)
+ public override Response Visit(ICommandVisitor visitor)
{
- return visitor.processResponse(this);
+ return visitor.ProcessResponse(this);
}
};
Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/SessionInfo.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/SessionInfo.cs?rev=1477260&r1=1477259&r2=1477260&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/SessionInfo.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/SessionInfo.cs Mon Apr 29 18:34:58 2013
@@ -92,9 +92,9 @@ namespace Apache.NMS.ActiveMQ.Commands
/// the proper processXXX method in the visitor.
/// </summery>
///
- public override Response visit(ICommandVisitor visitor)
+ public override Response Visit(ICommandVisitor visitor)
{
- return visitor.processAddSession( this );
+ return visitor.ProcessAddSession( this );
}
};
Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/ShutdownInfo.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/ShutdownInfo.cs?rev=1477260&r1=1477259&r2=1477260&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/ShutdownInfo.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/ShutdownInfo.cs Mon Apr 29 18:34:58 2013
@@ -72,9 +72,9 @@ namespace Apache.NMS.ActiveMQ.Commands
/// the proper processXXX method in the visitor.
/// </summery>
///
- public override Response visit(ICommandVisitor visitor)
+ public override Response Visit(ICommandVisitor visitor)
{
- return visitor.processShutdownInfo(this);
+ return visitor.ProcessShutdownInfo(this);
}
};
Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/TransactionInfo.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/TransactionInfo.cs?rev=1477260&r1=1477259&r2=1477260&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/TransactionInfo.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/TransactionInfo.cs Mon Apr 29 18:34:58 2013
@@ -105,29 +105,29 @@ namespace Apache.NMS.ActiveMQ.Commands
/// <summery>
/// Allows a Visitor to visit this command and return a response to the
/// command based on the command type being visited. The command will call
- /// the proper processXXX method in the visitor.
+ /// the proper ProcessXXX method in the visitor.
/// </summery>
///
- public override Response visit(ICommandVisitor visitor)
+ public override Response Visit(ICommandVisitor visitor)
{
switch(type)
{
case TransactionInfo.BEGIN:
- return visitor.processBeginTransaction(this);
+ return visitor.ProcessBeginTransaction(this);
case TransactionInfo.END:
- return visitor.processEndTransaction(this);
+ return visitor.ProcessEndTransaction(this);
case TransactionInfo.PREPARE:
- return visitor.processPrepareTransaction(this);
+ return visitor.ProcessPrepareTransaction(this);
case TransactionInfo.COMMIT_ONE_PHASE:
- return visitor.processCommitTransactionOnePhase(this);
+ return visitor.ProcessCommitTransactionOnePhase(this);
case TransactionInfo.COMMIT_TWO_PHASE:
- return visitor.processCommitTransactionTwoPhase(this);
+ return visitor.ProcessCommitTransactionTwoPhase(this);
case TransactionInfo.ROLLBACK:
- return visitor.processRollbackTransaction(this);
+ return visitor.ProcessRollbackTransaction(this);
case TransactionInfo.RECOVER:
- return visitor.processRecoverTransactions(this);
+ return visitor.ProcessRecoverTransactions(this);
case TransactionInfo.FORGET:
- return visitor.processForgetTransaction(this);
+ return visitor.ProcessForgetTransaction(this);
default:
throw new IOException("Transaction info type unknown: " + type);
}
Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/WireFormatInfo.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/WireFormatInfo.cs?rev=1477260&r1=1477259&r2=1477260&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/WireFormatInfo.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/WireFormatInfo.cs Mon Apr 29 18:34:58 2013
@@ -207,9 +207,9 @@ namespace Apache.NMS.ActiveMQ.Commands
}
}
- public override Response visit(ICommandVisitor visitor)
+ public override Response Visit(ICommandVisitor visitor)
{
- return visitor.processWireFormat(this);
+ return visitor.ProcessWireFormat(this);
}
}
}
Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/State/CommandVisitorAdapter.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/State/CommandVisitorAdapter.cs?rev=1477260&r1=1477259&r2=1477260&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/State/CommandVisitorAdapter.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/State/CommandVisitorAdapter.cs Mon Apr 29 18:34:58 2013
@@ -1,206 +1,204 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-using Apache.NMS.ActiveMQ.Commands;
-
-namespace Apache.NMS.ActiveMQ.State
-{
- public class CommandVisitorAdapter : ICommandVisitor
- {
-
- public virtual Response processAddConnection(ConnectionInfo info)
- {
- return null;
- }
-
- public virtual Response processAddConsumer(ConsumerInfo info)
- {
- return null;
- }
-
- public virtual Response processAddDestination(DestinationInfo info)
- {
- return null;
- }
-
- public virtual Response processAddProducer(ProducerInfo info)
- {
- return null;
- }
-
- public virtual Response processAddSession(SessionInfo info)
- {
- return null;
- }
-
- public virtual Response processBeginTransaction(TransactionInfo info)
- {
- return null;
- }
-
- public virtual Response processBrokerInfo(BrokerInfo info)
- {
- return null;
- }
-
- public virtual Response processCommitTransactionOnePhase(TransactionInfo info)
- {
- return null;
- }
-
- public virtual Response processCommitTransactionTwoPhase(TransactionInfo info)
- {
- return null;
- }
-
- public virtual Response processEndTransaction(TransactionInfo info)
- {
- return null;
- }
-
- public virtual Response processFlushCommand(FlushCommand command)
- {
- return null;
- }
-
- public virtual Response processForgetTransaction(TransactionInfo info)
- {
- return null;
- }
-
- public virtual Response processKeepAliveInfo(KeepAliveInfo info)
- {
- return null;
- }
-
- public virtual Response processMessage(Message send)
- {
- return null;
- }
-
- public virtual Response processMessageAck(MessageAck ack)
- {
- return null;
- }
-
- public virtual Response processMessageDispatchNotification(MessageDispatchNotification notification)
- {
- return null;
- }
-
- public virtual Response processMessagePull(MessagePull pull)
- {
- return null;
- }
-
- public virtual Response processPrepareTransaction(TransactionInfo info)
- {
- return null;
- }
-
- public virtual Response processProducerAck(ProducerAck ack)
- {
- return null;
- }
-
- public virtual Response processRecoverTransactions(TransactionInfo info)
- {
- return null;
- }
-
- public virtual Response processRemoveConnection(ConnectionId id)
- {
- return null;
- }
-
- public virtual Response processRemoveConsumer(ConsumerId id)
- {
- return null;
- }
-
- public virtual Response processRemoveDestination(DestinationInfo info)
- {
- return null;
- }
-
- public virtual Response processRemoveProducer(ProducerId id)
- {
- return null;
- }
-
- public virtual Response processRemoveSession(SessionId id)
- {
- return null;
- }
-
- public virtual Response processRemoveSubscriptionInfo(RemoveSubscriptionInfo info)
- {
- return null;
- }
-
- public virtual Response processRollbackTransaction(TransactionInfo info)
- {
- return null;
- }
-
- public virtual Response processShutdownInfo(ShutdownInfo info)
- {
- return null;
- }
-
- public virtual Response processWireFormat(WireFormatInfo info)
- {
- return null;
- }
-
- public virtual Response processMessageDispatch(MessageDispatch dispatch)
- {
- return null;
- }
-
- public virtual Response processControlCommand(ControlCommand command)
- {
- return null;
- }
-
- public virtual Response processConnectionControl(ConnectionControl control)
- {
- return null;
- }
-
- public virtual Response processConnectionError(ConnectionError error)
- {
- return null;
- }
-
- public virtual Response processConsumerControl(ConsumerControl control)
- {
- return null;
- }
-
- public virtual Response processResponse(Response response)
- {
- return null;
- }
-
- public virtual Response processReplayCommand(ReplayCommand replayCommand)
- {
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using Apache.NMS.ActiveMQ.Commands;
+
+namespace Apache.NMS.ActiveMQ.State
+{
+ public class CommandVisitorAdapter : ICommandVisitor
+ {
+ public virtual Response ProcessAddConnection(ConnectionInfo info)
+ {
+ return null;
+ }
+
+ public virtual Response ProcessAddConsumer(ConsumerInfo info)
+ {
+ return null;
+ }
+
+ public virtual Response ProcessAddDestination(DestinationInfo info)
+ {
+ return null;
+ }
+
+ public virtual Response ProcessAddProducer(ProducerInfo info)
+ {
+ return null;
+ }
+
+ public virtual Response ProcessAddSession(SessionInfo info)
+ {
+ return null;
+ }
+
+ public virtual Response ProcessBeginTransaction(TransactionInfo info)
+ {
+ return null;
+ }
+
+ public virtual Response ProcessBrokerInfo(BrokerInfo info)
+ {
+ return null;
+ }
+
+ public virtual Response ProcessCommitTransactionOnePhase(TransactionInfo info)
+ {
+ return null;
+ }
+
+ public virtual Response ProcessCommitTransactionTwoPhase(TransactionInfo info)
+ {
+ return null;
+ }
+
+ public virtual Response ProcessEndTransaction(TransactionInfo info)
+ {
+ return null;
+ }
+
+ public virtual Response ProcessFlushCommand(FlushCommand command)
+ {
+ return null;
+ }
+
+ public virtual Response ProcessForgetTransaction(TransactionInfo info)
+ {
+ return null;
+ }
+
+ public virtual Response ProcessKeepAliveInfo(KeepAliveInfo info)
+ {
+ return null;
+ }
+
+ public virtual Response ProcessMessage(Message send)
+ {
+ return null;
+ }
+
+ public virtual Response ProcessMessageAck(MessageAck ack)
+ {
+ return null;
+ }
+
+ public virtual Response ProcessMessageDispatchNotification(MessageDispatchNotification notification)
+ {
+ return null;
+ }
+
+ public virtual Response ProcessMessagePull(MessagePull pull)
+ {
+ return null;
+ }
+
+ public virtual Response ProcessPrepareTransaction(TransactionInfo info)
+ {
+ return null;
+ }
+
+ public virtual Response ProcessProducerAck(ProducerAck ack)
+ {
+ return null;
+ }
+
+ public virtual Response ProcessRecoverTransactions(TransactionInfo info)
+ {
+ return null;
+ }
+
+ public virtual Response ProcessRemoveConnection(ConnectionId id)
+ {
+ return null;
+ }
+
+ public virtual Response ProcessRemoveConsumer(ConsumerId id)
+ {
+ return null;
+ }
+
+ public virtual Response ProcessRemoveDestination(DestinationInfo info)
+ {
+ return null;
+ }
+
+ public virtual Response ProcessRemoveProducer(ProducerId id)
+ {
+ return null;
+ }
+
+ public virtual Response ProcessRemoveSession(SessionId id)
+ {
+ return null;
+ }
+
+ public virtual Response ProcessRemoveSubscriptionInfo(RemoveSubscriptionInfo info)
+ {
+ return null;
+ }
+
+ public virtual Response ProcessRollbackTransaction(TransactionInfo info)
+ {
+ return null;
+ }
+
+ public virtual Response ProcessShutdownInfo(ShutdownInfo info)
+ {
+ return null;
+ }
+
+ public virtual Response ProcessWireFormat(WireFormatInfo info)
+ {
+ return null;
+ }
+
+ public virtual Response ProcessMessageDispatch(MessageDispatch dispatch)
+ {
+ return null;
+ }
+
+ public virtual Response ProcessControlCommand(ControlCommand command)
+ {
+ return null;
+ }
+
+ public virtual Response ProcessConnectionControl(ConnectionControl control)
+ {
+ return null;
+ }
+
+ public virtual Response ProcessConnectionError(ConnectionError error)
+ {
+ return null;
+ }
+
+ public virtual Response ProcessConsumerControl(ConsumerControl control)
+ {
+ return null;
+ }
+
+ public virtual Response ProcessResponse(Response response)
+ {
+ return null;
+ }
+
+ public virtual Response ProcessReplayCommand(ReplayCommand replayCommand)
+ {
return null;
- }
-
- }
-}
+ }
+ }
+}
Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/State/ConnectionStateTracker.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/State/ConnectionStateTracker.cs?rev=1477260&r1=1477259&r2=1477260&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/State/ConnectionStateTracker.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/State/ConnectionStateTracker.cs Mon Apr 29 18:34:58 2013
@@ -32,7 +32,8 @@ namespace Apache.NMS.ActiveMQ.State
{
private static readonly Tracked TRACKED_RESPONSE_MARKER = new Tracked(null);
- protected Dictionary<ConnectionId, ConnectionState> connectionStates = new Dictionary<ConnectionId, ConnectionState>();
+ protected readonly Dictionary<ConnectionId, ConnectionState> connectionStates =
+ new Dictionary<ConnectionId, ConnectionState>();
private bool isTrackTransactions;
private bool isTrackTransactionProducers = true;
@@ -45,7 +46,7 @@ namespace Apache.NMS.ActiveMQ.State
private int currentCacheSize;
private readonly LRUCache<Object, Command> messageCache = new LRUCache<Object, Command>(256);
- private class RemoveTransactionAction : ThreadSimulator
+ private class RemoveTransactionAction : ResponseHandler
{
private readonly TransactionInfo info;
private readonly ConnectionStateTracker cst;
@@ -56,7 +57,7 @@ namespace Apache.NMS.ActiveMQ.State
this.cst = aCst;
}
- public override void Run()
+ public override void OnResponse()
{
ConnectionState cs;
@@ -75,7 +76,7 @@ namespace Apache.NMS.ActiveMQ.State
{
try
{
- return (Tracked) command.visit(this);
+ return (Tracked) command.Visit(this);
}
catch(IOException)
{
@@ -325,7 +326,7 @@ namespace Apache.NMS.ActiveMQ.State
}
}
- public override Response processAddDestination(DestinationInfo info)
+ public override Response ProcessAddDestination(DestinationInfo info)
{
if(info != null && info.Destination.IsTemporary)
{
@@ -339,7 +340,7 @@ namespace Apache.NMS.ActiveMQ.State
return TRACKED_RESPONSE_MARKER;
}
- public override Response processRemoveDestination(DestinationInfo info)
+ public override Response ProcessRemoveDestination(DestinationInfo info)
{
if(info != null && info.Destination.IsTemporary)
{
@@ -352,7 +353,7 @@ namespace Apache.NMS.ActiveMQ.State
return TRACKED_RESPONSE_MARKER;
}
- public override Response processAddProducer(ProducerInfo info)
+ public override Response ProcessAddProducer(ProducerInfo info)
{
if(info != null && info.ProducerId != null)
{
@@ -378,7 +379,7 @@ namespace Apache.NMS.ActiveMQ.State
return TRACKED_RESPONSE_MARKER;
}
- public override Response processRemoveProducer(ProducerId id)
+ public override Response ProcessRemoveProducer(ProducerId id)
{
if(id != null)
{
@@ -404,7 +405,7 @@ namespace Apache.NMS.ActiveMQ.State
return TRACKED_RESPONSE_MARKER;
}
- public override Response processAddConsumer(ConsumerInfo info)
+ public override Response ProcessAddConsumer(ConsumerInfo info)
{
if(info != null)
{
@@ -430,7 +431,7 @@ namespace Apache.NMS.ActiveMQ.State
return TRACKED_RESPONSE_MARKER;
}
- public override Response processRemoveConsumer(ConsumerId id)
+ public override Response ProcessRemoveConsumer(ConsumerId id)
{
if(id != null)
{
@@ -456,7 +457,7 @@ namespace Apache.NMS.ActiveMQ.State
return TRACKED_RESPONSE_MARKER;
}
- public override Response processAddSession(SessionInfo info)
+ public override Response ProcessAddSession(SessionInfo info)
{
if(info != null)
{
@@ -474,7 +475,7 @@ namespace Apache.NMS.ActiveMQ.State
return TRACKED_RESPONSE_MARKER;
}
- public override Response processRemoveSession(SessionId id)
+ public override Response ProcessRemoveSession(SessionId id)
{
if(id != null)
{
@@ -492,7 +493,7 @@ namespace Apache.NMS.ActiveMQ.State
return TRACKED_RESPONSE_MARKER;
}
- public override Response processAddConnection(ConnectionInfo info)
+ public override Response ProcessAddConnection(ConnectionInfo info)
{
if(info != null)
{
@@ -511,7 +512,7 @@ namespace Apache.NMS.ActiveMQ.State
return TRACKED_RESPONSE_MARKER;
}
- public override Response processRemoveConnection(ConnectionId id)
+ public override Response ProcessRemoveConnection(ConnectionId id)
{
if(id != null)
{
@@ -520,7 +521,7 @@ namespace Apache.NMS.ActiveMQ.State
return TRACKED_RESPONSE_MARKER;
}
- public override Response processMessage(Message send)
+ public override Response ProcessMessage(Message send)
{
if(send != null)
{
@@ -558,7 +559,7 @@ namespace Apache.NMS.ActiveMQ.State
return null;
}
- public override Response processMessageAck(MessageAck ack)
+ public override Response ProcessMessageAck(MessageAck ack)
{
if(TrackTransactions && ack != null && ack.TransactionId != null)
{
@@ -581,7 +582,7 @@ namespace Apache.NMS.ActiveMQ.State
return null;
}
- public override Response processBeginTransaction(TransactionInfo info)
+ public override Response ProcessBeginTransaction(TransactionInfo info)
{
if(TrackTransactions && info != null && info.TransactionId != null)
{
@@ -602,7 +603,7 @@ namespace Apache.NMS.ActiveMQ.State
return null;
}
- public override Response processPrepareTransaction(TransactionInfo info)
+ public override Response ProcessPrepareTransaction(TransactionInfo info)
{
if(TrackTransactions && info != null)
{
@@ -625,7 +626,7 @@ namespace Apache.NMS.ActiveMQ.State
return null;
}
- public override Response processCommitTransactionOnePhase(TransactionInfo info)
+ public override Response ProcessCommitTransactionOnePhase(TransactionInfo info)
{
if(TrackTransactions && info != null)
{
@@ -648,7 +649,7 @@ namespace Apache.NMS.ActiveMQ.State
return null;
}
- public override Response processCommitTransactionTwoPhase(TransactionInfo info)
+ public override Response ProcessCommitTransactionTwoPhase(TransactionInfo info)
{
if(TrackTransactions && info != null)
{
@@ -671,7 +672,7 @@ namespace Apache.NMS.ActiveMQ.State
return null;
}
- public override Response processRollbackTransaction(TransactionInfo info)
+ public override Response ProcessRollbackTransaction(TransactionInfo info)
{
if(TrackTransactions && info != null)
{
@@ -694,7 +695,7 @@ namespace Apache.NMS.ActiveMQ.State
return null;
}
- public override Response processEndTransaction(TransactionInfo info)
+ public override Response ProcessEndTransaction(TransactionInfo info)
{
if(TrackTransactions && info != null)
{
@@ -717,7 +718,7 @@ namespace Apache.NMS.ActiveMQ.State
return null;
}
- public override Response processMessagePull(MessagePull pull)
+ public override Response ProcessMessagePull(MessagePull pull)
{
if (pull != null)
{
Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/State/ICommandVisitor.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/State/ICommandVisitor.cs?rev=1477260&r1=1477259&r2=1477260&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/State/ICommandVisitor.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/State/ICommandVisitor.cs Mon Apr 29 18:34:58 2013
@@ -1,99 +1,98 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-using Apache.NMS.ActiveMQ.Commands;
-
-namespace Apache.NMS.ActiveMQ.State
-{
- public interface ICommandVisitor
- {
-
- Response processAddConnection(ConnectionInfo info);
-
- Response processAddSession(SessionInfo info);
-
- Response processAddProducer(ProducerInfo info);
-
- Response processAddConsumer(ConsumerInfo info);
-
- Response processRemoveConnection(ConnectionId id);
-
- Response processRemoveSession(SessionId id);
-
- Response processRemoveProducer(ProducerId id);
-
- Response processRemoveConsumer(ConsumerId id);
-
- Response processAddDestination(DestinationInfo info);
-
- Response processRemoveDestination(DestinationInfo info);
-
- Response processRemoveSubscriptionInfo(RemoveSubscriptionInfo info);
-
- Response processMessage(Message send);
-
- Response processMessageAck(MessageAck ack);
-
- Response processMessagePull(MessagePull pull);
-
- Response processBeginTransaction(TransactionInfo info);
-
- Response processPrepareTransaction(TransactionInfo info);
-
- Response processCommitTransactionOnePhase(TransactionInfo info);
-
- Response processCommitTransactionTwoPhase(TransactionInfo info);
-
- Response processRollbackTransaction(TransactionInfo info);
-
- Response processWireFormat(WireFormatInfo info);
-
- Response processKeepAliveInfo(KeepAliveInfo info);
-
- Response processShutdownInfo(ShutdownInfo info);
-
- Response processFlushCommand(FlushCommand command);
-
- Response processBrokerInfo(BrokerInfo info);
-
- Response processRecoverTransactions(TransactionInfo info);
-
- Response processForgetTransaction(TransactionInfo info);
-
- Response processEndTransaction(TransactionInfo info);
-
- Response processMessageDispatchNotification(MessageDispatchNotification notification);
-
- Response processProducerAck(ProducerAck ack);
-
- Response processMessageDispatch(MessageDispatch dispatch);
-
- Response processControlCommand(ControlCommand command);
-
- Response processConnectionError(ConnectionError error);
-
- Response processConnectionControl(ConnectionControl control);
-
- Response processConsumerControl(ConsumerControl control);
-
- Response processResponse(Response response);
-
- Response processReplayCommand(ReplayCommand replayCommand);
-
- }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+using Apache.NMS.ActiveMQ.Commands;
+
+namespace Apache.NMS.ActiveMQ.State
+{
+ public interface ICommandVisitor
+ {
+ Response ProcessAddConnection(ConnectionInfo info);
+
+ Response ProcessAddSession(SessionInfo info);
+
+ Response ProcessAddProducer(ProducerInfo info);
+
+ Response ProcessAddConsumer(ConsumerInfo info);
+
+ Response ProcessRemoveConnection(ConnectionId id);
+
+ Response ProcessRemoveSession(SessionId id);
+
+ Response ProcessRemoveProducer(ProducerId id);
+
+ Response ProcessRemoveConsumer(ConsumerId id);
+
+ Response ProcessAddDestination(DestinationInfo info);
+
+ Response ProcessRemoveDestination(DestinationInfo info);
+
+ Response ProcessRemoveSubscriptionInfo(RemoveSubscriptionInfo info);
+
+ Response ProcessMessage(Message send);
+
+ Response ProcessMessageAck(MessageAck ack);
+
+ Response ProcessMessagePull(MessagePull pull);
+
+ Response ProcessBeginTransaction(TransactionInfo info);
+
+ Response ProcessPrepareTransaction(TransactionInfo info);
+
+ Response ProcessCommitTransactionOnePhase(TransactionInfo info);
+
+ Response ProcessCommitTransactionTwoPhase(TransactionInfo info);
+
+ Response ProcessRollbackTransaction(TransactionInfo info);
+
+ Response ProcessWireFormat(WireFormatInfo info);
+
+ Response ProcessKeepAliveInfo(KeepAliveInfo info);
+
+ Response ProcessShutdownInfo(ShutdownInfo info);
+
+ Response ProcessFlushCommand(FlushCommand command);
+
+ Response ProcessBrokerInfo(BrokerInfo info);
+
+ Response ProcessRecoverTransactions(TransactionInfo info);
+
+ Response ProcessForgetTransaction(TransactionInfo info);
+
+ Response ProcessEndTransaction(TransactionInfo info);
+
+ Response ProcessMessageDispatchNotification(MessageDispatchNotification notification);
+
+ Response ProcessProducerAck(ProducerAck ack);
+
+ Response ProcessMessageDispatch(MessageDispatch dispatch);
+
+ Response ProcessControlCommand(ControlCommand command);
+
+ Response ProcessConnectionError(ConnectionError error);
+
+ Response ProcessConnectionControl(ConnectionControl control);
+
+ Response ProcessConsumerControl(ConsumerControl control);
+
+ Response ProcessResponse(Response response);
+
+ Response ProcessReplayCommand(ReplayCommand replayCommand);
+
+ }
+}
Added: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/State/ResponseHandler.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/State/ResponseHandler.cs?rev=1477260&view=auto
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/State/ResponseHandler.cs (added)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/State/ResponseHandler.cs Mon Apr 29 18:34:58 2013
@@ -0,0 +1,29 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using System;
+
+namespace Apache.NMS.ActiveMQ.State
+{
+ public abstract class ResponseHandler
+ {
+ public virtual void OnResponse()
+ {
+ throw new ApplicationException("ResponseHandler.Run() should be overridden.");
+ }
+ }
+}
Propchange: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/State/ResponseHandler.cs
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/State/ResponseHandler.cs
------------------------------------------------------------------------------
svn:executable = *
Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/State/Tracked.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/State/Tracked.cs?rev=1477260&r1=1477259&r2=1477260&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/State/Tracked.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/State/Tracked.cs Mon Apr 29 18:34:58 2013
@@ -21,26 +21,25 @@ namespace Apache.NMS.ActiveMQ.State
{
public class Tracked : Response
{
- private ThreadSimulator runnable = null;
+ private ResponseHandler handler = null;
- public Tracked(ThreadSimulator runnable)
+ public Tracked(ResponseHandler handler)
{
- this.runnable = runnable;
+ this.handler = handler;
}
public void onResponses()
{
- if (runnable != null)
+ if (handler != null)
{
- runnable.Run();
- runnable = null;
+ handler.OnResponse();
+ handler = null;
}
}
virtual public bool WaitingForResponse
{
- get { return runnable != null; }
+ get { return handler != null; }
}
-
}
}
Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/State/ConnectionStateTrackerTest.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/State/ConnectionStateTrackerTest.cs?rev=1477260&r1=1477259&r2=1477260&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/State/ConnectionStateTrackerTest.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/State/ConnectionStateTrackerTest.cs Mon Apr 29 18:34:58 2013
@@ -217,26 +217,25 @@ namespace Apache.NMS.ActiveMQ.Test
conn.producer = new ProducerInfo();
conn.producer.ProducerId = producerId;
- tracker.processAddConnection(conn.connection);
- tracker.processAddSession(conn.session);
- tracker.processAddConsumer(conn.consumer);
- tracker.processAddProducer(conn.producer);
+ tracker.ProcessAddConnection(conn.connection);
+ tracker.ProcessAddSession(conn.session);
+ tracker.ProcessAddConsumer(conn.consumer);
+ tracker.ProcessAddProducer(conn.producer);
return conn;
}
void ClearConnectionState(ConnectionStateTracker tracker, ConnectionData conn)
{
- tracker.processRemoveProducer(conn.producer.ProducerId);
- tracker.processRemoveConsumer(conn.consumer.ConsumerId);
- tracker.processRemoveSession(conn.session.SessionId);
- tracker.processRemoveConnection(conn.connection.ConnectionId);
+ tracker.ProcessRemoveProducer(conn.producer.ProducerId);
+ tracker.ProcessRemoveConsumer(conn.consumer.ConsumerId);
+ tracker.ProcessRemoveSession(conn.session.SessionId);
+ tracker.ProcessRemoveConnection(conn.connection.ConnectionId);
}
[SetUp]
public void SetUp()
{
- Apache.NMS.Tracer.Trace = new NmsConsoleTracer();
}
[Test]
@@ -256,12 +255,6 @@ namespace Apache.NMS.ActiveMQ.Test
ConnectionData conn = CreateConnectionState(tracker);
- int messageSize;
- {
- Message message = new Message();
- messageSize = message.Size();
- }
-
tracker.MaxCacheSize = 4;
int sequenceId = 1;
@@ -274,7 +267,7 @@ namespace Apache.NMS.ActiveMQ.Test
Message message = new Message();
message.MessageId = id;
- tracker.processMessage(message);
+ tracker.ProcessMessage(message);
tracker.TrackBack(message);
}
@@ -299,7 +292,7 @@ namespace Apache.NMS.ActiveMQ.Test
ActiveMQDestination destination = new ActiveMQTopic("TEST" + i);
pull.ConsumerId = conn.consumer.ConsumerId;
pull.Destination = destination;
- tracker.processMessagePull(pull);
+ tracker.ProcessMessagePull(pull);
tracker.TrackBack(pull);
}
@@ -324,7 +317,7 @@ namespace Apache.NMS.ActiveMQ.Test
ActiveMQDestination destination = new ActiveMQTopic("TEST");
pull.ConsumerId = conn.consumer.ConsumerId;
pull.Destination = destination;
- tracker.processMessagePull(pull);
+ tracker.ProcessMessagePull(pull);
tracker.TrackBack(pull);
}