- From: Arthur Ryman via cvs-syncmail <cvsmail@w3.org>
- Date: Sun, 18 Jun 2006 21:59:30 +0000
- To: public-ws-desc-eds@w3.org
Update of /sources/public/2002/ws/desc/test-suite/interchange
In directory hutz:/tmp/cvs-serv10747/test-suite/interchange
Modified Files:
wsdlcm.xsd wsdlcm-soap.xsd
Log Message:
added missing HTTP properties to SOAP extension
added SOAP Endpoint Extension
Index: wsdlcm-soap.xsd
===================================================================
RCS file: /sources/public/2002/ws/desc/test-suite/interchange/wsdlcm-soap.xsd,v
retrieving revision 1.5
retrieving revision 1.6
diff -C 2 -d -r1.5 -r1.6
*** wsdlcm-soap.xsd 10 Jun 2006 19:49:59 -0000 1.5
--- wsdlcm-soap.xsd 18 Jun 2006 21:59:27 -0000 1.6
***************
*** 18,25 ****
--- 18,47 ----
- added wrapper elements for extensions
+ 2006-06-18: Arthur Ryman (ryman@ca.ibm.com)
+ - added missing HTTP properties
+
+ {http location} on Binding Operation components, as defined in 6.4 Binding Operations
+
+ {http headers} on Binding Message Reference and
+ Binding Fault components, as defined in 6.5 Declaring HTTP Headers
+
+ {http transfer coding default} on Binding and
+ Binding Operation components,
+
+ {http transfer coding} on Binding Message Reference and
+ Binding Fault components, as defined in 6.8 Specifying the Transfer Coding
+
+ {http cookies} on Binding components, as defined in 6.9 Specifying the Use of HTTP Cookies
+
+ {http authentication scheme} and
+ {http authentication realm} on Endpoint components, as defined in 6.10 Specifying HTTP Access Authentication
+
+
+
-->
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns="http://www.w3.org/2002/ws/desc/wsdl/component-soap"
xmlns:cmbase="http://www.w3.org/2002/ws/desc/wsdl/component-base"
+ xmlns:cmhttp="http://www.w3.org/2002/ws/desc/wsdl/component-http"
targetNamespace="http://www.w3.org/2002/ws/desc/wsdl/component-soap"
elementFormDefault="qualified">
***************
*** 29,36 ****
--- 51,65 ----
schemaLocation="wsdlcm-base.xsd" />
+ <xs:import
+ namespace="http://www.w3.org/2002/ws/desc/wsdl/component-http"
+ schemaLocation="wsdlcm-http.xsd" />
+
<xs:element name="soapBindingExtension" type="SoapBindingExtension" />
<xs:complexType name="SoapBindingExtension">
<xs:sequence>
+ <xs:element ref="cmhttp:httpCookies" />
+ <xs:element ref="cmhttp:httpTransferCodingDefault"
+ minOccurs="0" />
<xs:element ref="soapMepDefault" minOccurs="0" />
<xs:element ref="soapModules" minOccurs="0" />
***************
*** 45,48 ****
--- 74,79 ----
<xs:complexType name="SoapBindingFaultExtension">
<xs:sequence>
+ <xs:element ref="cmhttp:httpHeaders" minOccurs="0" />
+ <xs:element ref="cmhttp:httpTransferCoding" minOccurs="0" />
<xs:element ref="soapFaultCode" />
<xs:element ref="soapFaultSubcodes" />
***************
*** 57,60 ****
--- 88,94 ----
<xs:complexType name="SoapBindingOperationExtension">
<xs:sequence>
+ <xs:element ref="cmhttp:httpLocation" minOccurs="0" />
+ <xs:element ref="cmhttp:httpTransferCodingDefault"
+ minOccurs="0" />
<xs:element ref="soapAction" minOccurs="0" />
<xs:element ref="soapMep" minOccurs="0" />
***************
*** 63,66 ****
--- 97,112 ----
</xs:complexType>
+ <xs:element name="soapEndpointExtension"
+ type="SoapEndpointExtension" />
+
+ <xs:complexType name="SoapEndpointExtension">
+ <xs:sequence>
+ <xs:element ref="cmhttp:httpAuthenticationRealm"
+ minOccurs="0" />
+ <xs:element ref="cmhttp:httpAuthenticationScheme"
+ minOccurs="0" />
+ </xs:sequence>
+ </xs:complexType>
+
<xs:element name="soapBindingMessageReferenceExtension"
type="SoapBindingMessageReferenceExtension" />
***************
*** 68,71 ****
--- 114,119 ----
<xs:complexType name="SoapBindingMessageReferenceExtension">
<xs:sequence>
+ <xs:element ref="cmhttp:httpHeaders" minOccurs="0" />
+ <xs:element ref="cmhttp:httpTransferCoding" minOccurs="0" />
<xs:element ref="soapHeaders" minOccurs="0" />
<xs:element ref="soapModules" minOccurs="0" />
Index: wsdlcm.xsd
===================================================================
RCS file: /sources/public/2002/ws/desc/test-suite/interchange/wsdlcm.xsd,v
retrieving revision 1.8
retrieving revision 1.9
diff -C 2 -d -r1.8 -r1.9
*** wsdlcm.xsd 10 Jun 2006 19:49:59 -0000 1.8
--- wsdlcm.xsd 18 Jun 2006 21:59:27 -0000 1.9
***************
*** 15,18 ****
--- 15,22 ----
- added wrapper elements for extensions
+ 2006-06-18: Arthur Ryman (ryman@ca.ibm.com)
+ - added missing soap endpoint extension
+ - corrected soap extension co-occurence comments
+
-->
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
***************
*** 407,411 ****
<xs:annotation>
<xs:documentation>
! MUST occur if the http extension is
supported AND the {type} property of the
Binding component is
--- 411,415 ----
<xs:annotation>
<xs:documentation>
! MUST occur if the soap extension is
supported AND the {type} property of the
Binding component is
***************
*** 459,463 ****
<xs:annotation>
<xs:documentation>
! MUST occur if the http extension is
supported AND the {type} property of the
Binding component is
--- 463,467 ----
<xs:annotation>
<xs:documentation>
! MUST occur if the soap extension is
supported AND the {type} property of the
Binding component is
***************
*** 517,521 ****
<xs:annotation>
<xs:documentation>
! MUST occur if the http extension is
supported AND the {type} property of the
Binding component is
--- 521,525 ----
<xs:annotation>
<xs:documentation>
! MUST occur if the soap extension is
supported AND the {type} property of the
Binding component is
***************
*** 572,576 ****
<xs:annotation>
<xs:documentation>
! MUST occur if the http extension is
supported AND the {type} property of the
Binding component is
--- 576,580 ----
<xs:annotation>
<xs:documentation>
! MUST occur if the soap extension is
supported AND the {type} property of the
Binding component is
***************
*** 692,695 ****
--- 696,710 ----
</xs:annotation>
</xs:element>
+ <xs:element ref="cmsoap:soapEndpointExtension"
+ minOccurs="0">
+ <xs:annotation>
+ <xs:documentation>
+ MUST occur if the soap extension is
+ supported AND the {type} property of the
+ Binding component is
+ http://www.w3.org/2006/01/wsdl/soap.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
</xs:sequence>
</xs:restriction>
Received on Sunday, 18 June 2006 21:59:33 UTC