Fixed exception string (spaces between words = good)

[mono.git] / mcs / class / System.Web.Services / System.Web.Services / WebService.cs

diff --git a/mcs/class/System.Web.Services/System.Web.Services/WebService.cs b/mcs/class/System.Web.Services/System.Web.Services/WebService.cs
index e6d0db150d15b89d07046d782fa40ef9bb0b7713..568cfa68251836c50e796b24030deee625b841e4 100644 (file)
--- a/mcs/class/System.Web.Services/System.Web.Services/WebService.cs
+++ b/mcs/class/System.Web.Services/System.Web.Services/WebService.cs
@@ -1,11 +1,11 @@
- // \r
-// System.Web.Services.WebService.cs\r
-//\r
-// Author:\r
-//   Tim Coleman (tim@timcoleman.com)\r
-//\r
-// Copyright (C) Tim Coleman, 2002\r
-//\r
+ // 
+// System.Web.Services.WebService.cs
+//
+// Author:
+//   Tim Coleman (tim@timcoleman.com)
+//
+// Copyright (C) Tim Coleman, 2002
+//
 
 //
 // Permission is hereby granted, free of charge, to any person obtaining
@@ -27,71 +27,87 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-\r
-using System.ComponentModel;\r
-using System.Security.Principal;\r
-using System.Web;\r
-using System.Web.SessionState;\r
-\r
-namespace System.Web.Services {\r
-       public class WebService : MarshalByValueComponent {\r
-\r
-               #region Fields\r
-\r
-               HttpContext _context;\r
-\r
-               #endregion // Fields\r
-\r
-               #region Constructors\r
-\r
-               public WebService ()\r
-               {\r
-               }\r
-               \r
-               #endregion // Constructors\r
-\r
-               #region Properties\r
-\r
-               internal void SetContext (HttpContext context)\r
-               {\r
-                       _context = context;\r
-               }\r
-\r
-               [Browsable (false)]\r
-               [Description ("The ASP.NET application object for the current request.")]\r
-               [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]\r
-               public HttpApplicationState Application {\r
-                       get { return _context.Application; }\r
-               }\r
-\r
-               [Browsable (false)]\r
-               [WebServicesDescription ("The ASP.NET context object for the current request.")]\r
-               [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]\r
-               public HttpContext Context {\r
-                       get { return _context; }\r
-               }\r
-\r
-               [Browsable (false)]\r
-               [WebServicesDescription ("The ASP.NET utility object for the current request.")]\r
-               [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]\r
-               public HttpServerUtility Server {\r
-                       get { return _context.Server; }\r
-               }\r
-\r
-               [Browsable (false)]\r
-               [WebServicesDescription ("The ASP.NET session object for the current request.")]\r
-               [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]\r
-               public HttpSessionState Session {\r
-                       get { return _context.Session; }\r
-               }\r
-\r
-               [Browsable (false)]\r
-               [WebServicesDescription ("The ASP.NET user object for the current request.  The object is used for authorization.")]\r
-               [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]\r
-               public IPrincipal User {\r
-                       get { return _context.User; }\r
-               }\r
-\r
-               #endregion // Properties\r
-       }\r
-}\r
+
+using System.ComponentModel;
+using System.Security.Principal;
+using System.Web;
+using System.Web.Services.Protocols;
+using System.Web.SessionState;
+
+namespace System.Web.Services {
+       public class WebService : MarshalByValueComponent {
+
+               #region Fields
+
+               HttpContext _context;
+
+#if NET_2_0
+               SoapProtocolVersion _soapVersion;
+#endif
+
+               #endregion // Fields
+
+               #region Constructors
+
+               public WebService ()
+               {
+                       _context = HttpContext.Current;
+#if NET_2_0
+                       object o = _context != null ? _context.Items ["WebServiceSoapVersion"] : null;
+                       if (o is SoapProtocolVersion)
+                               _soapVersion = (SoapProtocolVersion) o;
+#endif
+               }
+               
+               #endregion // Constructors
+
+               #region Properties
+
+               [Browsable (false)]
+               [Description ("The ASP.NET application object for the current request.")]
+               [WebServicesDescription ("The ASP.NET application object for the current request.")]
+               [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
+               public HttpApplicationState Application {
+                       get { return _context.Application; }
+               }
+
+               [Browsable (false)]
+               [WebServicesDescription ("The ASP.NET context object for the current request.")]
+               [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
+               public HttpContext Context {
+                       get { return _context; }
+               }
+
+               [Browsable (false)]
+               [WebServicesDescription ("The ASP.NET utility object for the current request.")]
+               [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
+               public HttpServerUtility Server {
+                       get { return _context.Server; }
+               }
+
+               [Browsable (false)]
+               [WebServicesDescription ("The ASP.NET session object for the current request.")]
+               [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
+               public HttpSessionState Session {
+                       get { return _context.Session; }
+               }
+
+               [Browsable (false)]
+               [WebServicesDescription ("The ASP.NET user object for the current request.  The object is used for authorization.")]
+               [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
+               public IPrincipal User {
+                       get { return _context.User; }
+               }
+
+#if NET_2_0
+               [Browsable (false)]
+               [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
+               [System.Runtime.InteropServices.ComVisible (false)]
+               public System.Web.Services.Protocols.SoapProtocolVersion SoapVersion {
+                       get { return _soapVersion; }
+               }
+#endif
+
+               #endregion // Properties
+       }
+}