refactoring: making fields readonly

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

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapDocumentationHandler.cs b/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapDocumentationHandler.cs
index 9bc06054a49d08228fd983ad883f32528137d187..e799a6f335ada8bcadca26df43179ce3172dbc4f 100644 (file)
--- a/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapDocumentationHandler.cs
+++ b/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapDocumentationHandler.cs
@@ -31,6 +31,7 @@
 using System;
 using System.Web;
 using System.IO;
+using System.Globalization;
 using System.Xml;
 using System.Text;
 using System.Xml.Serialization;
@@ -38,6 +39,7 @@ using System.Xml.Schema;
 using System.Web.Services.Description;
 using System.Web.Services.Discovery;
 using System.Web.Services.Configuration;
+using System.Configuration;
 using System.CodeDom;
 using System.CodeDom.Compiler;
 using Microsoft.CSharp;
@@ -62,14 +64,25 @@ namespace System.Web.Services.Protocols
                        
                        HttpRequest req = context.Request;
                        string key = null;
-                       if (req.QueryString.Count == 1)
-                               key = req.QueryString.GetKey(0).ToLower();
+                       if (req.QueryString.Count == 1) {
+                               key = req.QueryString.GetKey (0);
+                               if (key == null)
+                                       key = req.QueryString [0];
+
+                               if (key != null)
+                                       key = key.ToLower (CultureInfo.InvariantCulture);
+                       }
                                
                        if (key == "wsdl" || key == "schema" || key == "code" || key == "disco")
                                return;
                                
+#if NET_2_0
+                       string help = WebServicesSection.Current.WsdlHelpGenerator.Href;
+                       string path = Path.GetDirectoryName (ConfigurationManager.OpenMachineConfiguration().FilePath);
+#else
                        string help = WSConfig.Instance.WsdlHelpPage;
                        string path = Path.GetDirectoryName (WSConfig.Instance.ConfigFilePath);
+#endif
                        string appPath = AppDomain.CurrentDomain.GetData (".appPath").ToString ();
                        string vpath;
                        if (path.StartsWith (appPath)) {
@@ -86,9 +99,10 @@ namespace System.Web.Services.Protocols
 
                        string physPath = Path.Combine (path, help);
                        
+#if !TARGET_JVM
                        if (!File.Exists (physPath))
                                throw new InvalidOperationException ("Documentation page '" + physPath + "' not found");
-
+#endif
                        _pageHandler = PageParser.GetCompiledPageInstance (vpath, physPath, context);
                                
                }
@@ -113,10 +127,20 @@ namespace System.Web.Services.Protocols
                        else
                        {
                                HttpRequest req = context.Request;
-                               string key = req.QueryString.GetKey(0).ToLower();
+                               string key = req.QueryString.GetKey (0);
+                               if (key == null)
+                                       key = req.QueryString [0];
+
+                               if (key != null)
+                                       key = key.ToLower (CultureInfo.InvariantCulture);
+
                                if (key  == "wsdl") GenerateWsdlDocument (context, req.QueryString ["wsdl"]);
                                else if (key == "schema") GenerateSchema (context, req.QueryString ["schema"]);
+#if !TARGET_JVM //code generation is not supported
                                else if (key == "code") GenerateCode (context, req.QueryString ["code"]);
+#else
+                               else if (key == "code") throw new Exception("Code generation is not supported.");
+#endif
                                else if (key == "disco") GenerateDiscoDocument (context);
                                else throw new Exception ("This should never happen");
                        }
@@ -173,7 +197,8 @@ namespace System.Web.Services.Protocols
                        xtw.Formatting = Formatting.Indented;
                        GetSchemas() [di].Write (xtw);
                }
-               
+
+#if !TARGET_JVM                
                void GenerateCode (HttpContext context, string langId)
                {
                        context.Response.ContentType = "text/plain; charset=utf-8";
@@ -217,6 +242,7 @@ namespace System.Web.Services.Protocols
 
                        return provider;
                }
+#endif
                
                internal ServiceDescriptionCollection GetDescriptions ()
                {