2003-05-27 Jean-Marc Andre <jean-marc.andre@polymtl.ca>

[mono.git] / mcs / class / System.Runtime.Serialization.Formatters.Soap / System.Runtime.Serialization.Formatters.Soap / SoapTypeMapper.cs

diff --git a/mcs/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap/SoapTypeMapper.cs b/mcs/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap/SoapTypeMapper.cs
index a456835753ebde3183dab58df2004197da7fa5b6..e5c9da532ead5d949d62e30bd15b04d8b01375be 100644 (file)
--- a/mcs/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap/SoapTypeMapper.cs
+++ b/mcs/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap/SoapTypeMapper.cs
@@ -68,7 +68,9 @@ namespace System.Runtime.Serialization.Formatters.Soap {
                                rtnObject = Type.GetType(typeNamespace+"."+mapping.TypeName);\r
                                \r
                                if(rtnObject == null) {\r
-                                       Assembly ass =Assembly.Load(typeNamespace);\r
+//                                     AssemblyName assName = new AssemblyName()\r
+//                                     assName.FullName = asse\r
+                                       Assembly ass =Assembly.Load(assemblyName);\r
                                        if(ass != null) {\r
                                                rtnObject = ass.GetType(typeNamespace+"."+mapping.TypeName, true);\r
                                        }\r
@@ -86,6 +88,8 @@ namespace System.Runtime.Serialization.Formatters.Soap {
                        mapping =  new SoapTypeMapping(typeof(string), "string", true, false, false, true);\r
                        _mappingTable.Add(typeof(string),mapping);\r
                        _invertMappingTable.Add(mapping, typeof(string));\r
+                       mapping =  new SoapTypeMapping(typeof(string), "string", "http://www.w3.org/2001/XMLSchema", true, false, false, true);\r
+                       _invertMappingTable.Add(mapping, typeof(string));\r
                        \r
                        // the primitive type "System.Int16"\r
                        mapping =  new SoapTypeMapping(typeof(short), "short", "http://www.w3.org/2001/XMLSchema", true, true, true, false);\r
@@ -130,6 +134,10 @@ namespace System.Runtime.Serialization.Formatters.Soap {
                        _mappingTable.Add(typeof(object), mapping);\r
                        _invertMappingTable.Add(mapping, typeof(object));\r
                        \r
+                       mapping = new SoapTypeMapping(typeof(System.Runtime.Serialization.Formatters.SoapFault), "Fault", "http://schemas.xmlsoap.org/soap/envelope/", false, false, false, true);\r
+                       _mappingTable.Add(typeof(System.Runtime.Serialization.Formatters.SoapFault), mapping);\r
+                       _invertMappingTable.Add(mapping, typeof(System.Runtime.Serialization.Formatters.SoapFault));\r
+                       \r
                        \r
                }\r
        }\r