From: Atsushi Eno <atsushieno@gmail.com>
Date: Mon, 5 Jul 2010 17:39:40 +0000 (-0000)
Subject: 2010-07-05  Atsushi Enomoto  <atsushi@ximian.com>
X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=commitdiff_plain;h=cb97b9bb02ce35aac17e3e2c9b0399bf7b7eff9c;p=mono.git

2010-07-05  Atsushi Enomoto  <atsushi@ximian.com>

	* HttpRequestContext.cs, HttpChannelListener.cs, HttpReplyChannel.cs:
	  rename unnecessary "Standalone" (removed).

	* HttpTransportbindingElement.cs : remove "Standalone".


svn path=/trunk/mcs/; revision=159916
---

diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Channels.Http/ChangeLog b/mcs/class/System.ServiceModel/System.ServiceModel.Channels.Http/ChangeLog
index 7b340df9aa6..662f9fa0836 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Channels.Http/ChangeLog
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Channels.Http/ChangeLog
@@ -1,3 +1,8 @@
+2010-07-05  Atsushi Enomoto  <atsushi@ximian.com>
+
+	* HttpRequestContext.cs, HttpChannelListener.cs, HttpReplyChannel.cs:
+	  rename unnecessary "Standalone" (removed).
+
 2010-07-05  Atsushi Enomoto  <atsushi@ximian.com>
 
 	* HttpStandaloneReplyChannel.cs
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Channels.Http/HttpChannelListener.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Channels.Http/HttpChannelListener.cs
index f63b21f6d1a..4edaeaf54ac 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Channels.Http/HttpChannelListener.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Channels.Http/HttpChannelListener.cs
@@ -1,5 +1,5 @@
 //
-// HttpStandaloneChannelListener.cs
+// HttpChannelListener.cs
 //
 // Author:
 //	Atsushi Enomoto <atsushi@ximian.com>
@@ -45,12 +45,12 @@ namespace System.ServiceModel.Channels.Http
 		ChannelDispatcher ChannelDispatcher { get; set; }
 	}
 
-	internal class HttpStandaloneChannelListener<TChannel> : InternalChannelListenerBase<TChannel>, IChannelDispatcherBoundListener
+	internal class HttpChannelListener<TChannel> : InternalChannelListenerBase<TChannel>, IChannelDispatcherBoundListener
 		where TChannel : class, IChannel
 	{
 		HttpListenerManager listener_manager;
 
-		public HttpStandaloneChannelListener (HttpTransportBindingElement source, BindingContext context)
+		public HttpChannelListener (HttpTransportBindingElement source, BindingContext context)
 			: base (context)
 		{
 			if (ServiceHostBase.CurrentServiceHostHack != null)
@@ -112,7 +112,7 @@ namespace System.ServiceModel.Channels.Http
 		TChannel CreateChannelCore (TimeSpan timeout)
 		{
 			if (typeof (TChannel) == typeof (IReplyChannel))
-				return (TChannel) (object) new HttpStandaloneReplyChannel ((HttpStandaloneChannelListener<IReplyChannel>) (object) this);
+				return (TChannel) (object) new HttpReplyChannel ((HttpChannelListener<IReplyChannel>) (object) this);
 
 			throw new NotSupportedException (String.Format ("Channel type {0} is not supported", typeof (TChannel)));
 		}
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Channels.Http/HttpReplyChannel.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Channels.Http/HttpReplyChannel.cs
index 0e0657812b9..661f960f446 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Channels.Http/HttpReplyChannel.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Channels.Http/HttpReplyChannel.cs
@@ -1,5 +1,5 @@
 //
-// HttpStandaloneReplyChannel.cs
+// HttpReplyChannel.cs
 //
 // Author:
 //	Atsushi Enomoto <atsushi@ximian.com>
@@ -36,12 +36,12 @@ using System.Threading;
 
 namespace System.ServiceModel.Channels.Http
 {
-	internal class HttpStandaloneReplyChannel : InternalReplyChannelBase
+	internal class HttpReplyChannel : InternalReplyChannelBase
 	{
-		HttpStandaloneChannelListener<IReplyChannel> source;
+		HttpChannelListener<IReplyChannel> source;
 		RequestContext reqctx;
 
-		public HttpStandaloneReplyChannel (HttpStandaloneChannelListener<IReplyChannel> listener)
+		public HttpReplyChannel (HttpChannelListener<IReplyChannel> listener)
 			: base (listener)
 		{
 			this.source = listener;
@@ -153,7 +153,7 @@ namespace System.ServiceModel.Channels.Http
 			msg.Properties.Add ("Via", LocalAddress.Uri);
 			msg.Properties.Add (HttpRequestMessageProperty.Name, CreateRequestProperty (ctxi));
 
-			context = new HttpStandaloneRequestContext (this, ctxi, msg);
+			context = new HttpRequestContext (this, ctxi, msg);
 			reqctx = context;
 			return true;
 		}
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Channels.Http/HttpRequestContext.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Channels.Http/HttpRequestContext.cs
index 986c29c185d..938bb93965f 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Channels.Http/HttpRequestContext.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Channels.Http/HttpRequestContext.cs
@@ -32,9 +32,9 @@ using System.Threading;
 
 namespace System.ServiceModel.Channels.Http
 {
-	internal class HttpStandaloneRequestContext : RequestContext
+	internal class HttpRequestContext : RequestContext
 	{
-		public HttpStandaloneRequestContext (HttpStandaloneReplyChannel channel, HttpContextInfo context, Message request)
+		public HttpRequestContext (HttpReplyChannel channel, HttpContextInfo context, Message request)
 		{
 			if (channel == null)
 				throw new ArgumentNullException ("channel");
@@ -48,14 +48,14 @@ namespace System.ServiceModel.Channels.Http
 		}
 
 		Message request;
-		HttpStandaloneReplyChannel channel;
+		HttpReplyChannel channel;
 		HttpContextInfo context;
 
 		public override Message RequestMessage {
 			get { return request; }
 		}
 
-		public HttpStandaloneReplyChannel Channel {
+		public HttpReplyChannel Channel {
 			get { return channel; }
 		}
 		
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/ChangeLog b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/ChangeLog
index 79e64951198..9f99a0c70bd 100755
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/ChangeLog
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/ChangeLog
@@ -1,3 +1,7 @@
+2010-07-05  Atsushi Enomoto  <atsushi@ximian.com>
+
+	* HttpTransportbindingElement.cs : remove "Standalone".
+
 2010-07-05  Atsushi Enomoto  <atsushi@ximian.com>
 
 	* SvcHttpHandler.cs : removed old code and #if blocks.
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/HttpTransportBindingElement.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/HttpTransportBindingElement.cs
index 9aa653128d4..acd10c63099 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/HttpTransportBindingElement.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/HttpTransportBindingElement.cs
@@ -179,11 +179,7 @@ namespace System.ServiceModel.Channels
 		{
 			// remaining contexts are ignored ... e.g. such binding
 			// element that always causes an error is ignored.
-			//if (ServiceHostingEnvironment.InAspNet)
-			//	return new AspNetChannelListener<TChannel> (this, context);
-			//else
-				return new HttpStandaloneChannelListener<TChannel> (this, context);
-//				return new HttpSimpleChannelListener<TChannel> (this, context);
+			return new HttpChannelListener<TChannel> (this, context);
 		}
 #endif