2010-05-28 Astushi Enomoto <atsushi@ximian.com>

	* System.ServiceModel.dll.sources : remove old code from winfx beta.

	* DirectionalAction.cs : remove old code from winfx beta.

svn path=/trunk/mcs/; revision=158095

diff --git a/mcs/class/System.ServiceModel/ChangeLog b/mcs/class/System.ServiceModel/ChangeLog
index f2f579c7ddb8c7e8c6e837d749de7d5496dd0d11..f3259c3ed1274217a90e75847a2b86a53407b729 100755 (executable)
--- a/mcs/class/System.ServiceModel/ChangeLog
+++ b/mcs/class/System.ServiceModel/ChangeLog
@@ -1,3 +1,7 @@
+2010-05-28  Astushi Enomoto  <atsushi@ximian.com>
+
+       * System.ServiceModel.dll.sources : remove old code from winfx beta.
+
 2010-04-28  Marek Habersack  <mhabersack@novell.com>
 
        * Makefile (LIB_MCS_FLAGS): added a reference to

diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/ChangeLog b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/ChangeLog
index acbb122d5e385b5c4839ee05056cdbdbd3e078d9..9380749489ee7764377d04fb1b60c0c8b2ceced7 100755 (executable)
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/ChangeLog
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/ChangeLog
@@ -1,3 +1,7 @@
+2010-05-28  Atsushi Enomoto  <atsushi@ximian.com>
+
+       * DirectionalAction.cs : remove old code from winfx beta.
+
 2010-05-26  Atsushi Enomoto  <atsushi@ximian.com>
 
        * TcpDuplexSessionChannel.cs, TcpReplyChannel.cs : do not set RelatesTo

diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/DirectionalAction.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/DirectionalAction.cs
deleted file mode 100644 (file)
index 28fc64e..0000000
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/DirectionalAction.cs
+++ /dev/null
@@ -1,77 +0,0 @@
-//
-// DirectionalAction.cs
-//
-// Author: Atsushi Enomoto (atsushi@ximian.com)
-//
-// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-using System;
-using System.Runtime.Serialization;
-using System.ServiceModel.Description;
-
-namespace System.ServiceModel.Channels
-{
-       internal class DirectionalAction : IComparable<DirectionalAction>
-       {
-               public DirectionalAction (MessageDirection direction, string action)
-               {
-                       this.dir = direction;
-                       this.action = action;
-               }
-
-               MessageDirection dir;
-               string action;
-
-               public MessageDirection Direction {
-                       get { return dir; }
-               }
-
-               public string Action {
-                       get { return action; }
-               }
-
-               public int CompareTo (DirectionalAction other)
-               {
-                       int diff = (int) Direction - (int) other.Direction;
-                       return diff != 0 ? diff :
-                               String.CompareOrdinal (Action, other.Action);
-               }
-
-               public bool Equals (DirectionalAction other)
-               {
-                       return other != null && Direction ==
-                               other.Direction &&
-                               Action == other.Action;
-               }
-
-               public override bool Equals (object other)
-               {
-                       DirectionalAction d = other as DirectionalAction;
-                       return d != null && Equals (d);
-               }
-
-               public override int GetHashCode ()
-               {
-                       return Action.GetHashCode () ^ ((int) Direction << 24);
-               }
-       }
-}

diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.dll.sources b/mcs/class/System.ServiceModel/System.ServiceModel.dll.sources
index 39586cfa16b74b4e24552dde05c86abcecad143e..4550469710067b7f684551324b4ce05cd4a741bb 100755 (executable)
--- a/mcs/class/System.ServiceModel/System.ServiceModel.dll.sources
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.dll.sources
@@ -165,7 +165,6 @@ System.ServiceModel.Channels/ConnectionOrientedTransportBindingElement.cs
 System.ServiceModel.Channels/CustomBinding.cs
 System.ServiceModel.Channels/DeliveryFailure.cs
 System.ServiceModel.Channels/DeliveryStatus.cs
-System.ServiceModel.Channels/DirectionalAction.cs
 System.ServiceModel.Channels/DuplexChannelBase.cs
 System.ServiceModel.Channels/DuplexSessionBase.cs
 System.ServiceModel.Channels/FaultConverter.cs