Imported Upstream version 3.6.0

Former-commit-id: da6be194a6b1221998fc28233f2503bd61dd9d14

mcs/class/corlib/System.Runtime.Remoting.Metadata/ChangeLog

@@ -0,0 +1,49 @@
+2004-06-11  Gert Driesen <drieseng@users.sourceforge.net>
+
+	* SoapAttribute.cs: use protected field to store namespace value, 
+	removed obsolete private field
+
+2004-06-10  Lluis Sanchez Gual  <lluis@ximian.com>
+
+	* SoapAttribute.cs: Added missing protected members.
+
+2004-04-01  Lluis Sanchez Gual  <lluis@ximian.com>
+
+	* SoapTypeAttribute.cs: Reverted last change. MS.NET don't return the full
+	  assembly name.
+
+2003-12-10  Lluis Sanchez Gual  <lluis@ximian.com>
+
+	* SoapTypeAttribute.cs: Use full namespace name.
+
+2003-12-03  Lluis Sanchez Gual  <lluis@ximian.com>
+
+	* SoapTypeAttribute.cs: Set correct value for default namespace.
+
+2003-11-26  Lluis Sanchez Gual  <lluis@ximian.com>
+
+	* SoapAttribute.cs, SoapFieldAttribute.cs, SoapMethodAttribute.cs,
+	  SoapTypeAttribute.cs: Added SetReflectionObject. Used to initialize some
+	  attribute properties.
+
+2003-11-11  Lluis Sanchez Gual  <lluis@ximian.com>
+
+	* SoapAttribute.cs, SoapFieldAttribute.cs, SoapMethodAttribute.cs,
+	  SoapTypeAttribute.cs: Implemented several simple methods and properties.
+
+2002-07-29  Duncan Mak  <duncan@ximian.com>
+
+	* SoapAttribute.cs: Fixed typo, renamed ReflectionInfo to ReflectInfo.
+
+	* SoapOption.cs: Fix the namespace.
+
+2002-07-24  Duncan Mak  <duncan@ximian.com>
+
+	* SoapAttribute.cs: 
+	* SoapFieldAttribute.cs: 
+	* SoapMethodAttribute.cs: 
+	* SoapParameterAttribute.cs: 
+	* SoapTypeAttribute.cs: Stubbed out.
+
+	* SoapOption.cs: 
+	* XmlFieldOrderOption.cs: Moved here from System.Runtime.Remoting

mcs/class/corlib/System.Runtime.Remoting.Metadata/SoapAttribute.cs

@@ -0,0 +1,84 @@
+//
+// System.Runtime.Remoting.Metadata.SoapAttribute.cs
+//
+// Author: Duncan Mak  (duncan@ximian.com)
+//         Lluis Sanchez Gual (lluis@ximian.com)
+//
+// 2002 (C) Copyright, Ximian, Inc.
+//
+
+//
+// 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;
+
+namespace System.Runtime.Remoting.Metadata {
+	[System.Runtime.InteropServices.ComVisible (true)]
+	public class SoapAttribute : Attribute
+	{
+		bool _nested;
+		bool _useAttribute;
+		
+		protected string ProtXmlNamespace;
+		protected object ReflectInfo;
+		
+		public SoapAttribute ()
+		{
+		}
+
+		public virtual bool Embedded {
+			get {
+				return _nested;
+			}
+
+			set {
+				_nested = value;
+			}
+		}
+
+		public virtual bool UseAttribute {
+			get {
+				return _useAttribute;
+			}
+
+			set {
+				_useAttribute = value;
+			}
+		}
+
+		public virtual string XmlNamespace {
+			get {
+				return ProtXmlNamespace;
+			}
+
+			set {
+				ProtXmlNamespace = value;
+			}
+		}
+		
+		internal virtual void SetReflectionObject (object reflectionObject)
+		{
+			ReflectInfo = reflectionObject;
+		}
+	}
+}

mcs/class/corlib/System.Runtime.Remoting.Metadata/SoapFieldAttribute.cs

@@ -0,0 +1,83 @@
+//
+// System.Runtime.Remoting.Metadata.SoapFieldAttribute.cs
+//
+// Author: Duncan Mak  (duncan@ximian.com)
+//         Lluis Sanchez Gual (lluis@ximian.com)
+//
+// 2002 (C) Copyright, Ximian, Inc.
+//
+
+//
+// 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.Runtime.Remoting;
+using System.Runtime.Remoting.Metadata;
+using System.Reflection;
+
+namespace System.Runtime.Remoting.Metadata {
+
+	[AttributeUsage (AttributeTargets.Field)]
+	[System.Runtime.InteropServices.ComVisible (true)]
+	public sealed class SoapFieldAttribute : SoapAttribute
+	{
+		int _order;
+		string _elementName;
+		bool _isElement = false;
+		
+		public SoapFieldAttribute ()
+		{
+		}
+
+		public int Order {
+			get {
+				return _order;
+			}
+
+			set {
+				_order = value;
+			}
+		}
+		
+		public string XmlElementName {
+			get {
+				return _elementName;
+			}
+
+			set {
+				_isElement = value != null;
+				_elementName = value;
+			}
+		}
+
+		public bool IsInteropXmlElement ()
+		{
+			return _isElement;
+		}
+		
+		internal override void SetReflectionObject (object reflectionObject)
+		{
+			FieldInfo f = (FieldInfo) reflectionObject;
+			if (_elementName == null) _elementName = f.Name;
+		}
+	}
+}

mcs/class/corlib/System.Runtime.Remoting.Metadata/SoapMethodAttribute.cs

@@ -0,0 +1,136 @@
+//
+// System.Runtime.Remoting.Metadata.SoapMethodAttribute.cs
+//
+// Author: Duncan Mak  (duncan@ximian.com)
+//         Lluis Sanchez Gual (lluis@ximian.com)
+//
+// 2002 (C) Copyright, Ximian, Inc.
+//
+
+//
+// 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.Reflection;
+using System.Runtime.Remoting;
+using System.Runtime.Remoting.Metadata;
+
+namespace System.Runtime.Remoting.Metadata {
+
+	[AttributeUsage (AttributeTargets.Method)]
+	[System.Runtime.InteropServices.ComVisible (true)]
+	public sealed class SoapMethodAttribute : SoapAttribute
+	{
+		string _responseElement;
+		string _responseNamespace;
+		string _returnElement;
+		string _soapAction;
+		bool _useAttribute;
+		string _namespace;
+		
+		public SoapMethodAttribute ()
+		{
+		}
+
+		public string ResponseXmlElementName {
+			get {
+				return _responseElement;
+			}
+
+			set {
+				_responseElement = value;
+			}
+		}
+		
+		public string ResponseXmlNamespace {
+			get {
+				return _responseNamespace;
+			}
+
+			set {
+				_responseNamespace = value;
+			}
+		}
+
+		public string ReturnXmlElementName {
+			get {
+				return _returnElement;
+			}
+
+			set {
+				_returnElement = value;
+			}
+		}
+
+		public string SoapAction {
+			get {
+				return _soapAction;
+			}
+
+			set {
+				_soapAction = value;
+			}
+		}
+
+		public override bool UseAttribute {
+			get {
+				return _useAttribute;
+			}
+
+			set {
+				_useAttribute = value;
+			}
+		}
+
+		public override string XmlNamespace {
+			get {
+				return _namespace;
+			}
+
+			set {
+				_namespace = value;
+			}
+		}
+		
+		internal override void SetReflectionObject (object reflectionObject)
+		{
+			MethodBase mb = (MethodBase) reflectionObject;
+			
+			if (_responseElement == null)
+				_responseElement = mb.Name + "Response";
+				
+			if (_responseNamespace == null)
+				_responseNamespace = SoapServices.GetXmlNamespaceForMethodResponse (mb);
+				
+			if (_returnElement == null)
+				_returnElement = "return";
+				
+			if (_soapAction == null) {
+				_soapAction = SoapServices.GetXmlNamespaceForMethodCall (mb) + "#" + mb.Name;
+			}
+			
+			if (_namespace == null)
+				_namespace = SoapServices.GetXmlNamespaceForMethodCall (mb);
+		}
+	}
+}

mcs/class/corlib/System.Runtime.Remoting.Metadata/SoapOption.cs

@@ -0,0 +1,73 @@
+// SoapOption.cs
+//
+// This code was automatically generated from
+// ECMA CLI XML Library Specification.
+// Generator: libgen.xsl [1.0; (C) Sergey Chaban (serge@wildwestsoftware.com)]
+// Created: Wed, 5 Sep 2001 06:41:11 UTC
+// Source file: all.xml
+// URL: http://devresource.hp.com/devresource/Docs/TechPapers/CSharp/all.xml
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+
+//
+// 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.
+//
+
+
+namespace System.Runtime.Remoting.Metadata {
+
+
+	/// <summary>
+	/// </summary>
+	[Flags]
+	[System.Runtime.InteropServices.ComVisible (true)]
+	[System.Serializable]
+
+	public enum SoapOption {
+
+		/// <summary>
+		/// </summary>
+		None = 0,
+
+		/// <summary>
+		/// </summary>
+		AlwaysIncludeTypes = 1,
+
+		/// <summary>
+		/// </summary>
+		XsdString = 2,
+
+		/// <summary>
+		/// </summary>
+		EmbedAll = 4,
+
+		/// <summary>
+		/// </summary>
+		Option1 = 8,
+
+		/// <summary>
+		/// </summary>
+		Option2 = 16,
+
+	} // SoapOption
+
+} // System.Runtime.Remoting.Metadata

mcs/class/corlib/System.Runtime.Remoting.Metadata/SoapParameterAttribute.cs

@@ -0,0 +1,44 @@
+//
+// System.Runtime.Remoting.Metadata.SoapParameterAttribute.cs
+//
+// Author: Duncan Mak  (duncan@ximian.com)
+//
+// 2002 (C) Copyright, Ximian, Inc.
+//
+
+//
+// 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.Runtime.Remoting.Metadata;
+
+namespace System.Runtime.Remoting.Metadata {
+
+	[AttributeUsage (AttributeTargets.Parameter)]
+	[System.Runtime.InteropServices.ComVisible (true)]
+	public sealed class SoapParameterAttribute : SoapAttribute
+	{
+		public SoapParameterAttribute ()
+		{
+		}
+	}
+}

mcs/class/corlib/System.Runtime.Remoting.Metadata/SoapTypeAttribute.cs

@@ -0,0 +1,164 @@
+//
+// System.Runtime.Remoting.Metadata.SoapTypeAttribute.cs
+//
+// Author: Duncan Mak  (duncan@ximian.com)
+//         Lluis Sanchez Gual (lluis@ximian.com)
+//
+// 2002 (C) Copyright, Ximian, Inc.
+//
+
+//
+// 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.Runtime.Remoting;
+using System.Runtime.Remoting.Metadata;
+
+namespace System.Runtime.Remoting.Metadata {
+
+	[AttributeUsage (AttributeTargets.Class | AttributeTargets.Struct |
+			 AttributeTargets.Enum | AttributeTargets.Interface)]
+	[System.Runtime.InteropServices.ComVisible (true)]
+	public sealed class SoapTypeAttribute : SoapAttribute
+	{
+		SoapOption _soapOption;
+		bool _useAttribute;
+		string _xmlElementName;
+		XmlFieldOrderOption _xmlFieldOrder;
+		string _xmlNamespace;
+		string _xmlTypeName;
+		string _xmlTypeNamespace;
+		bool _isType;
+		bool _isElement;
+		
+		public SoapTypeAttribute ()
+		{
+		}
+
+		public SoapOption SoapOptions {
+			get {
+				return _soapOption;
+			}
+
+			set {
+				_soapOption = value;
+			}
+		}
+
+		public override bool UseAttribute {
+			get {
+				return _useAttribute;
+			}
+
+			set {
+				_useAttribute = value;
+			}
+		}
+
+		public string XmlElementName {
+			get {
+				return _xmlElementName;
+			}
+
+			set {
+				_isElement = value != null;
+				_xmlElementName = value;
+			}
+		}
+
+		public XmlFieldOrderOption XmlFieldOrder {
+			get {
+				return _xmlFieldOrder;
+			}
+
+			set {
+				_xmlFieldOrder = value;
+			}
+		}
+
+		public override string XmlNamespace {
+			get {
+				return _xmlNamespace;
+			}
+
+			set {
+				_isElement = value != null;
+				_xmlNamespace = value;
+			}
+		}
+
+		public string XmlTypeName {
+			get {
+				return _xmlTypeName;
+			}
+
+			set {
+				_isType = value != null;
+				_xmlTypeName = value;
+			}
+		}
+
+		public string XmlTypeNamespace {
+			get {
+				return _xmlTypeNamespace;
+			}
+
+			set {
+				_isType = value != null;
+				_xmlTypeNamespace = value;
+			}
+		}
+		
+		internal bool IsInteropXmlElement
+		{
+			get { return _isElement; }
+		}
+		
+		internal bool IsInteropXmlType
+		{
+			get { return _isType; }
+		}
+		
+		internal override void SetReflectionObject (object reflectionObject)
+		{
+			Type type = (Type) reflectionObject;
+			
+			if (_xmlElementName == null)
+				_xmlElementName = type.Name;
+				
+			if (_xmlTypeName == null)
+				_xmlTypeName = type.Name;
+			
+			if (_xmlTypeNamespace == null)
+			{
+				string na;
+				if (type.Assembly == typeof (object).Assembly) na = string.Empty;
+				else na = type.Assembly.GetName().Name;
+				_xmlTypeNamespace = SoapServices.CodeXmlNamespaceForClrTypeNamespace (type.Namespace, na);
+			}
+			
+			if (_xmlNamespace == null)
+				_xmlNamespace = _xmlTypeNamespace;
+		}
+	}
+}

mcs/class/corlib/System.Runtime.Remoting.Metadata/XmlFieldOrderOption.cs

@@ -0,0 +1,42 @@
+//
+// System.Runtime.Remoting.Metadata.XmlFieldOrderOption.cs
+//
+// Author: Duncan Mak  (duncan@ximian.com)
+//
+// 2002 (C) Copyright. Ximian, Inc.
+//
+
+//
+// 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.
+//
+
+namespace System.Runtime.Remoting.Metadata {
+
+	[System.Runtime.InteropServices.ComVisible (true)]
+	[System.Serializable]
+	public enum XmlFieldOrderOption
+	{
+		All = 0,
+		Sequence = 1,
+		Choice = 2,
+	}
+}