Author: jgomes
Date: Mon May  4 23:46:09 2009
New Revision: 771500

URL: http://svn.apache.org/viewvc?rev=771500&view=rev
Log:
Removed support for old connection string format for STOMP.

Old format example:
   stomp://activemqhost:61613

New format example:
   tcp://activemqhost:61613?transport.wireformat=stomp

Fixes [AMQNET-138]. (See https://issues.apache.org/activemq/browse/AMQNET-138)

Removed:
    activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/nmsprovider-stomp.config
Modified:
    activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Transport/Tcp/TcpTransportFactory.cs
    activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/vs2008-activemq.csproj

Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Transport/Tcp/TcpTransportFactory.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Transport/Tcp/TcpTransportFactory.cs?rev=771500&r1=771499&r2=771500&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Transport/Tcp/TcpTransportFactory.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Transport/Tcp/TcpTransportFactory.cs Mon May  4 23:46:09 2009
@@ -120,7 +120,7 @@
 			socket.SendTimeout = SendTimeout;
 #endif
 
-			IWireFormat wireformat = CreateWireFormat(location, map);
+			IWireFormat wireformat = CreateWireFormat(map);
 			ITransport transport = new TcpTransport(socket, wireformat);
 
 			wireformat.Transport = transport;
@@ -289,17 +289,11 @@
 			return socket;
 		}
 
-		protected IWireFormat CreateWireFormat(Uri location, StringDictionary map)
+		protected IWireFormat CreateWireFormat(StringDictionary map)
 		{
 			object properties = null;
 			IWireFormat wireFormatItf = null;
 
-			// Detect STOMP etc
-			if(String.Compare(location.Scheme, "stomp", true) == 0)
-			{
-				this.wireFormat = "STOMP";
-			}
-
 			if(String.Compare(this.wireFormat, "stomp", true) == 0)
 			{
 				wireFormatItf = new StompWireFormat();

Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/vs2008-activemq.csproj
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/vs2008-activemq.csproj?rev=771500&r1=771499&r2=771500&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/vs2008-activemq.csproj (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/vs2008-activemq.csproj Mon May  4 23:46:09 2009
@@ -67,9 +67,6 @@
     <Content Include="nmsprovider-activemq.config">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="nmsprovider-stomp.config">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
     <Content Include="nmsprovider-tcp.config">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>