2006-11-14 Atsushi Enomoto <[email protected]>

	* System.Web.Services.dll.sources : removed obsolete WsiClaims.cs.

	* WebServiceBindingAttribute.cs, WebServiceAttribute.cs :
	  2.0 API fixes (WsiClaims -> WsiProfiles).
	* WsiClaims.cs : removed obsolete type.

	* ConformanceChecker.cs, WebServicesInteroperability.cs,
	  BasicProfileViolation.cs, BasicProfileChecker.cs:
	  2.0 API fixes (WsiClaims -> WsiProfiles).

	* SoapHttpClientProtocol.cs : 2.0 API fix (WsiClaims -> WsiProfiles).


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

mcs/class/System.Web.Services/ChangeLog

@@ -1,3 +1,7 @@
+2006-11-14  Atsushi Enomoto  <[email protected]>
+
+	* System.Web.Services.dll.sources : removed obsolete WsiClaims.cs.
+
 2006-11-14  Atsushi Enomoto  <[email protected]>
 
 	* Makefile : added *.wsdl to the build.

mcs/class/System.Web.Services/System.Web.Services.Description/BasicProfileChecker.cs

@@ -40,8 +40,8 @@ namespace System.Web.Services.Description
 	{
 		public static BasicProfileChecker Instance = new BasicProfileChecker ();
 		
-		public override WsiClaims Claims { 
-			get { return WsiClaims.BP10; }
+		public override WsiProfiles Claims { 
+			get { return WsiProfiles.BasicProfile1_1; }
 		}
 		
 		public override void Check (ConformanceCheckContext ctx, Import value) 

mcs/class/System.Web.Services/System.Web.Services.Description/BasicProfileViolation.cs

@@ -37,18 +37,18 @@ namespace System.Web.Services.Description
 {
 	public class BasicProfileViolation
 	{
-		WsiClaims _claims;
+		WsiProfiles _claims;
 		StringCollection _elements;
 		ConformanceRule _rule;
 		
-		internal BasicProfileViolation (WsiClaims claims, ConformanceRule rule)
+		internal BasicProfileViolation (WsiProfiles claims, ConformanceRule rule)
 		{
 			_claims = claims;
 			_rule = rule;
 			_elements = new StringCollection ();
 		}
 		
-		public WsiClaims Claims {
+		public WsiProfiles Claims {
 			get { return _claims; }
 		}
 		

mcs/class/System.Web.Services/System.Web.Services.Description/ChangeLog

@@ -1,3 +1,9 @@
+2006-11-14  Atsushi Enomoto  <[email protected]>
+
+	* ConformanceChecker.cs, WebServicesInteroperability.cs,
+	  BasicProfileViolation.cs, BasicProfileChecker.cs:
+	  2.0 API fixes (WsiClaims -> WsiProfiles).
+
 2006-11-14  Atsushi Enomoto  <[email protected]>
 
 	* wsdl-1.1.xsd : imported from the spec site (schemas.xmlsoap.org)

mcs/class/System.Web.Services/System.Web.Services.Description/ConformanceChecker.cs

@@ -37,7 +37,7 @@ namespace System.Web.Services.Description
 {
 	internal abstract class ConformanceChecker
 	{
-		public abstract WsiClaims Claims { get; }
+		public abstract WsiProfiles Claims { get; }
 
 		public virtual void Check (ConformanceCheckContext ctx, Binding value) { }
 		public virtual void Check (ConformanceCheckContext ctx, MessageBinding value) { }

mcs/class/System.Web.Services/System.Web.Services.Description/WebServicesInteroperability.cs

@@ -42,7 +42,7 @@ namespace System.Web.Services.Description
 		}
 		
 		[MonoTODO]
-		public static bool CheckConformance (WsiClaims claims, ServiceDescription service, BasicProfileViolationCollection violations)
+		public static bool CheckConformance (WsiProfiles claims, ServiceDescription service, BasicProfileViolationCollection violations)
 		{
 			ServiceDescriptionCollection col = new ServiceDescriptionCollection ();
 			col.Add (service);
@@ -51,20 +51,20 @@ namespace System.Web.Services.Description
 		}
 
 		[MonoTODO]
-		public static bool CheckConformance (WsiClaims claims, ServiceDescriptionCollection services, BasicProfileViolationCollection violations)
+		public static bool CheckConformance (WsiProfiles claims, ServiceDescriptionCollection services, BasicProfileViolationCollection violations)
 		{
 			ConformanceCheckContext ctx = new ConformanceCheckContext (services, violations);
 			return Check (claims, ctx, services);
 		}
 
 		[MonoTODO]
-		public static bool CheckConformance (WsiClaims claims, WebReference webReference, BasicProfileViolationCollection violations)
+		public static bool CheckConformance (WsiProfiles claims, WebReference webReference, BasicProfileViolationCollection violations)
 		{
 			ConformanceCheckContext ctx = new ConformanceCheckContext (webReference, violations);
 			return Check (claims, ctx, webReference.Documents.Values);
 		}
 		
-		static bool Check (WsiClaims claims, ConformanceCheckContext ctx, IEnumerable documents)
+		static bool Check (WsiProfiles claims, ConformanceCheckContext ctx, IEnumerable documents)
 		{
 			ConformanceChecker[] checkers = GetCheckers (claims);
 			if (checkers == null) return true;
@@ -79,9 +79,9 @@ namespace System.Web.Services.Description
 			return ctx.Violations.Count == 0;
 		}
 		
-		static ConformanceChecker[] GetCheckers (WsiClaims claims)
+		static ConformanceChecker[] GetCheckers (WsiProfiles claims)
 		{
-			if ((claims & WsiClaims.BP10) != 0)
+			if ((claims & WsiProfiles.BasicProfile1_1) != 0)
 				return new ConformanceChecker[] { BasicProfileChecker.Instance };
 			return null;
 		}

mcs/class/System.Web.Services/System.Web.Services.Protocols/ChangeLog

@@ -1,3 +1,7 @@
+2006-11-14  Atsushi Enomoto  <[email protected]>
+
+	* SoapHttpClientProtocol.cs : 2.0 API fix (WsiClaims -> WsiProfiles).
+
 2006-09-06  Lluis Sanchez Gual <[email protected]> 
 
 	* ValueCollectionParameterReader.cs, MimeFormatter.cs: Support enums in

mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapHttpClientProtocol.cs

@@ -53,7 +53,6 @@ namespace System.Web.Services.Protocols
 	{
 		SoapTypeStubInfo type_info;
 #if NET_2_0
-		WsiClaims conformanceClaims;
 		SoapProtocolVersion soapVersion;
 #endif
 
@@ -342,14 +341,6 @@ namespace System.Web.Services.Protocols
 		
 #if NET_2_0
 
-		[MonoTODO ("Do something with this")]
-		[System.Runtime.InteropServices.ComVisible(false)]
-		[Obsolete]
-		public WsiClaims ConformanceClaims {
-			get { return conformanceClaims; }
-			set { conformanceClaims = value; }
-		}
-		
 		[MonoTODO ("Do something with this")]
 		[System.Runtime.InteropServices.ComVisible(false)]
 		public SoapProtocolVersion SoapVersion {

mcs/class/System.Web.Services/System.Web.Services.dll.sources

@@ -7,7 +7,6 @@ System.Web.Services/WebService.cs
 System.Web.Services/WebServiceAttribute.cs
 System.Web.Services/WebServiceBindingAttribute.cs
 System.Web.Services/WebServicesDescriptionAttribute.cs
-System.Web.Services/WsiClaims.cs
 System.Web.Services/WsiProfiles.cs
 System.Web.Services.Configuration/DiagnosticsElement.cs
 System.Web.Services.Configuration/PriorityGroup.cs

mcs/class/System.Web.Services/System.Web.Services/ChangeLog

@@ -1,3 +1,9 @@
+2006-11-14  Atsushi Enomoto  <[email protected]>
+
+	* WebServiceBindingAttribute.cs, WebServiceAttribute.cs :
+	  2.0 API fixes (WsiClaims -> WsiProfiles).
+	* WsiClaims.cs : removed obsolete type.
+
 2006-06-21  Rafael Teixeira <[email protected]>
 
 	* WebServiceBindingAttribute.cs: new 2.0 property WsiProfiles ConformsTo.

mcs/class/System.Web.Services/System.Web.Services/WebServiceAttribute.cs

@@ -29,7 +29,11 @@
 //
 
 namespace System.Web.Services {
+#if NET_2_0
+	[AttributeUsage (AttributeTargets.Class | AttributeTargets.Interface, Inherited = true)]
+#else
 	[AttributeUsage (AttributeTargets.Class, Inherited = true)]
+#endif
 	public sealed class WebServiceAttribute : Attribute {
 
 		#region Fields

mcs/class/System.Web.Services/System.Web.Services/WebServiceBindingAttribute.cs

@@ -29,7 +29,11 @@
 //
 
 namespace System.Web.Services {
+#if NET_2_0
+	[AttributeUsage(AttributeTargets.Class | AttributeTargets.Interface, AllowMultiple = true, Inherited = true)]
+#else
 	[AttributeUsage(AttributeTargets.Class, AllowMultiple = true, Inherited = true)]
+#endif
 	public sealed class WebServiceBindingAttribute : Attribute {
 
 		#region Fields
@@ -40,7 +44,6 @@ namespace System.Web.Services {
 		
 #if NET_2_0
 		bool emitConformanceClaims;
-		WsiClaims conformanceClaims;
 		
 		WsiProfiles conformsTo;
 #endif
@@ -92,13 +95,6 @@ namespace System.Web.Services {
 		
 #if NET_2_0
 
-		[System.Runtime.InteropServices.ComVisibleAttribute (false)]
-		public WsiClaims ConformanceClaims {
-			get { return conformanceClaims; }
-			set { conformanceClaims = value; }
-		}
-		
-		[System.Runtime.InteropServices.ComVisibleAttribute (false)]
 		public bool EmitConformanceClaims {
 			get { return emitConformanceClaims; }
 			set { emitConformanceClaims = value; }

mcs/class/System.Web.Services/System.Web.Services/WsiClaims.cs

@@ -1,46 +0,0 @@
-// 
-// System.Web.Services.WsiClaims.cs
-//
-// Author:
-//   Lluis Sanchez ([email protected])
-//
-// Copyright (C) Novell, Inc., 2004
-//
-
-//
-// 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.
-//
-
-#if NET_2_0
-
-using System;
-
-namespace System.Web.Services
-{
-	[Flags]
-	[Serializable]
-	public enum WsiClaims
-	{
-		None,
-		BP10
-	}
-}
-
-#endif