// (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;
namespace System.Runtime.Remoting {
+ [System.Runtime.InteropServices.ComVisible (true)]
public class SoapServices
{
static Hashtable _xmlTypes = new Hashtable ();
// 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,
if (inNamespace == null) throw new ArgumentNullException ("inNamespace");
+ inNamespace = DecodeNs (inNamespace);
typeNamespace = null;
assemblyName = null;
typeNamespace = inNamespace.Substring (typePos);
return true;
}
+ else if (inNamespace.StartsWith(XmlNsForClrTypeWithAssembly))
+ {
+ int typePos = XmlNsForClrTypeWithAssembly.Length;
+ assemblyName = inNamespace.Substring (typePos);
+ return true;
+ }
else
return false;
}
GetInteropFieldInfo (ht, xmlElement, xmlNamespace, out type, out name);
}
- public static void GetInteropFieldInfo (Hashtable fields,
+ static void GetInteropFieldInfo (Hashtable fields,
string xmlName, string xmlNamespace,
out Type type, out string name)
{
public static bool GetXmlElementForInteropType (Type type, out string xmlElement, out string xmlNamespace)
{
SoapTypeAttribute att = (SoapTypeAttribute) InternalRemotingServices.GetCachedSoapAttribute (type);
- if (att == null || (att.XmlElementName == null && att.XmlNamespace == null))
+ if (!att.IsInteropXmlElement)
{
xmlElement = null;
xmlNamespace = null;
return false;
}
- if (att.XmlElementName != null)
- xmlElement = att.XmlElementName;
- else
- xmlElement = type.Name;
-
- if (att.XmlNamespace != null)
- xmlNamespace = att.XmlNamespace;
- else if (att.XmlTypeNamespace != null)
- xmlNamespace = att.XmlTypeNamespace;
- else
- xmlNamespace = CodeXmlNamespaceForClrTypeNamespace (type.Namespace, type.Assembly.GetName().Name);
-
+ xmlElement = att.XmlElementName;
+ xmlNamespace = att.XmlNamespace;
return true;
}
public static string GetXmlNamespaceForMethodCall (MethodBase mb)
{
- return CodeXmlNamespaceForClrTypeNamespace (mb.DeclaringType.Name, GetAssemblyName(mb));
+ return CodeXmlNamespaceForClrTypeNamespace (mb.DeclaringType.FullName, GetAssemblyName(mb));
}
public static string GetXmlNamespaceForMethodResponse (MethodBase mb)
{
- return CodeXmlNamespaceForClrTypeNamespace (mb.DeclaringType.Name, GetAssemblyName(mb));
+ return CodeXmlNamespaceForClrTypeNamespace (mb.DeclaringType.FullName, GetAssemblyName(mb));
}
public static bool GetXmlTypeForInteropType (Type type, out string xmlType, out string xmlTypeNamespace)
{
SoapTypeAttribute att = (SoapTypeAttribute) InternalRemotingServices.GetCachedSoapAttribute (type);
- if (att == null || (att.XmlTypeName == null && att.XmlTypeNamespace == null))
+ if (!att.IsInteropXmlType)
{
xmlType = null;
xmlTypeNamespace = null;
return false;
}
- if (att.XmlTypeName != null)
- xmlType = att.XmlTypeName;
- else
- xmlType = type.Name;
-
- if (att.XmlTypeNamespace != null)
- xmlTypeNamespace = att.XmlTypeNamespace;
- else
- xmlTypeNamespace = CodeXmlNamespaceForClrTypeNamespace (type.Namespace, type.Assembly.GetName().Name);
-
+ xmlType = att.XmlTypeName;
+ xmlTypeNamespace = att.XmlTypeNamespace;
return true;
}
foreach (FieldInfo field in fields)
{
- SoapFieldAttribute att = (SoapFieldAttribute) Attribute.GetCustomAttribute (field, typeof (SoapFieldAttribute));
- if (att == null) continue;
+ SoapFieldAttribute att = (SoapFieldAttribute) InternalRemotingServices.GetCachedSoapAttribute (field);
+ if (!att.IsInteropXmlElement ()) continue;
string key = GetNameKey (att.XmlElementName, att.XmlNamespace);
if (att.UseAttribute)
InternalGetSoapAction (mb);
}
- public static string InternalGetSoapAction (MethodBase mb)
+ static string InternalGetSoapAction (MethodBase mb)
{
lock (_soapActions.SyncRoot)
{
string action = (string) _soapActions [mb];
if (action == null)
{
- SoapMethodAttribute att = (SoapMethodAttribute) Attribute.GetCustomAttribute (mb, typeof (SoapMethodAttribute));
- if (att != null)
- action = att.SoapAction;
-
- if (action == null)
- {
- string ns = CodeXmlNamespaceForClrTypeNamespace (mb.DeclaringType.FullName, GetAssemblyName(mb));
- action = ns + "#" + mb.Name;
- }
+ SoapMethodAttribute att = (SoapMethodAttribute) InternalRemotingServices.GetCachedSoapAttribute (mb);
+ action = att.SoapAction;
_soapActions [mb] = action;
_soapActionsMethods [action] = mb;
}
_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","=");
+ }
}
}
projects / mono.git / blobdiff