Author: jgomes
Date: Tue Oct 28 11:22:25 2008
New Revision: 708627
URL: http://svn.apache.org/viewvc?rev=708627&view=rev
Log:
Remove .NET 1.1 specific code.
Fixes [AMQNET-119]. (See https://issues.apache.org/activemq/browse/AMQNET-119)
Modified:
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/nant.build
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Transport/Tcp/TcpTransport.cs
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Transport/Tcp/TcpTransportFactory.cs
Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/nant.build
URL:
http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/nant.build?rev=708627&r1=708626&r2=708627&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/nant.build (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/nant.build Tue Oct 28
11:22:25 2008
@@ -35,6 +35,9 @@
<property name="Apache.NMS.Test.dll"
value="${basedir}/vendor/Apache.NMS/${current.build.framework}//Apache.NMS.Test.dll"
dynamic="true"/>
<property name="Apache.NMS.Test.pdb"
value="${basedir}/vendor/Apache.NMS/${current.build.framework}/Apache.NMS.Test.pdb"
dynamic="true"/>
+ <!-- Skip certain frameworks, since ActiveMQ.NET Client is not supported on
those platforms. -->
+ <property name="build.net-1.1.skip" value="true"/>
+
<target name="dependency-init" description="Initializes build dependencies">
<if test="${not file::exists(Apache.NMS.dll)}">
<echo message="Apache.NMS assembly for ${current.build.framework.name}
is not available. Build skipped." />
Modified:
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Transport/Tcp/TcpTransport.cs
URL:
http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Transport/Tcp/TcpTransport.cs?rev=708627&r1=708626&r2=708627&view=diff
==============================================================================
---
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Transport/Tcp/TcpTransport.cs
(original)
+++
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Transport/Tcp/TcpTransport.cs
Tue Oct 28 11:22:25 2008
@@ -161,7 +161,7 @@
public bool TcpNoDelayEnabled
{
-#if !NETCF && !NET_1_1
+#if !NETCF
get { return this.socket.NoDelay; }
set { this.socket.NoDelay = value; }
#else
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=708627&r1=708626&r2=708627&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
Tue Oct 28 11:22:25 2008
@@ -112,7 +112,7 @@
Tracer.Debug("Opening socket to: " + location.Host + "
on port: " + location.Port);
Socket socket = Connect(location.Host, location.Port);
-#if !NETCF && !NET_1_1
+#if !NETCF
socket.ReceiveBufferSize = ReceiveBufferSize;
socket.SendBufferSize = SendBufferSize;
socket.ReceiveTimeout = ReceiveTimeout;
@@ -156,13 +156,7 @@
{
// Looping through the AddressList allows different
type of connections to be tried
// (IPv4, IPv6 and whatever else may be available).
-#if NET_1_1 || NET_1_0
- // The following GetHostByName() API has been obsoleted
in .NET 2.0. It has been
- // superceded by GetHostEntry().
- IPHostEntry hostEntry = Dns.GetHostByName(host);
-#else
IPHostEntry hostEntry = Dns.GetHostEntry(host);
-#endif
foreach(IPAddress address in hostEntry.AddressList)
{
