2009-09-30 Miguel de Icaza <miguel@novell.com>

	* ExtensionManager.cs: Initialize the NET_2_0 pieces with
	MonoTouch, but do not register any of the System.Configuration
	depending extensions.

	BuildExtensionImporters, BuildExtensionReflectors: empty methods
	for MOnoTouch.

	* ServiceDescriptionImporter.cs, WebReference.cs: Remove
	codegeneration features for MonoTouch

2009-09-30  Miguel de Icaza  <miguel@novell.com>

	* Methods.cs: Empty extensions for MonoTouch for now.

	* ServerType.cs: On MonoTouch, we do not support HttpGet or
	HttpPost variations yet.

	* SoapExtension.cs: Avoid System.Configuration features.

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

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 6ab2a8de2fceff2f7845f1d882c8178b6f687529..ee1cc839a99c7dd88b3089aa211af05912435615 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,15 @@
+2009-09-30  Miguel de Icaza  <miguel@novell.com>
+
+       * ExtensionManager.cs: Initialize the NET_2_0 pieces with
+       MonoTouch, but do not register any of the System.Configuration
+       depending extensions.
+
+       BuildExtensionImporters, BuildExtensionReflectors: empty methods
+       for MOnoTouch.
+
+       * ServiceDescriptionImporter.cs, WebReference.cs: Remove
+       codegeneration features for MonoTouch
+
 2008-12-18  Atsushi Enomoto  <atsushi@ximian.com>
 
        * BasicProfileChecker.cs : /definitions/message/part could omit

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 14e20a2ebc8eeaa4f6b6b05e63bfa5ac41ec6616..68661f708d0fd8670ad115b47981c9fc4f64ad49 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
@@ -71,14 +71,22 @@ namespace System.Web.Services.Description
                        RegisterExtensionType (typeof (Soap12FaultBinding));
                        RegisterExtensionType (typeof (Soap12HeaderBinding));
                        RegisterExtensionType (typeof (Soap12OperationBinding));
+#endif
 
+#if !MONOTOUCH
+                       /*
+                        * Currently, the MonoTouch build has not support for
+                        * System.Configuration, so there are no external modules
+                        * defined
+                        */
+#if NET_2_0 
                        foreach (TypeElement el in WebServicesSection.Current.ServiceDescriptionFormatExtensionTypes)
                                RegisterExtensionType (el.Type);
 #else
                        foreach (Type type in WSConfig.Instance.FormatExtensionTypes)
                                RegisterExtensionType (type);
 #endif
-                               
+#endif
                        CreateExtensionSerializers ();
                }
        
@@ -159,7 +167,22 @@ namespace System.Web.Services.Description
                                        throw new InvalidOperationException ("XmlFormatExtensionPointAttribute: Member " + at.MemberName + " not found");
                        }
                }
+
+               /*
+                * MonoTouch lacks support for configuration
+                */
+#if MONOTOUCH
+               public static ArrayList BuildExtensionImporters ()
+               {
+                       return new ArrayList (0);
+               }
                
+               public static ArrayList BuildExtensionReflectors ()
+               {
+                       return new ArrayList (0);
+               }
+
+#else
                public static ArrayList BuildExtensionImporters ()
                {
 #if NET_2_0
@@ -177,7 +200,7 @@ namespace System.Web.Services.Description
                        return BuildExtensionList (WSConfig.Instance.ExtensionReflectorTypes);
 #endif
                }
-               
+
 #if NET_2_0
                public static ArrayList BuildExtensionList (TypeElementCollection exts)
 #else
@@ -188,7 +211,7 @@ namespace System.Web.Services.Description
                        
                        if (exts != null)
                        {
-#if NET_2_0
+#if NET_2_0 
                                foreach (TypeElement econf in exts)
                                {
                                        extensionTypes.Add (econf);
@@ -221,6 +244,7 @@ namespace System.Web.Services.Description
                                
                        return extensions;
                }
+#endif
        }
        
        internal class ExtensionInfo

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 989b0d07b9449440c090e9d1577de12bd458b1f2..e61a93ca8566bd48b1490ddcdf96466e251bc68b 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
@@ -41,7 +41,10 @@ using System.Xml.Schema;
 using System.Collections;
 using System.Collections.Specialized;
 using System.Configuration;
+
+#if !MONOTOUCH
 using Microsoft.CSharp;
+#endif
 
 namespace System.Web.Services.Description {
        public class ServiceDescriptionImporter {
@@ -53,7 +56,7 @@ namespace System.Web.Services.Description {
                ServiceDescriptionCollection serviceDescriptions;
                ServiceDescriptionImportStyle style;
                
-#if NET_2_0
+#if NET_2_0 && !MONOTOUCH
                CodeGenerationOptions options;
                CodeDomProvider codeGenerator = new CSharpCodeProvider ();
                ImportContext context;
@@ -97,7 +100,7 @@ namespace System.Web.Services.Description {
                        set { style = value; }
                }
                
-#if NET_2_0
+#if NET_2_0 && !MONOTOUCH
                [System.Runtime.InteropServices.ComVisible(false)]
                public CodeGenerationOptions CodeGenerationOptions {
                        get { return options; }
@@ -139,6 +142,7 @@ namespace System.Web.Services.Description {
                                schemas.Add (serviceDescription.Types.Schemas);
                }
 
+#if !MONOTOUCH
                public ServiceDescriptionImportWarnings Import (CodeNamespace codeNamespace, CodeCompileUnit codeCompileUnit)
                {
                        foreach (ProtocolImporter importer in GetSupportedImporters ()) {
@@ -154,15 +158,16 @@ namespace System.Web.Services.Description {
                {
                        ArrayList list = new ArrayList ();
                        list.Add (new SoapProtocolImporter ());
-#if NET_2_0
+#if NET_2_0 
                        list.Add (new Soap12ProtocolImporter ());
 #endif
                        list.Add (new HttpGetProtocolImporter ());
                        list.Add (new HttpPostProtocolImporter ());
                        return list;
                }
+#endif
                
-#if NET_2_0
+#if NET_2_0 && !MONOTOUCH
 
                [MonoTODO] // where to use Verbose and Extensions in options?
                public static StringCollection GenerateWebReferences (

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/WebReference.cs b/mcs/class/System.Web.Services/System.Web.Services.Description/WebReference.cs
index ef41cefdb7b161bf070b65ee9e5f6cbcbce51cf2..6919567d2a559756f5756e99b71dce4869b993dd 100644 (file)
--- a/mcs/class/System.Web.Services/System.Web.Services.Description/WebReference.cs
+++ b/mcs/class/System.Web.Services/System.Web.Services.Description/WebReference.cs
@@ -42,16 +42,16 @@ namespace System.Web.Services.Description
        sealed class WebReference
        {
                DiscoveryClientDocumentCollection _documents;
-#if !TARGET_J2EE
+#if !TARGET_J2EE && !MONOTOUCH
                CodeNamespace _proxyCode;
-#endif
                ServiceDescriptionImportWarnings _warnings;
+#endif
                string _protocolName;
                string _appSettingUrlKey;
                string _appSettingBaseUrl;
                StringCollection _validationWarnings;
                
-#if !TARGET_J2EE
+#if !TARGET_J2EE && !MONOTOUCH
                public WebReference (DiscoveryClientDocumentCollection documents, CodeNamespace proxyCode)
                {
                        if (documents == null) throw new ArgumentNullException ("documents");
@@ -94,10 +94,15 @@ namespace System.Web.Services.Description
                        get { return _protocolName; }
                        set { _protocolName = value; }
                }
-#if !TARGET_J2EE
+#if !TARGET_J2EE && !MONOTOUCH
                public CodeNamespace ProxyCode {
                        get { return _proxyCode; }
                }
+
+               public ServiceDescriptionImportWarnings Warnings {
+                       get { return _warnings; }
+                       set { _warnings = value; }
+               }
 #endif
                public StringCollection ValidationWarnings {
                        get { 
@@ -106,11 +111,6 @@ namespace System.Web.Services.Description
                        }
                }
 
-               public ServiceDescriptionImportWarnings Warnings {
-                       get { return _warnings; }
-                       set { _warnings = value; }
-               }
-               
                internal void SetValidationWarnings (StringCollection col)
                {
                        _validationWarnings = col;

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 f922efdc0a090ffb35308e74797e63e5148d3f3b..697ac84e9c0581a527a6d5c4db7d9fbbd5762bb3 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,12 @@
+2009-09-30  Miguel de Icaza  <miguel@novell.com>
+
+       * Methods.cs: Empty extensions for MonoTouch for now.
+
+       * ServerType.cs: On MonoTouch, we do not support HttpGet or
+       HttpPost variations yet.
+
+       * SoapExtension.cs: Avoid System.Configuration features.
+
 2009-08-24  Marek Habersack  <mhabersack@novell.com>
 
        * SoapDocumentationHandler.cs: get rid of the ugly fake virtual

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Protocols/Methods.cs b/mcs/class/System.Web.Services/System.Web.Services.Protocols/Methods.cs
index 12a54fa24105066038564209a83d20e5d7e94559..f9329405521d4f54713a4310437524e3c94b4392 100644 (file)
--- a/mcs/class/System.Web.Services/System.Web.Services.Protocols/Methods.cs
+++ b/mcs/class/System.Web.Services/System.Web.Services.Protocols/Methods.cs
@@ -491,7 +491,11 @@ namespace System.Web.Services.Protocols {
                        xmlImporter.IncludeTypes (Type);
                        soapImporter.IncludeTypes (Type);
 
+#if MONOTOUCH
+                       SoapExtensions = new SoapExtensionRuntimeConfig [2][];
+#else
                        SoapExtensions = SoapExtension.GetTypeExtensions (Type);
+#endif
                }
 
                internal SoapServiceRoutingStyle RoutingStyle {

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Protocols/ServerType.cs b/mcs/class/System.Web.Services/System.Web.Services.Protocols/ServerType.cs
index f47f7ac117504cd81ec265e68f886aa65349e9ae..bb8ce2c37f06dc26e66144d7e0f75b755814485f 100644 (file)
--- a/mcs/class/System.Web.Services/System.Web.Services.Protocols/ServerType.cs
+++ b/mcs/class/System.Web.Services/System.Web.Services.Protocols/ServerType.cs
@@ -216,12 +216,14 @@ namespace System.Web.Services.Protocols
                                                if (soap12Protocol == null) soap12Protocol = CreateTypeStubInfo (typeof(Soap12TypeStubInfo));
                                                return soap12Protocol;
 #endif
+#if !MONOTOUCH
                                        case "HttpGet":
                                                if (httpGetProtocol == null) httpGetProtocol = CreateTypeStubInfo (typeof(HttpGetTypeStubInfo));
                                                return httpGetProtocol;
                                        case "HttpPost":
                                                if (httpPostProtocol == null) httpPostProtocol = CreateTypeStubInfo (typeof(HttpPostTypeStubInfo));
                                                return httpPostProtocol;
+#endif
                                }
                        }
                        throw new InvalidOperationException ("Protocol " + protocolName + " not supported");

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapExtension.cs b/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapExtension.cs
index d7928294b404a84ebdc2a059cdc2c57616922bb5..4f38b6b5eba4c602fd6a6876ba42c944fd7a5e80 100644 (file)
--- a/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapExtension.cs
+++ b/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapExtension.cs
@@ -111,11 +111,11 @@ namespace System.Web.Services.Protocols {
                        return pos;
                }
 
+#if !MONOTOUCH
                static void InitializeGlobalExtensions ()
                {
                        globalExtensions = new ArrayList[2];
-                       
-#if NET_2_0
+#if NET_2_0 
                        if (WebServicesSection.Current == null) return;
 
                        SoapExtensionTypeElementCollection exts = WebServicesSection.Current.SoapExtensionTypes;
@@ -173,7 +173,8 @@ namespace System.Web.Services.Protocols {
                        }
                        return exts;
                }
-
+#endif
+       
                internal static SoapExtensionRuntimeConfig[] GetMethodExtensions (LogicalMethodInfo method)
                {
                        object[] ats = method.GetCustomAttributes (typeof (SoapExtensionAttribute));

diff --git a/mcs/class/System.Web.Services/System.Web.Services/WebMethodAttribute.cs b/mcs/class/System.Web.Services/System.Web.Services/WebMethodAttribute.cs
index 9955c630d0caa90441eda13a60c903c2549560f0..876aac998bb50052cd4ad031cfa8283bc926286b 100644 (file)
--- a/mcs/class/System.Web.Services/System.Web.Services/WebMethodAttribute.cs
+++ b/mcs/class/System.Web.Services/System.Web.Services/WebMethodAttribute.cs
@@ -28,13 +28,13 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if !TARGET_J2EE
+#if !TARGET_J2EE && !MONOTOUCH
 using System.EnterpriseServices;
 #endif
 
 namespace System.Web.Services {
 
-#if TARGET_J2EE
+#if TARGET_J2EE || MONOTOUCH
        public enum TransactionOption {Disabled , NotSupported , Required , RequiresNew , Supported }
 #endif
 

diff --git a/mcs/class/System.Web.Services/monotouch.System.Web.Services.dll.sources b/mcs/class/System.Web.Services/monotouch.System.Web.Services.dll.sources
new file mode 100644 (file)
index 0000000..563a880
--- /dev/null
+++ b/mcs/class/System.Web.Services/monotouch.System.Web.Services.dll.sources
@@ -0,0 +1,149 @@
+../../build/common/MonoTODOAttribute.cs
+System.Web.Services/WebServiceBindingAttribute.cs
+System.Web.Services/WebServiceAttribute.cs
+
+System.Web.Services.Protocols/SoapHttpClientProtocol.cs
+System.Web.Services.Protocols/HttpWebClientProtocol.cs
+System.Web.Services.Protocols/WebClientAsyncResult.cs
+System.Web.Services.Protocols/WebClientProtocol.cs
+System.Web.Services.Protocols/Methods.cs
+System.Web.Services.Protocols/TypeStubManager.cs
+System.Web.Services.Protocols/SoapClientMessage.cs
+System.Web.Services.Protocols/SoapExtension.cs
+System.Web.Services.Protocols/LogicalMethodInfo.cs
+System.Web.Services.Protocols/SoapMessage.cs
+System.Web.Services/WebMethodAttribute.cs
+System.Web.Services.Protocols/SoapParameterStyle.cs
+System.Web.Services.Description/SoapBindingUse.cs
+System.Web.Services.Protocols/SoapHeaderMapping.cs
+System.Web.Services.Protocols/SoapHeaderDirection.cs
+System.Web.Services.Protocols/SoapHeaderCollection.cs
+System.Web.Services.Description/SoapBindingStyle.cs
+System.Web.Services.Protocols/SoapServiceRoutingStyle.cs
+System.Web.Services.Protocols/SoapExtensionAttribute.cs
+System.Web.Services.Protocols/SoapException.cs
+System.Web.Services.Protocols/SoapHeader.cs
+System.Web.Services.Protocols/SoapMessageStage.cs
+System.Web.Services.Protocols/SoapHeaderAttribute.cs
+System.Web.Services.Protocols/ServerType.cs
+System.Web.Services.Protocols/LogicalMethodTypes.cs
+System.Web.Services/WebServicesDescriptionAttribute.cs
+System.Web.Services.Protocols/WebServiceHelper.cs
+System.Web.Services.Protocols/SoapDocumentMethodAttribute.cs
+System.Web.Services.Protocols/SoapDocumentServiceAttribute.cs
+System.Web.Services.Protocols/SoapRpcMethodAttribute.cs
+System.Web.Services.Protocols/SoapRpcServiceAttribute.cs
+System.Web.Services.Discovery/DiscoveryClientProtocol.cs
+System.Web.Services.Discovery/DiscoveryClientDocumentCollection.cs
+System.Web.Services.Discovery/DiscoveryDocument.cs
+System.Web.Services.Discovery/DiscoveryClientResultCollection.cs
+System.Web.Services.Discovery/DiscoveryClientResult.cs
+System.Web.Services.Discovery/DiscoveryExceptionDictionary.cs
+System.Web.Services.Discovery/DiscoveryClientReferenceCollection.cs
+System.Web.Services.Discovery/DiscoveryReference.cs
+System.Web.Services.Discovery/SoapBinding.cs
+System.Web.Services.Protocols/Fault.cs
+System.Web.Services.Protocols/InvokeCompletedEventArgs.cs
+System.Web.Services.Protocols/InvokeCompletedEventHandler.cs
+System.Web.Services.Protocols/SoapUnknownHeader.cs
+System.Web.Services/WsiProfiles.cs
+System.Web.Services.Protocols/SoapProtocolVersion.cs
+System.Web.Services.Protocols/SoapFaultSubcode.cs
+System.Web.Services.Protocols/Soap12FaultCodes.cs
+System.Web.Services.Protocols/Fault12.cs
+System.Web.Services.Protocols/MimeFormatter.cs
+System.Web.Services.Description/ServiceDescription.cs
+System.Web.Services.Description/NamedItem.cs
+System.Web.Services.Description/DocumentableItem.cs
+System.Web.Services.Description/ServiceDescriptionCollection.cs
+System.Web.Services.Description/ServiceCollection.cs
+System.Web.Services.Description/ServiceDescriptionBaseCollection.cs
+System.Web.Services.Description/ServiceDescriptionFormatExtension.cs
+System.Web.Services.Description/ServiceDescriptionFormatExtensionCollection.cs
+System.Web.Services.Description/Service.cs
+System.Web.Services.Description/Binding.cs
+System.Web.Services.Description/Port.cs
+System.Web.Services.Description/PortCollection.cs
+System.Web.Services.Description/MessageCollection.cs
+System.Web.Services.Description/Message.cs
+System.Web.Services.Description/MessagePart.cs
+System.Web.Services.Description/MessagePartCollection.cs
+System.Web.Services.Configuration/XmlFormatExtensionAttribute.cs
+System.Web.Services.Configuration/XmlFormatExtensionPointAttribute.cs
+System.Web.Services.Configuration/XmlFormatExtensionPrefixAttribute.cs
+System.Web.Services.Description/BindingCollection.cs
+System.Web.Services.Description/Import.cs
+System.Web.Services.Description/ImportCollection.cs
+System.Web.Services.Description/PortType.cs
+System.Web.Services.Description/PortTypeCollection.cs
+System.Web.Services.Description/OperationBinding.cs
+System.Web.Services.Description/OperationBindingCollection.cs
+System.Web.Services.Description/InputBinding.cs
+System.Web.Services.Description/OutputBinding.cs
+System.Web.Services.Description/MessageBinding.cs
+System.Web.Services.Description/FaultBindingCollection.cs
+System.Web.Services.Description/FaultBinding.cs
+System.Web.Services.Description/OperationCollection.cs
+System.Web.Services.Description/Operation.cs
+System.Web.Services.Description/Types.cs
+System.Web.Services.Description/OperationFault.cs
+System.Web.Services.Description/OperationFaultCollection.cs
+System.Web.Services.Description/OperationMessage.cs
+System.Web.Services.Description/OperationMessageCollection.cs
+System.Web.Services.Description/OperationFlow.cs
+System.Web.Services.Description/OperationInput.cs
+System.Web.Services.Description/OperationOutput.cs
+System.Web.Services.Description/ServiceDescriptionImporter.cs
+System.Web.Services.Description/WebReference.cs
+System.Web.Services.Description/ServiceDescriptionImportStyle.cs
+System.Web.Services.Discovery/DiscoveryDocumentReference.cs
+System.Web.Services.Discovery/ContractReference.cs
+System.Web.Services.Discovery/SchemaReference.cs
+System.Web.Services.Discovery/DiscoveryDocumentSerializer.cs
+
+System.Web.Services.Discovery/ContractSearchPattern.cs
+System.Web.Services.Discovery/DiscoveryDocumentLinksPattern.cs
+System.Web.Services.Discovery/DiscoveryDocumentSearchPattern.cs
+System.Web.Services.Discovery/DiscoveryReferenceCollection.cs
+System.Web.Services.Discovery/DiscoverySearchPattern.cs
+System.Web.Services.Discovery/DynamicDiscoveryDocument.cs
+System.Web.Services.Discovery/ExcludePathInfo.cs
+System.Web.Services.Discovery/XmlSchemaSearchPattern.cs
+
+System.Web.Services.Protocols/Fault12Serializer.cs
+System.Web.Services.Protocols/HttpMethodAttribute.cs
+System.Web.Services.Protocols/NopReturnReader.cs
+System.Web.Services.Protocols/MimeReturnReader.cs
+System.Web.Services.Protocols/XmlReturnReader.cs
+System.Web.Services.Protocols/UrlParameterWriter.cs
+System.Web.Services.Protocols/UrlEncodedParameterWriter.cs
+System.Web.Services.Protocols/MimeParameterWriter.cs
+System.Web.Services.Description/SoapBinding.cs
+System.Web.Services.Description/Soap12Binding.cs
+System.Web.Services.Description/HttpBinding.cs
+System.Web.Services.Description/MimeContentBinding.cs
+System.Web.Services.Description/MimeTextBinding.cs
+System.Web.Services.Description/MimeTextMatch.cs
+System.Web.Services.Description/MimeTextMatchCollection.cs
+System.Web.Services.Description/ExtensionManager.cs
+System.Web.Services.Description/ServiceDescriptionSerializerBase2.cs
+../System.Web/System.Web/HttpUtility.cs
+System.Web.Services.Description/MimePart.cs
+System.Web.Services.Description/MimePartCollection.cs
+System.Web.Services.Description/HttpAddressBinding.cs
+System.Web.Services.Description/HttpOperationBinding.cs
+System.Web.Services.Description/HttpUrlEncodedBinding.cs
+System.Web.Services.Description/HttpUrlReplacementBinding.cs
+System.Web.Services.Description/MimeMultipartRelatedBinding.cs
+System.Web.Services.Description/MimeXmlBinding.cs
+System.Web.Services.Description/SoapAddressBinding.cs
+System.Web.Services.Description/SoapBodyBinding.cs
+System.Web.Services.Description/SoapFaultBinding.cs
+System.Web.Services.Description/SoapHeaderBinding.cs
+System.Web.Services.Description/SoapOperationBinding.cs
+System.Web.Services.Description/Soap12AddressBinding.cs
+System.Web.Services.Description/Soap12BodyBinding.cs
+System.Web.Services.Description/Soap12FaultBinding.cs
+System.Web.Services.Description/Soap12HeaderBinding.cs
+System.Web.Services.Description/Soap12OperationBinding.cs
+System.Web.Services.Description/SoapHeaderFaultBinding.cs