Author: chirino
Date: Sun Mar 5 01:47:04 2006
New Revision: 383299
URL: http://svn.apache.org/viewcvs?rev=383299&view=rev
Log:
A few more refactors.
Added:
incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/Commands/AbstractCommand.cs
- copied, changed from r383295, incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/OpenWire/AbstractCommand.cs
incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/Commands/BrokerError.cs
- copied, changed from r383283, incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/OpenWire/BrokerError.cs
incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/Commands/Command.cs
- copied, changed from r383283, incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/OpenWire/Command.cs
incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/Commands/DataStructure.cs
- copied, changed from r383283, incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/OpenWire/DataStructure.cs
incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/Commands/DataStructureSupport.cs
- copied, changed from r383295, incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/OpenWire/DataStructureSupport.cs
incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/Commands/MarshallAware.cs
- copied, changed from r383283, incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/OpenWire/MarshallAware.cs
incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/Dispatcher.cs
- copied, changed from r383295, incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/OpenWire/Dispatcher.cs
incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/ISynchronization.cs
- copied, changed from r383283, incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/OpenWire/ISynchronization.cs
incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/Transport/FutureResponse.cs
- copied, changed from r383295, incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/OpenWire/FutureResponse.cs
Removed:
incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/OpenWire/AbstractCommand.cs
incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/OpenWire/BrokerError.cs
incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/OpenWire/Command.cs
incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/OpenWire/DataStructure.cs
incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/OpenWire/DataStructureSupport.cs
incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/OpenWire/Dispatcher.cs
incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/OpenWire/FutureResponse.cs
incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/OpenWire/ISynchronization.cs
incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/OpenWire/MarshallAware.cs
incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/OpenWireException.cs
Modified:
incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/BrokerException.cs
incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/Commands/ActiveMQDestination.cs
incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/Commands/ActiveMQMessage.cs
incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/Commands/BaseCommand.cs
incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/Connection.cs
incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/ConnectionClosedException.cs
incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/ConsumerClosedException.cs
incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/MessageConsumer.cs
incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/OpenWire/PrimitiveMap.cs
incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/OpenWire/V1/DataStructureSupportMarshaller.cs
incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/TransactionContext.cs
incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/Transport/ITransport.cs
incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/Transport/SocketTransport.cs
incubator/activemq/trunk/openwire-dotnet/src/src.csproj
Modified: incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/BrokerException.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/BrokerException.cs?rev=383299&r1=383298&r2=383299&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/BrokerException.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/BrokerException.cs Sun Mar 5 01:47:04
2006
@@ -14,8 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-using ActiveMQ;
-using ActiveMQ.OpenWire;
+using ActiveMQ.Commands;
+using JMS;
/// <summary>
@@ -24,7 +24,7 @@
namespace ActiveMQ
{
- public class BrokerException : OpenWireException
+ public class BrokerException : JMSException
{
private BrokerError brokerError;
Copied: incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/Commands/AbstractCommand.cs
(from r383295, incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/OpenWire/AbstractCommand.cs)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/Commands/AbstractCommand.cs?p2=incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/Commands/AbstractCommand.cs&p1=incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/OpenWire/AbstractCommand.cs&r1=383295&r2=383299&rev=383299&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/OpenWire/AbstractCommand.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/Commands/AbstractCommand.cs Sun
Mar 5 01:47:04 2006
@@ -17,12 +17,13 @@
using ActiveMQ.Commands;
using System;
-namespace ActiveMQ.OpenWire
+
+/// <summary>
+/// Summary description for AbstractCommand.
+/// </summary>
+namespace ActiveMQ.Commands
{
- /// <summary>
- /// Summary description for AbstractCommand.
- /// </summary>
- public abstract class AbstractCommand : Command
+ public abstract class AbstractCommand : Command
{
private short commandId;
private bool responseRequired;
@@ -138,3 +139,4 @@
}
}
}
+
Modified: incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/Commands/ActiveMQDestination.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/Commands/ActiveMQDestination.cs?rev=383299&r1=383298&r2=383299&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/Commands/ActiveMQDestination.cs
(original)
+++ incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/Commands/ActiveMQDestination.cs
Sun Mar 5 01:47:04 2006
@@ -14,9 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-using ActiveMQ;
using ActiveMQ.Commands;
-using ActiveMQ.OpenWire;
using JMS;
using System;
Modified: incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/Commands/ActiveMQMessage.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/Commands/ActiveMQMessage.cs?rev=383299&r1=383298&r2=383299&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/Commands/ActiveMQMessage.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/Commands/ActiveMQMessage.cs Sun
Mar 5 01:47:04 2006
@@ -14,8 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-using ActiveMQ;
-using ActiveMQ.Commands;
using ActiveMQ.OpenWire;
using JMS;
@@ -55,7 +53,7 @@
{
if (Acknowledger == null)
{
- throw new OpenWireException("No Acknowledger has been associated with this
message: " + this);
+ throw new JMSException("No Acknowledger has been associated with this message:
" + this);
}
else
{
Modified: incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/Commands/BaseCommand.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/Commands/BaseCommand.cs?rev=383299&r1=383298&r2=383299&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/Commands/BaseCommand.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/Commands/BaseCommand.cs Sun Mar
5 01:47:04 2006
@@ -8,7 +8,6 @@
//
using ActiveMQ.Commands;
-using ActiveMQ.OpenWire;
using System;
Copied: incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/Commands/BrokerError.cs (from
r383283, incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/OpenWire/BrokerError.cs)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/Commands/BrokerError.cs?p2=incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/Commands/BrokerError.cs&p1=incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/OpenWire/BrokerError.cs&r1=383283&r2=383299&rev=383299&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/OpenWire/BrokerError.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/Commands/BrokerError.cs Sun Mar
5 01:47:04 2006
@@ -14,26 +14,29 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+using ActiveMQ.Commands;
using System;
-using System.Text;
using System.IO;
-namespace ActiveMQ.OpenWire
+namespace ActiveMQ.Commands
{
- public struct StackTraceElement
+ public struct StackTraceElement
{
public string ClassName;
public string FileName;
public string MethodName;
public int LineNumber;
}
-
-
- /// <summary>
- /// Represents an exception on the broker
- /// </summary>
- public class BrokerError : AbstractCommand
+}
+
+
+/// <summary>
+/// Represents an exception on the broker
+/// </summary>
+namespace ActiveMQ.Commands
+{
+ public class BrokerError : AbstractCommand
{
private string message;
private string exceptionClass;
@@ -64,7 +67,8 @@
set { cause = value; }
}
- public String StackTrace {
+ public String StackTrace
+ {
get {
StringWriter writer = new StringWriter();
PrintStackTrace(writer);
@@ -88,3 +92,4 @@
}
}
}
+
Copied: incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/Commands/Command.cs (from r383283,
incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/OpenWire/Command.cs)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/Commands/Command.cs?p2=incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/Commands/Command.cs&p1=incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/OpenWire/Command.cs&r1=383283&r2=383299&rev=383299&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/OpenWire/Command.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/Commands/Command.cs Sun Mar 5 01:47:04
2006
@@ -14,15 +14,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-using System;
+using ActiveMQ.Commands;
-namespace ActiveMQ.OpenWire
+/// <summary>
+/// An OpenWire command
+/// </summary>
+namespace ActiveMQ.Commands
{
- /// <summary>
- /// An OpenWire command
- /// </summary>
- public interface Command : DataStructure
+ public interface Command : DataStructure
{
short CommandId
{
@@ -37,3 +37,4 @@
}
}
}
+
Copied: incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/Commands/DataStructure.cs (from
r383283, incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/OpenWire/DataStructure.cs)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/Commands/DataStructure.cs?p2=incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/Commands/DataStructure.cs&p1=incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/OpenWire/DataStructure.cs&r1=383283&r2=383299&rev=383299&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/OpenWire/DataStructure.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/Commands/DataStructure.cs Sun Mar
5 01:47:04 2006
@@ -14,16 +14,19 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-using System;
-namespace ActiveMQ.OpenWire
-{
- /// <summary>
- /// An OpenWire command
- /// </summary>
- public interface DataStructure {
- byte GetDataStructureType();
- bool IsMarshallAware();
- }
+
+/// <summary>
+/// An OpenWire command
+/// </summary>
+namespace ActiveMQ.Commands
+{
+ public interface DataStructure
+ {
+
+ byte GetDataStructureType();
+ bool IsMarshallAware();
+ }
}
+
Copied: incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/Commands/DataStructureSupport.cs
(from r383295, incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/OpenWire/DataStructureSupport.cs)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/Commands/DataStructureSupport.cs?p2=incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/Commands/DataStructureSupport.cs&p1=incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/OpenWire/DataStructureSupport.cs&r1=383295&r2=383299&rev=383299&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/OpenWire/DataStructureSupport.cs
(original)
+++ incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/Commands/DataStructureSupport.cs
Sun Mar 5 01:47:04 2006
@@ -14,26 +14,30 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-using System;
+using ActiveMQ.Commands;
-using ActiveMQ.OpenWire;
-namespace ActiveMQ.OpenWire
+/// <summary>
+/// Summary description for DataStructureSupport.
+/// </summary>
+namespace ActiveMQ.Commands
{
- /// <summary>
- /// Summary description for DataStructureSupport.
- /// </summary>
- public abstract class DataStructureSupport : DataStructure {
-
- protected DataStructureSupport() {
- }
-
- public virtual byte GetDataStructureType() {
- return 0;
- }
-
- public virtual bool IsMarshallAware() {
- return false;
- }
- }
+ public abstract class DataStructureSupport : DataStructure
+ {
+
+ protected DataStructureSupport()
+ {
+ }
+
+ public virtual byte GetDataStructureType()
+ {
+ return 0;
+ }
+
+ public virtual bool IsMarshallAware()
+ {
+ return false;
+ }
+ }
}
+
Copied: incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/Commands/MarshallAware.cs (from
r383283, incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/OpenWire/MarshallAware.cs)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/Commands/MarshallAware.cs?p2=incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/Commands/MarshallAware.cs&p1=incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/OpenWire/MarshallAware.cs&r1=383283&r2=383299&rev=383299&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/OpenWire/MarshallAware.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/Commands/MarshallAware.cs Sun Mar
5 01:47:04 2006
@@ -14,23 +14,25 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-using System;
-using System.IO;
+using ActiveMQ.OpenWire;
-namespace ActiveMQ.OpenWire
-{
-/// <summary>
- /// Represents a marshallable entity
- /// </summary>
- public interface MarshallAware {
-
- void BeforeMarshall(OpenWireFormat wireFormat);
- void AfterMarshall(OpenWireFormat wireFormat);
-
- void BeforeUnmarshall(OpenWireFormat wireFormat);
- void AfterUnmarshall(OpenWireFormat wireFormat);
- void SetMarshalledForm(OpenWireFormat wireFormat, byte[] data);
- byte[] GetMarshalledForm(OpenWireFormat wireFormat);
- }
+/// <summary>
+/// Represents a marshallable entity
+/// </summary>
+namespace ActiveMQ.Commands
+{
+ public interface MarshallAware
+ {
+
+ void BeforeMarshall(OpenWireFormat wireFormat);
+ void AfterMarshall(OpenWireFormat wireFormat);
+
+ void BeforeUnmarshall(OpenWireFormat wireFormat);
+ void AfterUnmarshall(OpenWireFormat wireFormat);
+
+ void SetMarshalledForm(OpenWireFormat wireFormat, byte[] data);
+ byte[] GetMarshalledForm(OpenWireFormat wireFormat);
+ }
}
+
Modified: incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/Connection.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/Connection.cs?rev=383299&r1=383298&r2=383299&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/Connection.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/Connection.cs Sun Mar 5 01:47:04
2006
@@ -1,5 +1,4 @@
using ActiveMQ.Commands;
-using ActiveMQ.OpenWire;
using ActiveMQ.Transport;
using JMS;
using System;
@@ -105,7 +104,7 @@
set {
if (connected)
{
- throw new OpenWireException("You cannot change the ClientId once the
Connection is connected");
+ throw new JMSException("You cannot change the ClientId once the Connection
is connected");
}
info.ClientId = value;
}
@@ -145,7 +144,7 @@
{
ExceptionResponse exceptionResponse = (ExceptionResponse) response;
// TODO include stack trace
- throw new OpenWireException("Request failed: " + exceptionResponse);
+ throw new JMSException("Request failed: " + exceptionResponse);
}
return response;
}
Modified: incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/ConnectionClosedException.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/ConnectionClosedException.cs?rev=383299&r1=383298&r2=383299&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/ConnectionClosedException.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/ConnectionClosedException.cs Sun
Mar 5 01:47:04 2006
@@ -14,17 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-using System;
-using System.Collections;
-
-using ActiveMQ.OpenWire;
+using JMS;
namespace ActiveMQ
{
/// <summary>
/// Exception thrown when a connection is used that it already closed
/// </summary>
- public class ConnectionClosedException : OpenWireException {
+ public class ConnectionClosedException : JMSException {
public ConnectionClosedException() : base("The connection is already closed!")
{
}
}
Modified: incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/ConsumerClosedException.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/ConsumerClosedException.cs?rev=383299&r1=383298&r2=383299&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/ConsumerClosedException.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/ConsumerClosedException.cs Sun Mar
5 01:47:04 2006
@@ -14,17 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-using System;
-using System.Collections;
-
-using ActiveMQ.OpenWire;
+using JMS;
namespace ActiveMQ
{
/// <summary>
/// Exception thrown when a consumer is used that it already closed
/// </summary>
- public class ConsumerClosedException : OpenWireException {
+ public class ConsumerClosedException : JMSException {
public ConsumerClosedException() : base("The consumer is already closed!")
{
}
}
Copied: incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/Dispatcher.cs (from r383295,
incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/OpenWire/Dispatcher.cs)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/Dispatcher.cs?p2=incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/Dispatcher.cs&p1=incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/OpenWire/Dispatcher.cs&r1=383295&r2=383299&rev=383299&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/OpenWire/Dispatcher.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/Dispatcher.cs Sun Mar 5 01:47:04
2006
@@ -20,25 +20,28 @@
using System.Collections;
using System.Threading;
-namespace ActiveMQ.OpenWire
+
+/// <summary>
+/// Handles the multi-threaded dispatching between the transport and the consumers
+/// </summary>
+namespace ActiveMQ
{
- /// <summary>
- /// Handles the multi-threaded dispatching between the transport and the consumers
- /// </summary>
- public class Dispatcher
+ public class Dispatcher
{
Queue queue = new Queue();
Object semaphore = new Object();
ArrayList messagesToRedeliver = new ArrayList();
-
+
/// <summary>
/// Whem we start a transaction we must redeliver any rolled back messages
/// </summary>
- public void RedeliverRolledBackMessages() {
+ public void RedeliverRolledBackMessages()
+ {
lock (semaphore)
{
Queue replacement = new Queue(queue.Count + messagesToRedeliver.Count);
- foreach (ActiveMQMessage element in messagesToRedeliver) {
+ foreach (ActiveMQMessage element in messagesToRedeliver)
+ {
replacement.Enqueue(element);
}
messagesToRedeliver.Clear();
@@ -58,8 +61,9 @@
/// </summary>
public void Redeliver(ActiveMQMessage message)
{
- lock (semaphore) {
- messagesToRedeliver.Add(message);
+ lock (semaphore)
+ {
+ messagesToRedeliver.Add(message);
}
}
@@ -122,3 +126,4 @@
}
}
+
Copied: incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/ISynchronization.cs (from r383283,
incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/OpenWire/ISynchronization.cs)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/ISynchronization.cs?p2=incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/ISynchronization.cs&p1=incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/OpenWire/ISynchronization.cs&r1=383283&r2=383299&rev=383299&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/OpenWire/ISynchronization.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/ISynchronization.cs Sun Mar 5 01:47:04
2006
@@ -14,9 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-namespace ActiveMQ.OpenWire
+
+namespace ActiveMQ
{
- public interface ISynchronization
+ public interface ISynchronization
{
/// <summary>
/// Called before a commit
@@ -34,3 +35,4 @@
void AfterRollback();
}
}
+
Modified: incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/MessageConsumer.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/MessageConsumer.cs?rev=383299&r1=383298&r2=383299&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/MessageConsumer.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/MessageConsumer.cs Sun Mar 5 01:47:04
2006
@@ -14,8 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+using ActiveMQ;
using ActiveMQ.Commands;
-using ActiveMQ.OpenWire;
using JMS;
using System.Threading;
Modified: incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/OpenWire/PrimitiveMap.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/OpenWire/PrimitiveMap.cs?rev=383299&r1=383298&r2=383299&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/OpenWire/PrimitiveMap.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/OpenWire/PrimitiveMap.cs Sun Mar
5 01:47:04 2006
@@ -219,7 +219,7 @@
{
if (! type.IsInstanceOfType(value))
{
- throw new OpenWireException("Expected type: " + type.Name + " but was: "
+ value);
+ throw new JMSException("Expected type: " + type.Name + " but was: " + value);
}
}
@@ -230,7 +230,7 @@
Type type = value.GetType();
if (! type.IsPrimitive && !type.IsValueType && !type.IsAssignableFrom(typeof(string)))
{
- throw new OpenWireException("Invalid type: " + type.Name + " for value:
" + value);
+ throw new JMSException("Invalid type: " + type.Name + " for value: "
+ value);
}
}
}
Modified: incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/OpenWire/V1/DataStructureSupportMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/OpenWire/V1/DataStructureSupportMarshaller.cs?rev=383299&r1=383298&r2=383299&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/OpenWire/V1/DataStructureSupportMarshaller.cs
(original)
+++ incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/OpenWire/V1/DataStructureSupportMarshaller.cs
Sun Mar 5 01:47:04 2006
@@ -15,12 +15,9 @@
// limitations under the License.
//
+using ActiveMQ.Commands;
using System;
-using System.Collections;
using System.IO;
-
-using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.V1;
namespace ActiveMQ.OpenWire.V1
{
Modified: incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/TransactionContext.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/TransactionContext.cs?rev=383299&r1=383298&r2=383299&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/TransactionContext.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/TransactionContext.cs Sun Mar 5
01:47:04 2006
@@ -14,8 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+using ActiveMQ;
using ActiveMQ.Commands;
-using ActiveMQ.OpenWire;
using System.Collections;
Copied: incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/Transport/FutureResponse.cs
(from r383295, incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/OpenWire/FutureResponse.cs)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/Transport/FutureResponse.cs?p2=incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/Transport/FutureResponse.cs&p1=incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/OpenWire/FutureResponse.cs&r1=383295&r2=383299&rev=383299&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/OpenWire/FutureResponse.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/Transport/FutureResponse.cs Sun
Mar 5 01:47:04 2006
@@ -18,12 +18,13 @@
using System;
using System.Threading;
-namespace ActiveMQ.OpenWire
+
+/// <summary>
+/// Handles asynchronous responses
+/// </summary>
+namespace ActiveMQ.Transport
{
- /// <summary>
- /// Handles asynchronous responses
- /// </summary>
- public class FutureResponse : IAsyncResult
+ public class FutureResponse : IAsyncResult
{
private Response response;
@@ -59,13 +60,15 @@
get {
while (response == null)
{
- try {
- lock (semaphore)
- {
- Monitor.Wait(semaphore, maxWait);
+ try
+ {
+ lock (semaphore)
+ {
+ Monitor.Wait(semaphore, maxWait);
+ }
}
- }
- catch (Exception e) {
+ catch (Exception e)
+ {
Console.WriteLine("Caught while waiting on monitor: " + e);
}
}
@@ -82,3 +85,4 @@
}
}
}
+
Modified: incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/Transport/ITransport.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/Transport/ITransport.cs?rev=383299&r1=383298&r2=383299&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/Transport/ITransport.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/Transport/ITransport.cs Sun Mar
5 01:47:04 2006
@@ -15,7 +15,7 @@
* limitations under the License.
*/
using ActiveMQ.Commands;
-using ActiveMQ.OpenWire;
+using ActiveMQ.Transport;
using JMS;
using System;
Modified: incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/Transport/SocketTransport.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/Transport/SocketTransport.cs?rev=383299&r1=383298&r2=383299&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/Transport/SocketTransport.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/Transport/SocketTransport.cs Sun
Mar 5 01:47:04 2006
@@ -16,6 +16,7 @@
*/
using ActiveMQ.Commands;
using ActiveMQ.OpenWire;
+using ActiveMQ.Transport;
using System;
using System.Collections;
using System.IO;
Modified: incubator/activemq/trunk/openwire-dotnet/src/src.csproj
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/src.csproj?rev=383299&r1=383298&r2=383299&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/src.csproj (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/src.csproj Sun Mar 5 01:47:04 2006
@@ -34,6 +34,7 @@
<Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets"/>
<ItemGroup>
<Compile Include="ActiveMQ\BrokerException.cs"/>
+ <Compile Include="ActiveMQ\Commands\AbstractCommand.cs"/>
<Compile Include="ActiveMQ\Commands\ActiveMQBytesMessage.cs"/>
<Compile Include="ActiveMQ\Commands\ActiveMQDestination.cs"/>
<Compile Include="ActiveMQ\Commands\ActiveMQMapMessage.cs"/>
@@ -47,8 +48,10 @@
<Compile Include="ActiveMQ\Commands\ActiveMQTextMessage.cs"/>
<Compile Include="ActiveMQ\Commands\ActiveMQTopic.cs"/>
<Compile Include="ActiveMQ\Commands\BaseCommand.cs"/>
+ <Compile Include="ActiveMQ\Commands\BrokerError.cs"/>
<Compile Include="ActiveMQ\Commands\BrokerId.cs"/>
<Compile Include="ActiveMQ\Commands\BrokerInfo.cs"/>
+ <Compile Include="ActiveMQ\Commands\Command.cs"/>
<Compile Include="ActiveMQ\Commands\ConnectionError.cs"/>
<Compile Include="ActiveMQ\Commands\ConnectionId.cs"/>
<Compile Include="ActiveMQ\Commands\ConnectionInfo.cs"/>
@@ -57,6 +60,8 @@
<Compile Include="ActiveMQ\Commands\ControlCommand.cs"/>
<Compile Include="ActiveMQ\Commands\DataArrayResponse.cs"/>
<Compile Include="ActiveMQ\Commands\DataResponse.cs"/>
+ <Compile Include="ActiveMQ\Commands\DataStructure.cs"/>
+ <Compile Include="ActiveMQ\Commands\DataStructureSupport.cs"/>
<Compile Include="ActiveMQ\Commands\DestinationInfo.cs"/>
<Compile Include="ActiveMQ\Commands\DiscoveryEvent.cs"/>
<Compile Include="ActiveMQ\Commands\ExceptionResponse.cs"/>
@@ -68,6 +73,7 @@
<Compile Include="ActiveMQ\Commands\JournalTransaction.cs"/>
<Compile Include="ActiveMQ\Commands\KeepAliveInfo.cs"/>
<Compile Include="ActiveMQ\Commands\LocalTransactionId.cs"/>
+ <Compile Include="ActiveMQ\Commands\MarshallAware.cs"/>
<Compile Include="ActiveMQ\Commands\Message.cs"/>
<Compile Include="ActiveMQ\Commands\MessageAck.cs"/>
<Compile Include="ActiveMQ\Commands\MessageDispatch.cs"/>
@@ -91,19 +97,12 @@
<Compile Include="ActiveMQ\ConnectionFactory.cs"/>
<Compile Include="ActiveMQ\ConsumerClosedException.cs"/>
<Compile Include="ActiveMQ\DestinationFilter.cs"/>
+ <Compile Include="ActiveMQ\Dispatcher.cs"/>
+ <Compile Include="ActiveMQ\ISynchronization.cs"/>
<Compile Include="ActiveMQ\MessageConsumer.cs"/>
<Compile Include="ActiveMQ\MessageProducer.cs"/>
- <Compile Include="ActiveMQ\OpenWire\AbstractCommand.cs"/>
<Compile Include="ActiveMQ\OpenWire\BaseDataStreamMarshaller.cs"/>
<Compile Include="ActiveMQ\OpenWire\BooleanStream.cs"/>
- <Compile Include="ActiveMQ\OpenWire\BrokerError.cs"/>
- <Compile Include="ActiveMQ\OpenWire\Command.cs"/>
- <Compile Include="ActiveMQ\OpenWire\DataStructure.cs"/>
- <Compile Include="ActiveMQ\OpenWire\DataStructureSupport.cs"/>
- <Compile Include="ActiveMQ\OpenWire\Dispatcher.cs"/>
- <Compile Include="ActiveMQ\OpenWire\FutureResponse.cs"/>
- <Compile Include="ActiveMQ\OpenWire\ISynchronization.cs"/>
- <Compile Include="ActiveMQ\OpenWire\MarshallAware.cs"/>
<Compile Include="ActiveMQ\OpenWire\MessagePropertyHelper.cs"/>
<Compile Include="ActiveMQ\OpenWire\OpenWireFormat.cs"/>
<Compile Include="ActiveMQ\OpenWire\PrimitiveMap.cs"/>
@@ -161,9 +160,9 @@
<Compile Include="ActiveMQ\OpenWire\V1\TransactionInfoMarshaller.cs"/>
<Compile Include="ActiveMQ\OpenWire\V1\WireFormatInfoMarshaller.cs"/>
<Compile Include="ActiveMQ\OpenWire\V1\XATransactionIdMarshaller.cs"/>
- <Compile Include="ActiveMQ\OpenWireException.cs"/>
<Compile Include="ActiveMQ\Session.cs"/>
<Compile Include="ActiveMQ\TransactionContext.cs"/>
+ <Compile Include="ActiveMQ\Transport\FutureResponse.cs"/>
<Compile Include="ActiveMQ\Transport\ITransport.cs"/>
<Compile Include="ActiveMQ\Transport\SocketTransport.cs"/>
<Compile Include="JMS\IBytesMessage.cs"/>
@@ -183,5 +182,7 @@
<Compile Include="JMS\ITemporaryTopic.cs"/>
<Compile Include="JMS\ITextMessage.cs"/>
<Compile Include="JMS\ITopic.cs"/>
+ <None Include="JMS\JMSConnectionException.cs"/>
+ <Compile Include="JMS\JMSException.cs"/>
</ItemGroup>
</Project>
|