From 079ff768ed212c16c6721a6bd9193ba260c0266b Mon Sep 17 00:00:00 2001 From: Lluis Sanchez Date: Fri, 27 Aug 2004 12:43:05 +0000 Subject: * data/net_1_1/DefaultWsdlHelpGenerator.aspx: Little fix. * data/net_2_0/DefaultWsdlHelpGenerator.aspx: Added information about basic profile compliance. * data/net_2_0/machine.config: Use 2.0 assembly versions. svn path=/trunk/mono/; revision=32926 --- data/net_1_1/DefaultWsdlHelpGenerator.aspx | 12 ++- data/net_2_0/DefaultWsdlHelpGenerator.aspx | 37 ++++++++- data/net_2_0/machine.config | 116 ++++++++++++++--------------- 3 files changed, 102 insertions(+), 63 deletions(-) (limited to 'data') diff --git a/data/net_1_1/DefaultWsdlHelpGenerator.aspx b/data/net_1_1/DefaultWsdlHelpGenerator.aspx index 396bf2cd182..f0f74e682bc 100644 --- a/data/net_1_1/DefaultWsdlHelpGenerator.aspx +++ b/data/net_1_1/DefaultWsdlHelpGenerator.aspx @@ -940,15 +940,23 @@ public class HtmlSampleGenerator: SampleGenerator } // Serialize headers + + bool writtenHeader = false; foreach (object ob in msgbin.Extensions) { SoapHeaderBinding hb = ob as SoapHeaderBinding; if (hb == null) continue; - xtw.WriteStartElement ("soap", "Header", SoapEnvelopeNamespace); + if (!writtenHeader) { + xtw.WriteStartElement ("soap", "Header", SoapEnvelopeNamespace); + writtenHeader = true; + } + WriteHeader (xtw, hb); - xtw.WriteEndElement (); } + + if (writtenHeader) + xtw.WriteEndElement (); // Serialize body xtw.WriteStartElement ("soap", "Body", SoapEnvelopeNamespace); diff --git a/data/net_2_0/DefaultWsdlHelpGenerator.aspx b/data/net_2_0/DefaultWsdlHelpGenerator.aspx index 396bf2cd182..3f529af4e3a 100644 --- a/data/net_2_0/DefaultWsdlHelpGenerator.aspx +++ b/data/net_2_0/DefaultWsdlHelpGenerator.aspx @@ -14,6 +14,7 @@ <%@ Import Namespace="System.Xml.Serialization" %> <%@ Import Namespace="System.Xml" %> <%@ Import Namespace="System.Xml.Schema" %> +<%@ Import Namespace="System.Web.Services" %> <%@ Import Namespace="System.Web.Services.Description" %> <%@ Import Namespace="System" %> <%@ Import Namespace="System.Net" %> @@ -50,6 +51,7 @@ ArrayList InParams; ArrayList OutParams; string CurrentOperationProtocols; int CodeTextColumns = 95; +BasicProfileViolationCollection ProfileViolations; void Page_Load(object sender, EventArgs e) { @@ -66,6 +68,8 @@ void Page_Load(object sender, EventArgs e) DefaultBinding = desc.Bindings[0].Name; WebServiceDescription = service.Documentation; + if (WebServiceDescription == "" || WebServiceDescription == null) + WebServiceDescription = "Description has not been provided"; ServiceProtocols = FindServiceProtocols (null); CurrentOperationName = Request.QueryString["op"]; @@ -82,6 +86,9 @@ void Page_Load(object sender, EventArgs e) BindingsRepeater.DataSource = list; Page.DataBind(); + + ProfileViolations = new BasicProfileViolationCollection (); + WebServicesInteroperability.CheckConformance (WsiClaims.BP10, descriptions, ProfileViolations); } void BuildOperationInfo () @@ -940,15 +947,23 @@ public class HtmlSampleGenerator: SampleGenerator } // Serialize headers + + bool writtenHeader = false; foreach (object ob in msgbin.Extensions) { SoapHeaderBinding hb = ob as SoapHeaderBinding; if (hb == null) continue; - xtw.WriteStartElement ("soap", "Header", SoapEnvelopeNamespace); + if (!writtenHeader) { + xtw.WriteStartElement ("soap", "Header", SoapEnvelopeNamespace); + writtenHeader = true; + } + WriteHeader (xtw, hb); - xtw.WriteEndElement (); } + + if (writtenHeader) + xtw.WriteEndElement (); // Serialize body xtw.WriteStartElement ("soap", "Body", SoapEnvelopeNamespace); @@ -1595,7 +1610,23 @@ function clearForm ()

Web Service Overview

<%#WebServiceDescription%> - +

+ <% if (ProfileViolations.Count > 0) { %> +

Basic Profile Conformance

+ This web service does not conform to WS-I Basic Profile v1.0 + <% + Response.Write (""); + }%> + <%} if (DefaultBinding == null) {%> This service does not contain any public web method. <%} else if (CurrentPage == "op") {%> diff --git a/data/net_2_0/machine.config b/data/net_2_0/machine.config index c4666300b0b..5d7143fcd9d 100644 --- a/data/net_2_0/machine.config +++ b/data/net_2_0/machine.config @@ -3,63 +3,63 @@ -
-
-
+
+
+
+ type="System.Web.Configuration.HttpHandlersSectionHandler, System.Web, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ type="System.Web.Configuration.HttpModulesConfigurationHandler, System.Web, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ type="System.Web.Configuration.MachineKeyConfigHandler, System.Web, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ type="System.Web.Configuration.AuthenticationConfigHandler, System.Web, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ type="System.Web.Configuration.AuthorizationConfigHandler, System.Web, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ type="System.Web.Configuration.GlobalizationConfigurationHandler, System.Web, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ type="System.Web.SessionState.SessionStateSectionHandler, System.Web, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ type="System.Web.Configuration.TraceConfigurationHandler, System.Web, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ type="System.Web.Services.Configuration.WebServicesConfigurationSectionHandler, System.Web.Services, Version=2.0.3600.0 Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ type="System.Web.Configuration.WebControlsSectionHandler, System.Web, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ type="System.Web.Configuration.CompilationConfigurationHandler, System.Web, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ type="System.Web.Configuration.HttpRuntimeConfigurationHandler, System.Web, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ type="System.Web.Configuration.CustomErrorsConfigHandler, System.Web, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ type="System.Web.Configuration.PagesConfigurationHandler, System.Web, Version=2.0.3600.0, Culture=neutral" />
+ type="System.Web.Configuration.ClientTargetSectionHandler, System.Web, Version=2.0.3600.0, Culture=neutral" />
+ type="System.Net.Configuration.NetConfigurationHandler, System, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+ type="System.Net.Configuration.ConnectionManagementHandler, System, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+ type="System.Net.Configuration.NetAuthenticationModuleHandler, System, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+ type="System.Net.Configuration.DefaultProxyHandler, System, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+ type="System.Net.Configuration.WebRequestModuleHandler, System, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> -
+
- - - + + + @@ -67,9 +67,9 @@ - - - + + + @@ -77,25 +77,25 @@ - - - - - - - - - + + + + + + + + + - - + + - - - - + + + + @@ -126,10 +126,10 @@ + type="Microsoft.CSharp.CSharpCodeProvider, System, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> + type="Microsoft.VisualBasic.VBCodeProvider, System, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> @@ -168,22 +168,22 @@ - - - - - - + + + + + + - - + + - - - + + + -- cgit v1.2.3