2006-11-15 Atsushi Enomoto <atsushi@ximian.com>

	* WebService.cs: minor API fixes (attributes).

	* ServiceDescriptionImporter.cs : API fix. Now we can use new
	  WebReferenceOptions.

	* DiscoveryReference.cs: FilenameFromUrl() is public.

	* SoapHeaderException.cs, SoapException.cs, SoapFaultSubcode.cs,
	  Soap12FaultCodes.cs : API fixes, mostly for SoapFaultSubCode.

	* MonoWSDL2.cs : 2.0 API fixes (use WebReferenceOptions)

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

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 77bd9f49e37701b0cc9fb68a0e66751194fba461..b00d65d2a95522d089c8f7e099a8c39a7d67314d 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,8 @@
+2006-11-15  Atsushi Enomoto  <atsushi@ximian.com>
+
+       * ServiceDescriptionImporter.cs : API fix. Now we can use new
+         WebReferenceOptions.
+
 2006-11-14  Atsushi Enomoto  <atsushi@ximian.com>
 
        * WebReferenceOptionsSerializer.cs : oops, surrounding #if NET_2_0

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 cf561d5f827eeb6f86745676fd667c33c02bbb2a..885121d6f5402b8f476402e0b42e8a4b8f1a7a23 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
@@ -170,24 +170,12 @@ namespace System.Web.Services.Description {
                \r
 #if NET_2_0\r
 \r
+               [MonoTODO] // where to use Verbose and Extensions in options?\r
                public static StringCollection GenerateWebReferences (\r
                        WebReferenceCollection webReferences, \r
-                       CodeGenerationOptions options, \r
-                       ServiceDescriptionImportStyle style, \r
-                       CodeDomProvider codeGenerator)\r
-               {\r
-                       CodeCompileUnit codeCompileUnit = new CodeCompileUnit ();\r
-                       return GenerateWebReferences (webReferences, options, style, codeGenerator, codeCompileUnit, false);\r
-               }\r
-\r
-               [MonoTODO ("verbose?")]\r
-               public static StringCollection GenerateWebReferences (\r
-                       WebReferenceCollection webReferences, \r
-                       CodeGenerationOptions options, \r
-                       ServiceDescriptionImportStyle style, \r
                        CodeDomProvider codeGenerator, \r
                        CodeCompileUnit codeCompileUnit, \r
-                       bool verbose)\r
+                       WebReferenceOptions options)\r
                {\r
                        StringCollection allWarnings = new StringCollection ();\r
                        ImportContext context = new ImportContext (new CodeIdentifiers(), true);\r
@@ -196,9 +184,9 @@ namespace System.Web.Services.Description {
                        {\r
                                ServiceDescriptionImporter importer = new ServiceDescriptionImporter ();\r
                                importer.CodeGenerator = codeGenerator;\r
-                               importer.CodeGenerationOptions = options;\r
+                               importer.CodeGenerationOptions = options.CodeGenerationOptions;\r
                                importer.Context = context;\r
-                               importer.Style = style;\r
+                               importer.Style = options.Style;\r
                                importer.ProtocolName = reference.ProtocolName;\r
                                \r
                                importer.AddReference (reference);\r

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Discovery/ChangeLog b/mcs/class/System.Web.Services/System.Web.Services.Discovery/ChangeLog
index 8609364a1a4c42b307994608dc0bf1817acbde9e..97da9b391b1f675185ccbd780fb044b0cb81fbf1 100644 (file)
--- a/mcs/class/System.Web.Services/System.Web.Services.Discovery/ChangeLog
+++ b/mcs/class/System.Web.Services/System.Web.Services.Discovery/ChangeLog
@@ -1,3 +1,7 @@
+2006-11-15  Atsushi Enomotot  <atsushi@ximian.com>
+
+       * DiscoveryReference.cs: FilenameFromUrl() is public.
+
 2006-10-18  Atsushi Enomotot  <atsushi@ximian.com>
 
        * SchemaReference.cs,

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Discovery/DiscoveryReference.cs b/mcs/class/System.Web.Services/System.Web.Services.Discovery/DiscoveryReference.cs
index 1512fd155bf00965d0ae8670a217dbeca1dd604e..b99b5871e81b504244ac1c31b01696e98190a92a 100644 (file)
--- a/mcs/class/System.Web.Services/System.Web.Services.Discovery/DiscoveryReference.cs
+++ b/mcs/class/System.Web.Services/System.Web.Services.Discovery/DiscoveryReference.cs
@@ -86,7 +86,7 @@ namespace System.Web.Services.Discovery {
 \r
                #region Methods\r
 \r
-               protected static string FilenameFromUrl (string url)\r
+               public static string FilenameFromUrl (string url)\r
                {\r
                        if (url.ToLower().EndsWith ("/wsdl"))\r
                                url = url.Substring (0,url.Length-5);\r

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Protocols/ChangeLog b/mcs/class/System.Web.Services/System.Web.Services.Protocols/ChangeLog
index 46ebc86d7a54f3b47b75ac39940f0bb704130d5e..d82d5e8a346f40d042ecfce1f7266afb4e9fc08f 100644 (file)
--- a/mcs/class/System.Web.Services/System.Web.Services.Protocols/ChangeLog
+++ b/mcs/class/System.Web.Services/System.Web.Services.Protocols/ChangeLog
@@ -1,3 +1,8 @@
+2006-11-15  Atsushi Enomoto  <atsushi@ximian.com>
+
+       * SoapHeaderException.cs, SoapException.cs, SoapFaultSubcode.cs,
+         Soap12FaultCodes.cs : API fixes, mostly for SoapFaultSubCode.
+
 2006-11-14  Atsushi Enomoto  <atsushi@ximian.com>
 
        * SoapHttpClientProtocol.cs : 2.0 API fix (WsiClaims -> WsiProfiles).

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Protocols/Soap12FaultCodes.cs b/mcs/class/System.Web.Services/System.Web.Services.Protocols/Soap12FaultCodes.cs
index fa231d9637c5585572aac40b2885951130ba74c5..5924a7a011416d92a4961d43fe488126fbf275dc 100644 (file)
--- a/mcs/class/System.Web.Services/System.Web.Services.Protocols/Soap12FaultCodes.cs
+++ b/mcs/class/System.Web.Services/System.Web.Services.Protocols/Soap12FaultCodes.cs
@@ -43,7 +43,7 @@ namespace System.Web.Services.Protocols
                public static readonly XmlQualifiedName DataEncodingUnknownFaultCode 
                        = new XmlQualifiedName ("DataEncodingUnknown", "http://www.w3.org/2003/05/soap-envelope");
                        
-               public static readonly XmlQualifiedName EncodingMissingIDFaultCode
+               public static readonly XmlQualifiedName EncodingMissingIdFaultCode
                        = new XmlQualifiedName ("MissingID", "http://www.w3.org/2003/05/soap-encoding");
                        
                public static readonly XmlQualifiedName EncodingUntypedValueFaultCode

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapException.cs b/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapException.cs
index 0009699188153ba6943fa5655e0d7400494880af..4f4ab4c67b47af4a132d39cf89470b0c5554d05f 100644 (file)
--- a/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapException.cs
+++ b/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapException.cs
@@ -53,7 +53,7 @@ namespace System.Web.Services.Protocols
 #if NET_2_0\r
                string lang;\r
                string role;\r
-               SoapFaultSubcode subcode;\r
+               SoapFaultSubCode subcode;\r
 #endif\r
                #endregion\r
 \r
@@ -102,14 +102,14 @@ namespace System.Web.Services.Protocols
                }\r
 \r
 #if NET_2_0\r
-               public SoapException (string message, XmlQualifiedName code, SoapFaultSubcode subcode)\r
+               public SoapException (string message, XmlQualifiedName code, SoapFaultSubCode subcode)\r
                        : base (message)\r
                {\r
                        this.code = code;\r
                        this.subcode = subcode;\r
                }\r
                \r
-               public SoapException (string message, XmlQualifiedName code, string actor, string role, XmlNode detail, SoapFaultSubcode subcode, Exception innerException)\r
+               public SoapException (string message, XmlQualifiedName code, string actor, string role, XmlNode detail, SoapFaultSubCode subcode, Exception innerException)\r
                        : base (message, innerException)\r
                {\r
                        this.code = code;\r
@@ -119,7 +119,7 @@ namespace System.Web.Services.Protocols
                        this.role = role;\r
                }\r
                \r
-               public SoapException (string message, XmlQualifiedName code, string actor, string role, string lang, XmlNode detail, SoapFaultSubcode subcode, Exception innerException)\r
+               public SoapException (string message, XmlQualifiedName code, string actor, string role, string lang, XmlNode detail, SoapFaultSubCode subcode, Exception innerException)\r
                {\r
                        this.code = code;\r
                        this.subcode = subcode;\r
@@ -187,7 +187,7 @@ namespace System.Web.Services.Protocols
                }\r
                \r
                [System.Runtime.InteropServices.ComVisible(false)]\r
-               public SoapFaultSubcode SubCode {\r
+               public SoapFaultSubCode SubCode {\r
                        get { return subcode; }\r
                }\r
                \r

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapFaultSubcode.cs b/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapFaultSubcode.cs
index f6371ba5225f7c8089629518df7e408011ef78c7..3c5143233387d7f26881b6064b139ca0bfe2b5c7 100644 (file)
--- a/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapFaultSubcode.cs
+++ b/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapFaultSubcode.cs
@@ -34,17 +34,18 @@ using System.Xml;
 
 namespace System.Web.Services.Protocols 
 {
-       public class SoapFaultSubcode
+       [Serializable]
+       public class SoapFaultSubCode
        {
                XmlQualifiedName _code;
-               SoapFaultSubcode _subcode;
+               SoapFaultSubCode _subcode;
                
-               public SoapFaultSubcode (XmlQualifiedName code)
+               public SoapFaultSubCode (XmlQualifiedName code)
                {
                        _code = code;
                }
                
-               public SoapFaultSubcode (XmlQualifiedName code, SoapFaultSubcode subcode)
+               public SoapFaultSubCode (XmlQualifiedName code, SoapFaultSubCode subcode)
                {
                        _code = code;
                        _subcode = subcode;
@@ -54,7 +55,7 @@ namespace System.Web.Services.Protocols
                        get { return _code; }
                }
 
-               public SoapFaultSubcode Subcode {
+               public SoapFaultSubCode SubCode {
                        get { return _subcode; }
                }
 

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapHeaderException.cs b/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapHeaderException.cs
index 466378523f21970ea9d6304b8588d514a38aaf45..99157016c2ab3d1ca7fbdec354865e60d9f1ab1e 100644 (file)
--- a/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapHeaderException.cs
+++ b/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapHeaderException.cs
@@ -67,7 +67,7 @@ namespace System.Web.Services.Protocols
                        string actor, \r
                        string role, \r
                        string lang, \r
-                       SoapFaultSubcode subcode, \r
+                       SoapFaultSubCode subcode, \r
                        Exception innerException)\r
                        \r
                : base (message, code, actor, role, lang, null, subcode, innerException)\r
@@ -80,7 +80,7 @@ namespace System.Web.Services.Protocols
                        XmlQualifiedName code, \r
                        string actor, \r
                        string role, \r
-                       SoapFaultSubcode subcode, \r
+                       SoapFaultSubCode subcode, \r
                        Exception innerException)\r
                        \r
                : base (message, code, actor, role, null, subcode, innerException)\r

diff --git a/mcs/class/System.Web.Services/System.Web.Services/ChangeLog b/mcs/class/System.Web.Services/System.Web.Services/ChangeLog
index f0297d2d6d1f741009216534835e02997504b212..92d34fc12cddaa97cc3e0d6c7560d21677778712 100644 (file)
--- a/mcs/class/System.Web.Services/System.Web.Services/ChangeLog
+++ b/mcs/class/System.Web.Services/System.Web.Services/ChangeLog
@@ -1,3 +1,7 @@
+2006-11-15  Atsushi Enomoto  <atsushi@ximian.com>
+
+       * WebService.cs: minor API fixes (attributes).
+
 2006-11-14  Atsushi Enomoto  <atsushi@ximian.com>
 
        * WebServiceBindingAttribute.cs, WebServiceAttribute.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 636285c05d30bcc620b187e091d101b582d27b0c..f7b78381e1ca771d91d1a6b435d48704532c71e2 100644 (file)
--- a/mcs/class/System.Web.Services/System.Web.Services/WebService.cs
+++ b/mcs/class/System.Web.Services/System.Web.Services/WebService.cs
@@ -54,6 +54,7 @@ namespace System.Web.Services {
                #region Properties\r
 \r
                [Browsable (false)]\r
+               [Description ("The ASP.NET application object for the current request.")]\r
                [WebServicesDescription ("The ASP.NET application object for the current request.")]\r
                [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]\r
                public HttpApplicationState Application {\r
@@ -90,7 +91,9 @@ namespace System.Web.Services {
 \r
 #if NET_2_0\r
                [MonoTODO]\r
-               public virtual System.Web.Services.Protocols.SoapProtocolVersion SoapVersion {\r
+               [Browsable (false)]\r
+               [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]\r
+               public System.Web.Services.Protocols.SoapProtocolVersion SoapVersion {\r
                        get { throw new NotImplementedException (); }\r
                }\r
 #endif\r

diff --git a/mcs/tools/wsdl/ChangeLog b/mcs/tools/wsdl/ChangeLog
index e0251e4dab40e69e9b56044571dbf56b61603d8d..af15a4051a30cae12335c25e4663312a0909a4b5 100644 (file)
--- a/mcs/tools/wsdl/ChangeLog
+++ b/mcs/tools/wsdl/ChangeLog
@@ -1,3 +1,7 @@
+2006-11-15  Atsushi Enomoto  <atsushi@ximian.com>
+
+       * MonoWSDL2.cs : 2.0 API fixes (use WebReferenceOptions)
+
 2006-11-14  Atsushi Enomoto  <atsushi@ximian.com>
 
        * MonoWSDL2.cs : 2.0 API fixes (WsiClaims -> WsiProfiles)

diff --git a/mcs/tools/wsdl/MonoWSDL2.cs b/mcs/tools/wsdl/MonoWSDL2.cs
index 5818dcdee327aeb8a5fce13444959ea1c88991ed..b1e2be4531c7bfc22408af22a8f8839ee81d79c7 100644 (file)
--- a/mcs/tools/wsdl/MonoWSDL2.cs
+++ b/mcs/tools/wsdl/MonoWSDL2.cs
@@ -174,7 +174,11 @@ namespace Mono.WebServices
                        CodeDomProvider provider = GetProvider();\r
                                \r
                        StringCollection validationWarnings;\r
-                       validationWarnings = ServiceDescriptionImporter.GenerateWebReferences (references, options, style, provider, codeUnit, verbose);\r
+                       WebReferenceOptions opts = new WebReferenceOptions ();\r
+                       opts.CodeGenerationOptions = options;\r
+                       opts.Style = style;\r
+                       opts.Verbose = verbose;\r
+                       validationWarnings = ServiceDescriptionImporter.GenerateWebReferences (references, provider, codeUnit, opts);\r
                        \r
                        for (int n=0; n<references.Count; n++)\r
                        {\r