Merge branch 'master' into mono4-continuations_fix

[mono.git] / mcs / class / corlib / System.Runtime.Remoting / SoapServices.cs

diff --git a/mcs/class/corlib/System.Runtime.Remoting/SoapServices.cs b/mcs/class/corlib/System.Runtime.Remoting/SoapServices.cs
index 45a74cc0de9e0c1e1770445e3a294a599f448af8..4efa68a1599b4ba5c594dfadcd97e0fb83b953bd 100644 (file)
--- a/mcs/class/corlib/System.Runtime.Remoting/SoapServices.cs
+++ b/mcs/class/corlib/System.Runtime.Remoting/SoapServices.cs
@@ -7,6 +7,29 @@
 // (c) 2002, Jaime Anguiano Olarra
 // 
 
+//
+// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
 
 using System;
 using System.Collections;
@@ -17,6 +40,7 @@ using System.Runtime.InteropServices;
 
 namespace System.Runtime.Remoting {
 
+       [System.Runtime.InteropServices.ComVisible (true)]
        public class SoapServices
        {
                static Hashtable _xmlTypes = new Hashtable ();
@@ -65,9 +89,11 @@ namespace System.Runtime.Remoting {
                        // If assemblyName is empty, then use the corlib namespace
 
                        if (assemblyName == string.Empty)
-                               return XmlNsForClrTypeWithNs + typeNamespace + "/" + assemblyName;
+                               return XmlNsForClrTypeWithNs + typeNamespace;
+                       else if (typeNamespace == string.Empty)
+                               return EncodeNs (XmlNsForClrTypeWithAssembly + assemblyName);
                        else
-                               return XmlNsForClrTypeWithNsAndAssembly + typeNamespace + "/" + assemblyName;
+                               return EncodeNs (XmlNsForClrTypeWithNsAndAssembly + typeNamespace + "/" + assemblyName);
                }
 
                public static bool DecodeXmlNamespaceForClrTypeNamespace (string inNamespace, 
@@ -76,6 +102,7 @@ namespace System.Runtime.Remoting {
 
                        if (inNamespace == null) throw new ArgumentNullException ("inNamespace");
 
+                       inNamespace = DecodeNs (inNamespace);
                        typeNamespace = null;
                        assemblyName = null;
 
@@ -95,6 +122,12 @@ namespace System.Runtime.Remoting {
                                typeNamespace = inNamespace.Substring (typePos);
                                return true;
                        }
+                       else if (inNamespace.StartsWith(XmlNsForClrTypeWithAssembly))
+                       {
+                               int typePos = XmlNsForClrTypeWithAssembly.Length;
+                               assemblyName = inNamespace.Substring (typePos);
+                               return true;
+                       }
                        else
                                return false;
                }
@@ -354,6 +387,22 @@ namespace System.Runtime.Remoting {
                                _soapActionsMethods [soapAction] = mb;
                        }
                }
+               
+               static string EncodeNs (string ns)
+               {       
+                       // Simple url encoding for namespaces
+                       
+                       ns = ns.Replace (",","%2C");
+                       ns = ns.Replace (" ","%20");
+                       return ns.Replace ("=","%3D");
+               }
+               
+               static string DecodeNs (string ns)
+               {
+                       ns = ns.Replace ("%2C",",");
+                       ns = ns.Replace ("%20"," ");
+                       return ns.Replace ("%3D","=");
+               }
        }
 }