2009-01-07 Astushi Enomoto <atsushi@ximian.com>

	* net_2_1_raw_System.ServiceModel.dll.sources : add OperationContext
	  and OperationContextScope to 2.1 build.

	* OperationContext.cs : changes to include this in net_2_1_raw.

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

diff --git a/mcs/class/System.ServiceModel/ChangeLog b/mcs/class/System.ServiceModel/ChangeLog
index 20950a456c8d1a3a74538560d72cb8b7425ae051..a6e3a34655ee9d813b3af19cd256d12f20975a51 100755 (executable)
--- a/mcs/class/System.ServiceModel/ChangeLog
+++ b/mcs/class/System.ServiceModel/ChangeLog
@@ -1,3 +1,8 @@
+2009-01-07  Astushi Enomoto  <atsushi@ximian.com>
+
+       * net_2_1_raw_System.ServiceModel.dll.sources : add OperationContext
+         and OperationContextScope to 2.1 build.
+
 2008-09-12  Astushi Enomoto  <atsushi@ximian.com>
             Jb Evain  <jbevain@novell.com>
 

diff --git a/mcs/class/System.ServiceModel/System.ServiceModel/ChangeLog b/mcs/class/System.ServiceModel/System.ServiceModel/ChangeLog
index cd60c3cf4f5b4a395c812132507410d2802b5de8..92ab705d24070362be69281a8f6503e87a430f9d 100755 (executable)
--- a/mcs/class/System.ServiceModel/System.ServiceModel/ChangeLog
+++ b/mcs/class/System.ServiceModel/System.ServiceModel/ChangeLog
@@ -1,3 +1,7 @@
+2009-01-07  Atsushi Enomoto  <atsushi@ximian.com>
+
+       * OperationContext.cs : changes to include this in net_2_1_raw.
+
 2008-05-28  Noam Lampert <noaml@mainsoft.com>
        * ServiceHost.cs: Allow services to implement more than one contract.
 

diff --git a/mcs/class/System.ServiceModel/System.ServiceModel/OperationContext.cs b/mcs/class/System.ServiceModel/System.ServiceModel/OperationContext.cs
index 790df095ec2f614b713aa7e858efaeec92233efe..4504da86864e8a264d8a75255b75eda745a06875 100644 (file)
--- a/mcs/class/System.ServiceModel/System.ServiceModel/OperationContext.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel/OperationContext.cs
@@ -46,7 +46,9 @@ namespace System.ServiceModel
                        set { Thread.SetData (Thread.GetNamedDataSlot (operation_context_name), value); }
                }
 
+#if !NET_2_1
                EndpointDispatcher dispatcher;
+#endif
                IContextChannel channel;
                RequestContext request_ctx;
                ExtensionCollection<OperationContext> extensions;
@@ -67,11 +69,6 @@ namespace System.ServiceModel
                        get { return channel; }
                }
 
-               public EndpointDispatcher EndpointDispatcher {
-                       get { return dispatcher; }
-                       set { dispatcher = value; }
-               }
-
                public IExtensionCollection<OperationContext> Extensions {
                        get {
                                if (extensions == null)
@@ -80,6 +77,12 @@ namespace System.ServiceModel
                        }
                }
 
+
+#if !NET_2_1
+               public EndpointDispatcher EndpointDispatcher {
+                       get { return dispatcher; }
+                       set { dispatcher = value; }
+               }
                public bool HasSupportingTokens {
                        get { return SupportingTokens != null ? SupportingTokens.Count > 0 : false; }
                }
@@ -87,6 +90,7 @@ namespace System.ServiceModel
                public ServiceHostBase Host {
                        get { return dispatcher != null ? dispatcher.ChannelDispatcher.Host : null; }
                }
+#endif
 
                public MessageHeaders IncomingMessageHeaders {
                        get { return request_ctx != null ? request_ctx.RequestMessage.Headers : null; }
@@ -136,15 +140,16 @@ namespace System.ServiceModel
                        set { request_ctx = value; }
                }
 
-               public ServiceSecurityContext ServiceSecurityContext {
-                       get { return IncomingMessageProperties != null ? IncomingMessageProperties.Security.ServiceSecurityContext : null; }
-               }
-
                [MonoTODO]
                public string SessionId {
                        get { throw new NotImplementedException (); }
                }
 
+#if !NET_2_1
+               public ServiceSecurityContext ServiceSecurityContext {
+                       get { return IncomingMessageProperties != null ? IncomingMessageProperties.Security.ServiceSecurityContext : null; }
+               }
+
                public ICollection<SupportingTokenSpecification> SupportingTokens {
                        get { return IncomingMessageProperties != null ? IncomingMessageProperties.Security.IncomingSupportingTokens : null; }
                }
@@ -168,6 +173,7 @@ namespace System.ServiceModel
                {
                        throw new NotImplementedException ();
                }
+#endif
 
                internal Message IncomingMessage {
                        get {

diff --git a/mcs/class/System.ServiceModel/net_2_1_raw_System.ServiceModel.dll.sources b/mcs/class/System.ServiceModel/net_2_1_raw_System.ServiceModel.dll.sources
index 1a53339789ac00c7fcd71312ee0bf444d607045b..6a8e353f1573a72a420bd3353aec8c5403f58666 100755 (executable)
--- a/mcs/class/System.ServiceModel/net_2_1_raw_System.ServiceModel.dll.sources
+++ b/mcs/class/System.ServiceModel/net_2_1_raw_System.ServiceModel.dll.sources
@@ -188,6 +188,8 @@ System.ServiceModel/MessageHeaderException.cs
 System.ServiceModel/MessageHeader_1.cs
 System.ServiceModel/MessageParameterAttribute.cs
 System.ServiceModel/MessagePropertyAttribute.cs
+System.ServiceModel/OperationContext.cs
+System.ServiceModel/OperationContextScope.cs
 System.ServiceModel/OperationContractAttribute.cs
 System.ServiceModel/ProtocolException.cs
 System.ServiceModel/QuotaExceededException.cs