2006-01-09 Chris Toshok <toshok@ximian.com>

	* SoapEnvelopeProcessingElement.cs: fix dumper output.

	* SoapExtensionTypeElement.cs: same.

	* ProtocolElement.cs: same.

	* WsiProfilesElement.cs: same.

	* WebServicesSection.cs: same.

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

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Configuration/ChangeLog b/mcs/class/System.Web.Services/System.Web.Services.Configuration/ChangeLog
index a7319ff661735d65416a853377b874d21ec38129..da1c643b56886060119cfa144f7b726e8bcc28fe 100644 (file)
--- a/mcs/class/System.Web.Services/System.Web.Services.Configuration/ChangeLog
+++ b/mcs/class/System.Web.Services/System.Web.Services.Configuration/ChangeLog
@@ -1,3 +1,15 @@
+2006-01-09  Chris Toshok  <toshok@ximian.com>
+
+       * SoapEnvelopeProcessingElement.cs: fix dumper output.
+
+       * SoapExtensionTypeElement.cs: same.
+
+       * ProtocolElement.cs: same.
+
+       * WsiProfilesElement.cs: same.
+
+       * WebServicesSection.cs: same.
+
 2006-01-06  Raja R Harinath  <rharinath@novell.com>
 
        * TypeElement.cs (TypeElement) [string variant]: Use Type.GetType.

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Configuration/ProtocolElement.cs b/mcs/class/System.Web.Services/System.Web.Services.Configuration/ProtocolElement.cs
index f54ba6ecce403a66a87033eb00580e637e99b634..b000f73afeb4d3034f1a13e30338a99498d7d1d1 100644 (file)
--- a/mcs/class/System.Web.Services/System.Web.Services.Configuration/ProtocolElement.cs
+++ b/mcs/class/System.Web.Services/System.Web.Services.Configuration/ProtocolElement.cs
@@ -42,7 +42,8 @@ namespace System.Web.Services.Configuration {
 
                static ProtocolElement ()
                {
-                       nameProp = new ConfigurationProperty ("name", typeof (WebServiceProtocols), WebServiceProtocols.Unknown, ConfigurationPropertyOptions.IsKey);
+                       nameProp = new ConfigurationProperty ("name", typeof (WebServiceProtocols), WebServiceProtocols.Unknown,
+                                                             new GenericEnumConverter (typeof (WebServiceProtocols)), null, ConfigurationPropertyOptions.IsKey);
                        properties = new ConfigurationPropertyCollection ();
 
                        properties.Add (nameProp);

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Configuration/SoapEnvelopeProcessingElement.cs b/mcs/class/System.Web.Services/System.Web.Services.Configuration/SoapEnvelopeProcessingElement.cs
index e73388065855dec2a9d4a395ffac8f8ae5548a4f..af5f6dd2206707184b96037046252228ed8b59df 100644 (file)
--- a/mcs/class/System.Web.Services/System.Web.Services.Configuration/SoapEnvelopeProcessingElement.cs
+++ b/mcs/class/System.Web.Services/System.Web.Services.Configuration/SoapEnvelopeProcessingElement.cs
@@ -45,7 +45,9 @@ namespace System.Web.Services.Configuration {
                static SoapEnvelopeProcessingElement ()
                {
                        strictProp = new ConfigurationProperty ("strict", typeof (bool), false);
-                       readTimeoutProp = new ConfigurationProperty ("readTimeout", typeof (int), Int32.MaxValue);
+                       readTimeoutProp = new ConfigurationProperty ("readTimeout", typeof (int), Int32.MaxValue,
+                                                                    new InfiniteIntConverter(), null,
+                                                                    ConfigurationPropertyOptions.None);
                        properties = new ConfigurationPropertyCollection ();
 
                        properties.Add (strictProp);

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Configuration/SoapExtensionTypeElement.cs b/mcs/class/System.Web.Services/System.Web.Services.Configuration/SoapExtensionTypeElement.cs
index 61355e625f4e28e37945d9cd46f3f60722ccf8f2..ba42331b95fdf1b98b2a8a0ba60a4a9578d99ca1 100644 (file)
--- a/mcs/class/System.Web.Services/System.Web.Services.Configuration/SoapExtensionTypeElement.cs
+++ b/mcs/class/System.Web.Services/System.Web.Services.Configuration/SoapExtensionTypeElement.cs
@@ -46,8 +46,11 @@ namespace System.Web.Services.Configuration {
                static SoapExtensionTypeElement ()
                {
                        groupProp = new ConfigurationProperty ("group", typeof (PriorityGroup), PriorityGroup.Low, ConfigurationPropertyOptions.IsKey);
-                       priorityProp = new ConfigurationProperty ("priority", typeof (int), 0, ConfigurationPropertyOptions.IsKey);
-                       typeProp = new ConfigurationProperty ("type", typeof (Type), null, ConfigurationPropertyOptions.IsKey);
+                       priorityProp = new ConfigurationProperty ("priority", typeof (int), 0,
+                                                                 new Int32Converter(), new IntegerValidator (0, Int32.MaxValue),
+                                                                 ConfigurationPropertyOptions.IsKey);
+                       typeProp = new ConfigurationProperty ("type", typeof (Type), null,
+                                                             null, null, ConfigurationPropertyOptions.IsKey);
                        properties = new ConfigurationPropertyCollection ();
 
                        properties.Add (groupProp);

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Configuration/WebServicesSection.cs b/mcs/class/System.Web.Services/System.Web.Services.Configuration/WebServicesSection.cs
index 2aa44f73ac802d34352a63343f92ddcd30532067..964917f084c9c3a505f5239b9c4163ba457212fe 100644 (file)
--- a/mcs/class/System.Web.Services/System.Web.Services.Configuration/WebServicesSection.cs
+++ b/mcs/class/System.Web.Services/System.Web.Services.Configuration/WebServicesSection.cs
@@ -39,6 +39,7 @@ namespace System.Web.Services.Configuration
         public sealed class WebServicesSection : ConfigurationSection
         {
                 static ConfigurationProperty conformanceWarningsProp;
+               static ConfigurationProperty diagnosticsProp;
                 static ConfigurationProperty protocolsProp;
                 static ConfigurationProperty serviceDescriptionFormatExtensionTypesProp;
                 static ConfigurationProperty soapEnvelopeProcessingProp;
@@ -52,19 +53,32 @@ namespace System.Web.Services.Configuration
 
                 static WebServicesSection ()
                 {
-                       conformanceWarningsProp = new ConfigurationProperty ("conformanceWarnings", typeof (WsiProfilesElementCollection));
-                        protocolsProp = new ConfigurationProperty ("protocols", typeof (ProtocolElementCollection));
-                       serviceDescriptionFormatExtensionTypesProp = new ConfigurationProperty ("serviceDescriptionFormatExtensionTypes", typeof (TypeElementCollection));
-                       soapEnvelopeProcessingProp = new ConfigurationProperty ("soapEnvelopeProcessing", typeof (SoapEnvelopeProcessingElement));
-                       soapExtensionImporterTypesProp = new ConfigurationProperty ("soapExtensionImporterTypes", typeof (TypeElementCollection));
-                       soapExtensionReflectorTypesProp = new ConfigurationProperty ("soapExtensionReflectorTypes", typeof (TypeElementCollection));
-                       soapExtensionTypesProp = new ConfigurationProperty ("soapExtensionTypes", typeof (SoapExtensionTypeElementCollection));
-                       soapServerProtocolFactoryProp = new ConfigurationProperty ("soapServerProtocolFactory", typeof (TypeElement));
-                       soapTransportImporterTypesProp = new ConfigurationProperty ("soapTransportImporterTypes", typeof (TypeElementCollection));
-                       wsdlHelpGeneratorProp = new ConfigurationProperty ("wsdlHelpGenerator", typeof (WsdlHelpGeneratorElement));
+                       conformanceWarningsProp = new ConfigurationProperty ("conformanceWarnings", typeof (WsiProfilesElementCollection), null,
+                                                                            null, null, ConfigurationPropertyOptions.None);
+                       diagnosticsProp = new ConfigurationProperty ("diagnostics", typeof (DiagnosticsElement), null,
+                                                                    null, null, ConfigurationPropertyOptions.None);
+                        protocolsProp = new ConfigurationProperty ("protocols", typeof (ProtocolElementCollection), null,
+                                                                  null, null, ConfigurationPropertyOptions.None);
+                       serviceDescriptionFormatExtensionTypesProp = new ConfigurationProperty ("serviceDescriptionFormatExtensionTypes", typeof (TypeElementCollection), null,
+                                                                                               null, null, ConfigurationPropertyOptions.None);
+                       soapEnvelopeProcessingProp = new ConfigurationProperty ("soapEnvelopeProcessing", typeof (SoapEnvelopeProcessingElement), null,
+                                                                               null, null, ConfigurationPropertyOptions.None);
+                       soapExtensionImporterTypesProp = new ConfigurationProperty ("soapExtensionImporterTypes", typeof (TypeElementCollection), null,
+                                                                                   null, null, ConfigurationPropertyOptions.None);
+                       soapExtensionReflectorTypesProp = new ConfigurationProperty ("soapExtensionReflectorTypes", typeof (TypeElementCollection), null,
+                                                                                    null, null, ConfigurationPropertyOptions.None);
+                       soapExtensionTypesProp = new ConfigurationProperty ("soapExtensionTypes", typeof (SoapExtensionTypeElementCollection), null,
+                                                                           null, null, ConfigurationPropertyOptions.None);
+                       soapServerProtocolFactoryProp = new ConfigurationProperty ("soapServerProtocolFactory", typeof (TypeElement), null,
+                                                                                  null, null, ConfigurationPropertyOptions.None);
+                       soapTransportImporterTypesProp = new ConfigurationProperty ("soapTransportImporterTypes", typeof (TypeElementCollection), null,
+                                                                                   null, null, ConfigurationPropertyOptions.None);
+                       wsdlHelpGeneratorProp = new ConfigurationProperty ("wsdlHelpGenerator", typeof (WsdlHelpGeneratorElement), null,
+                                                                          null, null, ConfigurationPropertyOptions.None);
                         properties = new ConfigurationPropertyCollection ();
 
                        properties.Add (conformanceWarningsProp);
+                       properties.Add (diagnosticsProp);
                         properties.Add (protocolsProp);
                        properties.Add (serviceDescriptionFormatExtensionTypesProp);
                        properties.Add (soapEnvelopeProcessingProp);
@@ -101,10 +115,9 @@ namespace System.Web.Services.Configuration
                         get { throw new NotImplementedException (); }
                 }
 
-               [MonoTODO ("why doesn't this have a ConfigurationPropertyAttribute?")]
                 public DiagnosticsElement Diagnostics {
-                        get { throw new NotImplementedException (); }
-                        set { throw new NotImplementedException (); }
+                        get { return (DiagnosticsElement) base [diagnosticsProp]; }
+                        set { base[diagnosticsProp] = value; }
                 }
 
                [MonoTODO]
@@ -176,7 +189,7 @@ namespace System.Web.Services.Configuration
 
                internal static bool IsSupported (WebServiceProtocols proto)
                {
-                       return ((Instance.EnabledProtocols & proto) == proto && (proto != 0));
+                       return ((Instance.EnabledProtocols & proto) == proto && (proto != WebServiceProtocols.Unknown));
                }
         }
 

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Configuration/WsiProfilesElement.cs b/mcs/class/System.Web.Services/System.Web.Services.Configuration/WsiProfilesElement.cs
index 193ccc442052f5dc20cfc1cdd9074323c1fd51e5..383bfff22b8c8c12d07acf339cb02232ff571818 100644 (file)
--- a/mcs/class/System.Web.Services/System.Web.Services.Configuration/WsiProfilesElement.cs
+++ b/mcs/class/System.Web.Services/System.Web.Services.Configuration/WsiProfilesElement.cs
@@ -43,7 +43,10 @@ namespace System.Web.Services.Configuration {
 
                static WsiProfilesElement ()
                {
-                       nameProp = new ConfigurationProperty ("name", typeof (WsiProfiles), WsiProfiles.None, ConfigurationPropertyOptions.IsKey);
+                       nameProp = new ConfigurationProperty ("name", typeof (WsiProfiles), WsiProfiles.None,
+                                                             new GenericEnumConverter (typeof (WsiProfiles)),
+                                                             null,
+                                                             ConfigurationPropertyOptions.IsKey);
                        properties = new ConfigurationPropertyCollection ();
 
                        properties.Add (nameProp);