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 2009/12/07 17:23:26 UTC
svn commit: r887978 - in
/activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands:
Destination.cs MapMessage.cs Message.cs TempQueue.cs TempTopic.cs Topic.cs
TransactionId.cs
Author: tabish
Date: Mon Dec 7 16:23:24 2009
New Revision: 887978
URL: http://svn.apache.org/viewvc?rev=887978&view=rev
Log:
Gets most of the basic Commands compiling now.
Modified:
activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/Destination.cs
activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/MapMessage.cs
activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/Message.cs
activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/TempQueue.cs
activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/TempTopic.cs
activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/Topic.cs
activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/TransactionId.cs
Modified: activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/Destination.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/Destination.cs?rev=887978&r1=887977&r2=887978&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/Destination.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/Destination.cs Mon Dec 7 16:23:24 2009
@@ -304,7 +304,6 @@
set
{
this.physicalName = value;
- this.advisory = (value != null && value.StartsWith(ADVISORY_PREFIX));
}
}
@@ -406,19 +405,6 @@
}
/// <summary>
- /// </summary>
- /// <returns>true if the destination matches multiple possible destinations</returns>
- public bool IsWildcard()
- {
- if(physicalName != null)
- {
- return physicalName.IndexOf(DestinationFilter.ANY_CHILD) >= 0
- || physicalName.IndexOf(DestinationFilter.ANY_DESCENDENT) >= 0;
- }
- return false;
- }
-
- /// <summary>
/// Factory method to create a child destination if this destination is a composite
/// </summary>
/// <param name="name"></param>
Modified: activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/MapMessage.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/MapMessage.cs?rev=887978&r1=887977&r2=887978&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/MapMessage.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/MapMessage.cs Mon Dec 7 16:23:24 2009
@@ -92,7 +92,7 @@
{
MemoryStream buffer = new MemoryStream();
this.body.Marshal(buffer);
- target.Close();
+ buffer.Close();
this.Content = buffer.ToArray();
}
Modified: activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/Message.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/Message.cs?rev=887978&r1=887977&r2=887978&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/Message.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/Message.cs Mon Dec 7 16:23:24 2009
@@ -209,7 +209,9 @@
{
if(null != MessageId)
{
- return BaseDataStreamMarshaller.ToString(MessageId);
+ return MessageId.ProducerId.ConnectionId + ":" +
+ MessageId.ProducerId.SessionId + ":" +
+ MessageId.ProducerId.Value;
}
return String.Empty;
@@ -343,7 +345,7 @@
if(null != txnId)
{
- return BaseDataStreamMarshaller.ToString(txnId);
+ return "" + txnId.Value;
}
return String.Empty;
Modified: activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/TempQueue.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/TempQueue.cs?rev=887978&r1=887977&r2=887978&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/TempQueue.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/TempQueue.cs Mon Dec 7 16:23:24 2009
@@ -58,7 +58,7 @@
public override Destination CreateDestination(String name)
{
- return new StompTempQueue(name);
+ return new TempQueue(name);
}
public override Object Clone()
Modified: activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/TempTopic.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/TempTopic.cs?rev=887978&r1=887977&r2=887978&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/TempTopic.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/TempTopic.cs Mon Dec 7 16:23:24 2009
@@ -60,7 +60,7 @@
public override Destination CreateDestination(String name)
{
- return new StompTempTopic(name);
+ return new TempTopic(name);
}
public override Object Clone()
Modified: activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/Topic.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/Topic.cs?rev=887978&r1=887977&r2=887978&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/Topic.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/Topic.cs Mon Dec 7 16:23:24 2009
@@ -22,13 +22,13 @@
/// <summary>
/// Summary description for Topic.
/// </summary>
- public class StompTopic : Destination, ITopic
+ public class Topic : Destination, ITopic
{
- public StompTopic() : base()
+ public Topic() : base()
{
}
- public StompTopic(String name) : base(name)
+ public Topic(String name) : base(name)
{
}
@@ -52,7 +52,7 @@
public override int GetDestinationType()
{
- return ACTIVEMQ_TOPIC;
+ return STOMP_TOPIC;
}
public override Destination CreateDestination(String name)
Modified: activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/TransactionId.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/TransactionId.cs?rev=887978&r1=887977&r2=887978&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/TransactionId.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Commands/TransactionId.cs Mon Dec 7 16:23:24 2009
@@ -20,7 +20,7 @@
namespace Apache.NMS.Stomp.Commands
{
- public class TransactionId
+ public class TransactionId : BaseDataStructure
{
long value;
ConnectionId connectionId;
@@ -31,7 +31,7 @@
/// Marshaler share.
/// </summery>
///
- public byte GetDataStructureType()
+ public override byte GetDataStructureType()
{
return DataStructureTypes.TransactionIdType;
}