2006-12-14 Atsushi Enomoto <atsushi@ximian.com>

	* ExtensionManager.cs : added SOAP 1.2 binding extensions.
	* SoapProtocolImporter.cs,
	  ServiceDescriptionImporter.cs :
	  Added SOAP 1.2 protocol importer.
	  Protocol name comparison is case insensitive.

svn path=/branches/atsushi/mcs/; revision=69485

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/ChangeLog b/mcs/class/System.Web.Services/System.Web.Services.Description/ChangeLog
index 3097b1cc5180cedd0541beb5f5358b590a14cf38..4302b10302f1f6a58879f70ff8e771e071226821 100644 (file)
--- a/mcs/class/System.Web.Services/System.Web.Services.Description/ChangeLog
+++ b/mcs/class/System.Web.Services/System.Web.Services.Description/ChangeLog
@@ -1,3 +1,11 @@
+2006-12-14  Atsushi Enomoto  <atsushi@ximian.com>
+
+       * ExtensionManager.cs : added SOAP 1.2 binding extensions.
+       * SoapProtocolImporter.cs,
+         ServiceDescriptionImporter.cs :
+         Added SOAP 1.2 protocol importer.
+         Protocol name comparison is case insensitive.
+
 2006-12-14  Atsushi Enomoto  <atsushi@ximian.com>
 
        * BasicProfileChecker.cs : fixed R2305 check, which did wrong check

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/ExtensionManager.cs b/mcs/class/System.Web.Services/System.Web.Services.Description/ExtensionManager.cs
index 29827532d162f4d42181145fda901694f837ab38..14e20a2ebc8eeaa4f6b6b05e63bfa5ac41ec6616 100644 (file)
--- a/mcs/class/System.Web.Services/System.Web.Services.Description/ExtensionManager.cs
+++ b/mcs/class/System.Web.Services/System.Web.Services.Description/ExtensionManager.cs
@@ -65,6 +65,13 @@ namespace System.Web.Services.Description
 //                     RegisterExtensionType (typeof (SoapHeaderFaultBinding));
                        RegisterExtensionType (typeof (SoapOperationBinding));
 #if NET_2_0
+                       RegisterExtensionType (typeof (Soap12AddressBinding));
+                       RegisterExtensionType (typeof (Soap12Binding));
+                       RegisterExtensionType (typeof (Soap12BodyBinding));
+                       RegisterExtensionType (typeof (Soap12FaultBinding));
+                       RegisterExtensionType (typeof (Soap12HeaderBinding));
+                       RegisterExtensionType (typeof (Soap12OperationBinding));
+
                        foreach (TypeElement el in WebServicesSection.Current.ServiceDescriptionFormatExtensionTypes)
                                RegisterExtensionType (el.Type);
 #else

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/ServiceDescriptionImporter.cs b/mcs/class/System.Web.Services/System.Web.Services.Description/ServiceDescriptionImporter.cs
index 1cbb69e5a35dc6a2dd35bfc9927434d36aa8fded..f4e9c56810be80954229337b585c22975f2a8bf3 100644 (file)
--- a/mcs/class/System.Web.Services/System.Web.Services.Description/ServiceDescriptionImporter.cs
+++ b/mcs/class/System.Web.Services/System.Web.Services.Description/ServiceDescriptionImporter.cs
@@ -152,7 +152,7 @@ namespace System.Web.Services.Description {
                        ArrayList importers = GetSupportedImporters ();
                        if (protocolName == null || protocolName == "") protocolName = "Soap";
                        foreach (ProtocolImporter importer in importers) {
-                               if (importer.ProtocolName == protocolName)
+                               if (importer.ProtocolName.ToUpper () == protocolName.ToUpper ())
                                        return importer;
                        }
                        
@@ -163,6 +163,9 @@ namespace System.Web.Services.Description {
                {
                        ArrayList list = new ArrayList ();
                        list.Add (new SoapProtocolImporter ());
+#if NET_2_0
+                       list.Add (new Soap12ProtocolImporter ());
+#endif
                        list.Add (new HttpGetProtocolImporter ());
                        list.Add (new HttpPostProtocolImporter ());
                        return list;

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/SoapProtocolImporter.cs b/mcs/class/System.Web.Services/System.Web.Services.Description/SoapProtocolImporter.cs
index 0da9e8db0747e3a24e2c537ad6f28fee17f22a37..aa90c98f1eef705ba6acdda9b6e988848f0c3d5b 100644 (file)
--- a/mcs/class/System.Web.Services/System.Web.Services.Description/SoapProtocolImporter.cs
+++ b/mcs/class/System.Web.Services/System.Web.Services.Description/SoapProtocolImporter.cs
@@ -640,4 +640,13 @@ namespace System.Web.Services.Description {
                
                #endregion
        }
+
+#if NET_2_0
+       internal class Soap12ProtocolImporter : SoapProtocolImporter
+       {
+               public override string ProtocolName {
+                       get { return "Soap12"; }
+               }
+       }
+#endif
 }