* ServiceDescriptionImporter.cs: Fixed bug when getting documents fr…

…om a reference. * SoapProtocolImporter.cs: Create code exportes using the corrent generation options. Added final attribute to the generated methods (so generated methods are not virtual any more). * WebServicesInteroperability.cs: Fixed bug when getting documents from a reference. Added check for Import elements. svn path=/trunk/mcs/; revision=31409
mono · Jul 23, 2004 · e944d50 · e944d50
1 parent 5c81008
commit e944d50
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 6 deletions.
diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/ChangeLog b/mcs/class/System.Web.Services/System.Web.Services.Description/ChangeLog
@@ -1,3 +1,13 @@
+2004-07-23  Lluis Sanchez Gual  <lluis@ximian.com>
+
+	* ServiceDescriptionImporter.cs: Fixed bug when getting documents from a
+	  reference.
+	* SoapProtocolImporter.cs: Create code exportes using the corrent generation
+	  options. Added final attribute to the generated methods (so generated
+	  methods are not virtual any more).
+	* WebServicesInteroperability.cs: Fixed bug when getting documents from a
+	  reference. Added check for Import elements.
+
 2004-07-22  Lluis Sanchez Gual  <lluis@ximian.com>
 
 	* ProtocolImporter.cs: Added some internal properties needed for 2.0

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/ServiceDescriptionImporter.cs b/mcs/class/System.Web.Services/System.Web.Services.Description/ServiceDescriptionImporter.cs
@@ -213,7 +213,7 @@ ArrayList GetSupportedImporters ()
 
 		internal void AddReference (WebReference reference)
 		{
-			foreach (object doc in reference.Documents)
+			foreach (object doc in reference.Documents.Values)
 			{
 				if (doc is ServiceDescription) {
 					ServiceDescription service = (ServiceDescription) doc;

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/SoapProtocolImporter.cs b/mcs/class/System.Web.Services/System.Web.Services.Description/SoapProtocolImporter.cs
@@ -137,12 +137,14 @@ protected override void BeginNamespace ()
 #if NET_2_0
 			xmlImporter = new XmlSchemaImporter (LiteralSchemas, base.CodeGenerationOptions, base.CodeGenerator, base.ImportContext);
 			soapImporter = new SoapSchemaImporter (EncodedSchemas, base.CodeGenerationOptions, base.CodeGenerator, base.ImportContext);
+			xmlExporter = new XmlCodeExporter (CodeNamespace, null, base.CodeGenerator, base.CodeGenerationOptions, null);
+			soapExporter = new SoapCodeExporter (CodeNamespace, null, base.CodeGenerator, base.CodeGenerationOptions, null);
 #else
 			xmlImporter = new XmlSchemaImporter (LiteralSchemas, ClassNames);
 			soapImporter = new SoapSchemaImporter (EncodedSchemas, ClassNames);
-#endif
 			xmlExporter = new XmlCodeExporter (CodeNamespace, null);
 			soapExporter = new SoapCodeExporter (CodeNamespace, null);
+#endif
 		}
 
 		protected override void EndClass ()
@@ -305,9 +307,9 @@ CodeMemberMethod GenerateMethod (CodeIdentifiers memberIds, SoapOperationBinding
 			CodeMemberMethod method = new CodeMemberMethod ();
 			CodeMemberMethod methodBegin = new CodeMemberMethod ();
 			CodeMemberMethod methodEnd = new CodeMemberMethod ();
-			method.Attributes = MemberAttributes.Public;
-			methodBegin.Attributes = MemberAttributes.Public;
-			methodEnd.Attributes = MemberAttributes.Public;
+			method.Attributes = MemberAttributes.Public | MemberAttributes.Final;
+			methodBegin.Attributes = MemberAttributes.Public | MemberAttributes.Final;
+			methodEnd.Attributes = MemberAttributes.Public | MemberAttributes.Final;
 
 			SoapBindingStyle style = soapOper.Style != SoapBindingStyle.Default ? soapOper.Style : soapBinding.Style;
 

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/WebServicesInteroperability.cs b/mcs/class/System.Web.Services/System.Web.Services.Description/WebServicesInteroperability.cs
@@ -60,7 +60,7 @@ public static bool CheckConformance (WsiClaims claims, ServiceDescriptionCollect
 		public static bool CheckConformance (WsiClaims claims, WebReference webReference, BasicProfileViolationCollection violations)
 		{
 			ConformanceCheckContext ctx = new ConformanceCheckContext (webReference, violations);
-			return Check (claims, ctx, webReference.Documents);
+			return Check (claims, ctx, webReference.Documents.Values);
 		}
 
 		static bool Check (WsiClaims claims, ConformanceCheckContext ctx, IEnumerable documents)
@@ -93,6 +93,10 @@ static void Check (ConformanceCheckContext ctx, ConformanceChecker checker, Serv
 			checker.Check (ctx, sd);
 			CheckExtensions (ctx, checker, sd.Extensions);
 
+			foreach (Import i in sd.Imports) {
+				checker.Check (ctx, i);
+			}
+
 			foreach (Service s in sd.Services) {
 				checker.Check (ctx, s);
 				foreach (Port p in s.Ports) {