X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Ftools%2Fwsdl%2FMonoWSDL2.cs;h=71eaf7ae68bafc3707c8b0851ceb4939f970670b;hb=5fd43ffcb30a92f01338a86c30948a9325d96307;hp=35c4454fde408610059d82c59fd05947c24833d1;hpb=b6b13e72e91d5b529a6306ce53bda685932c77db;p=mono.git

diff --git a/mcs/tools/wsdl/MonoWSDL2.cs b/mcs/tools/wsdl/MonoWSDL2.cs
index 35c4454fde4..71eaf7ae68b 100644
--- a/mcs/tools/wsdl/MonoWSDL2.cs
+++ b/mcs/tools/wsdl/MonoWSDL2.cs
@@ -127,9 +127,11 @@ namespace Mono.WebServices
 				codeUnit.Namespaces.Add (proxyCode);
 				
 				WebReferenceCollection references = new WebReferenceCollection ();
+
+				DiscoveryClientProtocol dcc = CreateClient ();
+
 				foreach (string murl in urls) 
 				{
-					DiscoveryClientProtocol dcc = CreateClient ();
 
 					string url = murl;
 					if (!url.StartsWith ("http://") && !url.StartsWith ("https://") && !url.StartsWith ("file://"))
@@ -138,13 +140,14 @@ namespace Mono.WebServices
 					dcc.DiscoverAny (url);
 					dcc.ResolveAll ();
 					
-					WebReference reference = new WebReference (dcc.Documents, proxyCode, protocol, appSettingURLKey, appSettingBaseURL);
-					references.Add (reference);
-					
-					if (sampleSoap != null)
-						ConsoleSampleGenerator.Generate (descriptions, schemas, sampleSoap, protocol);
 				}
 				
+				WebReference reference = new WebReference (dcc.Documents, proxyCode, protocol, appSettingURLKey, appSettingBaseURL);
+				references.Add (reference);
+				
+				if (sampleSoap != null)
+					ConsoleSampleGenerator.Generate (descriptions, schemas, sampleSoap, protocol);
+				
 				if (sampleSoap != null)
 					return 0;
 					
@@ -174,14 +177,18 @@ namespace Mono.WebServices
 			CodeDomProvider provider = GetProvider();
 				
 			StringCollection validationWarnings;
-			validationWarnings = ServiceDescriptionImporter.GenerateWebReferences (references, options, style, provider, codeUnit, verbose);
+			WebReferenceOptions opts = new WebReferenceOptions ();
+			opts.CodeGenerationOptions = options;
+			opts.Style = style;
+			opts.Verbose = verbose;
+			validationWarnings = ServiceDescriptionImporter.GenerateWebReferences (references, provider, codeUnit, opts);
 			
 			for (int n=0; n<references.Count; n++)
 			{
 				WebReference wr  = references [n];
 				
 				BasicProfileViolationCollection violations = new BasicProfileViolationCollection ();
-				if (!WebServicesInteroperability.CheckConformance (WsiClaims.BP10, wr, violations)) {
+				if (String.Compare (protocol, "SOAP", StringComparison.OrdinalIgnoreCase) == 0 && !WebServicesInteroperability.CheckConformance (WsiProfiles.BasicProfile1_1, wr, violations)) {
 					wr.Warnings |= ServiceDescriptionImportWarnings.WsiConformance;
 				}
 				
@@ -189,14 +196,14 @@ namespace Mono.WebServices
 				{
 					if (!hasWarnings) {
 						WriteText ("", 0, 0);
-						WriteText ("There where some warnings while generating the code:", 0, 0);
+						WriteText ("There were some warnings while generating the code:", 0, 0);
 					}
 					
 					WriteText ("", 0, 0);
 					WriteText (urls[n], 2, 2);
 					
 					if ((wr.Warnings & ServiceDescriptionImportWarnings.WsiConformance) > 0) {
-						WriteText ("- This web reference does not conform to WS-I Basic Profile v1.0", 4, 6); 
+						WriteText ("- This web reference does not conform to WS-I Basic Profile v1.1", 4, 6); 
 						foreach (BasicProfileViolation vio in violations) {
 							WriteText (vio.NormativeStatement + ": " + vio.Details, 8, 8);
 							foreach (string ele in vio.Elements)