- From: Arthur Ryman via cvs-syncmail <cvsmail@w3.org>
- Date: Sat, 10 Jun 2006 19:50:02 +0000
- To: public-ws-desc-eds@w3.org
Update of /sources/public/2002/ws/desc/test-suite/interchange
In directory hutz:/tmp/cvs-serv26701/test-suite/interchange
Modified Files:
wsdlcm.xsd wsdlcm-rpc.xsd wsdlcm-soap.xsd wsdlcm-http.xsd
wsdlcm-extensions.xsd
Log Message:
added wrapper elements for the extensions
Index: wsdlcm-rpc.xsd
===================================================================
RCS file: /sources/public/2002/ws/desc/test-suite/interchange/wsdlcm-rpc.xsd,v
retrieving revision 1.4
retrieving revision 1.5
diff -C 2 -d -r1.4 -r1.5
*** wsdlcm-rpc.xsd 10 Jun 2006 16:09:02 -0000 1.4
--- wsdlcm-rpc.xsd 10 Jun 2006 19:49:59 -0000 1.5
***************
*** 11,14 ****
--- 11,17 ----
- created
+ 2006-06-10: Arthur Ryman (ryman@ca.ibm.com)
+ - added wrapper elements for extensions
+
-->
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
***************
*** 22,26 ****
schemaLocation="wsdlcm-base.xsd" />
! <xs:element name="rpcSignature" type="Signature" />
<xs:simpleType name="Direction">
--- 25,36 ----
schemaLocation="wsdlcm-base.xsd" />
! <xs:element name="rpcInterfaceOperationExtension"
! type="RpcInterfaceOperationExtension" />
!
! <xs:complexType name="RpcInterfaceOperationExtension">
! <xs:sequence>
! <xs:element name="rpcSignature" type="Signature" />
! </xs:sequence>
! </xs:complexType>
<xs:simpleType name="Direction">
Index: wsdlcm-soap.xsd
===================================================================
RCS file: /sources/public/2002/ws/desc/test-suite/interchange/wsdlcm-soap.xsd,v
retrieving revision 1.4
retrieving revision 1.5
diff -C 2 -d -r1.4 -r1.5
*** wsdlcm-soap.xsd 10 Jun 2006 16:09:02 -0000 1.4
--- wsdlcm-soap.xsd 10 Jun 2006 19:49:59 -0000 1.5
***************
*** 16,19 ****
--- 16,21 ----
2006-06-10: Arthur Ryman (ryman@ca.ibm.com)
- moved parent into base
+ - added wrapper elements for extensions
+
-->
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
***************
*** 27,30 ****
--- 29,85 ----
schemaLocation="wsdlcm-base.xsd" />
+ <xs:element name="soapBindingExtension" type="SoapBindingExtension" />
+
+ <xs:complexType name="SoapBindingExtension">
+ <xs:sequence>
+ <xs:element ref="soapMepDefault" minOccurs="0" />
+ <xs:element ref="soapModules" minOccurs="0" />
+ <xs:element ref="soapUnderlyingProtocol" />
+ <xs:element ref="soapVersion" />
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:element name="soapBindingFaultExtension"
+ type="SoapBindingFaultExtension" />
+
+ <xs:complexType name="SoapBindingFaultExtension">
+ <xs:sequence>
+ <xs:element ref="soapFaultCode" />
+ <xs:element ref="soapFaultSubcodes" />
+ <xs:element ref="soapHeaders" minOccurs="0" />
+ <xs:element ref="soapModules" minOccurs="0" />
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:element name="soapBindingOperationExtension"
+ type="SoapBindingOperationExtension" />
+
+ <xs:complexType name="SoapBindingOperationExtension">
+ <xs:sequence>
+ <xs:element ref="soapAction" minOccurs="0" />
+ <xs:element ref="soapMep" minOccurs="0" />
+ <xs:element ref="soapModules" minOccurs="0" />
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:element name="soapBindingMessageReferenceExtension"
+ type="SoapBindingMessageReferenceExtension" />
+
+ <xs:complexType name="SoapBindingMessageReferenceExtension">
+ <xs:sequence>
+ <xs:element ref="soapHeaders" minOccurs="0" />
+ <xs:element ref="soapModules" minOccurs="0" />
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:element name="soapBindingFaultReferenceExtension"
+ type="SoapBindingFaultReferenceExtension" />
+
+ <xs:complexType name="SoapBindingFaultReferenceExtension">
+ <xs:sequence>
+ <xs:element ref="soapModules" minOccurs="0" />
+ </xs:sequence>
+ </xs:complexType>
+
<xs:element name="soapAction" type="xs:anyURI" />
Index: wsdlcm.xsd
===================================================================
RCS file: /sources/public/2002/ws/desc/test-suite/interchange/wsdlcm.xsd,v
retrieving revision 1.7
retrieving revision 1.8
diff -C 2 -d -r1.7 -r1.8
*** wsdlcm.xsd 10 Jun 2006 16:09:02 -0000 1.7
--- wsdlcm.xsd 10 Jun 2006 19:49:59 -0000 1.8
***************
*** 13,16 ****
--- 13,17 ----
2006-06-10: Arthur Ryman (ryman@ca.ibm.com)
- moved parent, features, and properties into base
+ - added wrapper elements for extensions
-->
***************
*** 106,109 ****
--- 107,116 ----
order, i.e. the lexicographic ordering.
</li>
+ <li>
+ All extensions are enclosed in an optional wrapper
+ element. The wrapper element may occur only if the
+ extension is supported. The presence of the wrapper
+ element may also depend on the document content.
+ </li>
</ol>
</xs:documentation>
***************
*** 116,119 ****
--- 123,134 ----
<xs:restriction base="cmbase:Component">
<xs:sequence>
+ <xs:element name="extensions" type="cmbase:Uris"
+ minOccurs="0">
+ <xs:annotation>
+ <xs:documentation>
+ The set of supported extensions.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
<xs:element name="interfaces"
type="InterfaceComponents" minOccurs="0" />
***************
*** 245,254 ****
<xs:element ref="cmbase:properties" minOccurs="0" />
<xs:element ref="cmbase:parent" />
!
! <!-- Extensions -->
! <xs:element ref="cmextensions:safety" minOccurs="0" />
!
! <!-- RPC Extension -->
! <xs:element ref="cmrpc:rpcSignature" minOccurs="0" />
</xs:sequence>
--- 260,285 ----
<xs:element ref="cmbase:properties" minOccurs="0" />
<xs:element ref="cmbase:parent" />
! <xs:element
! ref="cmextensions:wsdlInterfaceOperationExtension"
! minOccurs="0">
! <xs:annotation>
! <xs:documentation>
! MUST occur if the wsdlx extension is
! supported.
! </xs:documentation>
! </xs:annotation>
! </xs:element>
! <xs:element
! ref="cmrpc:rpcInterfaceOperationExtension" minOccurs="0">
! <xs:annotation>
! <xs:documentation>
! MUST occur if the rpc extension is
! supported AND the {style} property of
! the Interface Operation component
! contains
! http://www.w3.org/2006/01/wsdl/style/rpc.
! </xs:documentation>
! </xs:annotation>
! </xs:element>
</xs:sequence>
***************
*** 361,382 ****
<xs:element ref="cmbase:features" minOccurs="0" />
<xs:element ref="cmbase:properties" minOccurs="0" />
!
! <!-- HTTP Binding Extension -->
! <xs:element ref="cmhttp:httpCookies" minOccurs="0" />
! <xs:element ref="cmhttp:httpMethodDefault"
! minOccurs="0" />
! <xs:element
! ref="cmhttp:httpQueryParameterSeparatorDefault" minOccurs="0" />
! <xs:element ref="cmhttp:httpTransferCodingDefault"
! minOccurs="0" />
!
! <!-- SOAP Binding Extension -->
! <xs:element ref="cmsoap:soapMepDefault"
! minOccurs="0" />
! <xs:element ref="cmsoap:soapModules" minOccurs="0" />
! <xs:element ref="cmsoap:soapUnderlyingProtocol"
! minOccurs="0" />
! <xs:element ref="cmsoap:soapVersion" minOccurs="0" />
!
</xs:sequence>
</xs:restriction>
--- 392,417 ----
<xs:element ref="cmbase:features" minOccurs="0" />
<xs:element ref="cmbase:properties" minOccurs="0" />
! <xs:element ref="cmhttp:httpBindingExtension"
! minOccurs="0">
! <xs:annotation>
! <xs:documentation>
! MUST occur if the http extension is
! supported AND the {type} property of the
! Binding component is
! http://www.w3.org/2006/01/wsdl/http.
! </xs:documentation>
! </xs:annotation>
! </xs:element>
! <xs:element ref="cmsoap:soapBindingExtension"
! minOccurs="0">
! <xs:annotation>
! <xs:documentation>
! MUST occur if the http 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>
***************
*** 409,428 ****
<xs:element ref="cmbase:properties" minOccurs="0" />
<xs:element ref="cmbase:parent" />
!
! <!-- HTTP Binding Extension -->
! <xs:element ref="cmhttp:httpErrorStatusCode"
! minOccurs="0" />
! <xs:element ref="cmhttp:httpHeaders" minOccurs="0" />
! <xs:element ref="cmhttp:httpTransferCoding"
! minOccurs="0" />
!
! <!-- SOAP Binding Extension -->
! <xs:element ref="cmsoap:soapFaultCode"
! minOccurs="0" />
! <xs:element ref="cmsoap:soapFaultSubcodes"
! minOccurs="0" />
! <xs:element ref="cmsoap:soapHeaders" minOccurs="0" />
! <xs:element ref="cmsoap:soapModules" minOccurs="0" />
!
</xs:sequence>
</xs:restriction>
--- 444,469 ----
<xs:element ref="cmbase:properties" minOccurs="0" />
<xs:element ref="cmbase:parent" />
! <xs:element ref="cmhttp:httpBindingFaultExtension"
! minOccurs="0">
! <xs:annotation>
! <xs:documentation>
! MUST occur if the http extension is
! supported AND the {type} property of the
! Binding component is
! http://www.w3.org/2006/01/wsdl/http.
! </xs:documentation>
! </xs:annotation>
! </xs:element>
! <xs:element ref="cmsoap:soapBindingFaultExtension"
! minOccurs="0">
! <xs:annotation>
! <xs:documentation>
! MUST occur if the http 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>
***************
*** 461,486 ****
<xs:element ref="cmbase:properties" minOccurs="0" />
<xs:element ref="cmbase:parent" />
!
! <!-- HTTP Binding Extension -->
! <xs:element ref="cmhttp:httpFaultSerialization"
! minOccurs="0" />
! <xs:element ref="cmhttp:httpInputSerialization"
! minOccurs="0" />
! <xs:element ref="cmhttp:httpLocation" minOccurs="0" />
! <xs:element ref="cmhttp:httpLocationIgnoreUncited"
! minOccurs="0" />
! <xs:element ref="cmhttp:httpMethod" minOccurs="0" />
! <xs:element ref="cmhttp:httpOutputSerialization"
! minOccurs="0" />
! <xs:element ref="cmhttp:httpQueryParameterSeparator"
! minOccurs="0" />
! <xs:element ref="cmhttp:httpTransferCodingDefault"
! minOccurs="0" />
!
! <!-- SOAP Binding Extension -->
! <xs:element ref="cmsoap:soapAction" minOccurs="0" />
! <xs:element ref="cmsoap:soapMep" minOccurs="0" />
! <xs:element ref="cmsoap:soapModules" minOccurs="0" />
!
</xs:sequence>
</xs:restriction>
--- 502,527 ----
<xs:element ref="cmbase:properties" minOccurs="0" />
<xs:element ref="cmbase:parent" />
! <xs:element
! ref="cmhttp:httpBindingOperationExtension" minOccurs="0">
! <xs:annotation>
! <xs:documentation>
! MUST occur if the http extension is
! supported AND the {type} property of the
! Binding component is
! http://www.w3.org/2006/01/wsdl/http.
! </xs:documentation>
! </xs:annotation>
! </xs:element>
! <xs:element
! ref="cmsoap:soapBindingOperationExtension" minOccurs="0">
! <xs:annotation>
! <xs:documentation>
! MUST occur if the http 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>
***************
*** 516,529 ****
<xs:element ref="cmbase:properties" minOccurs="0" />
<xs:element ref="cmbase:parent" />
!
! <!-- HTTP Binding Extension -->
! <xs:element ref="cmhttp:httpHeaders" minOccurs="0" />
! <xs:element ref="cmhttp:httpTransferCoding"
! minOccurs="0" />
!
! <!-- SOAP Binding Extension -->
! <xs:element ref="cmsoap:soapHeaders" minOccurs="0" />
! <xs:element ref="cmsoap:soapModules" minOccurs="0" />
!
</xs:sequence>
</xs:restriction>
--- 557,582 ----
<xs:element ref="cmbase:properties" minOccurs="0" />
<xs:element ref="cmbase:parent" />
! <xs:element
! ref="cmhttp:httpBindingMessageReferenceExtension" minOccurs="0">
! <xs:annotation>
! <xs:documentation>
! MUST occur if the http extension is
! supported AND the {type} property of the
! Binding component is
! http://www.w3.org/2006/01/wsdl/http.
! </xs:documentation>
! </xs:annotation>
! </xs:element>
! <xs:element
! ref="cmsoap:soapBindingMessageReferenceExtension" minOccurs="0">
! <xs:annotation>
! <xs:documentation>
! MUST occur if the http 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>
***************
*** 560,567 ****
<xs:element ref="cmbase:properties" minOccurs="0" />
<xs:element ref="cmbase:parent" />
!
! <!-- SOAP Binding Extension -->
! <xs:element ref="cmsoap:soapModules" minOccurs="0" />
!
</xs:sequence>
--- 613,618 ----
<xs:element ref="cmbase:properties" minOccurs="0" />
<xs:element ref="cmbase:parent" />
! <xs:element
! ref="cmsoap:soapBindingFaultReferenceExtension" />
</xs:sequence>
***************
*** 630,640 ****
<xs:element ref="cmbase:properties" minOccurs="0" />
<xs:element ref="cmbase:parent" />
!
! <!-- HTTP Binding Extension -->
! <xs:element ref="cmhttp:httpAuthenticationRealm"
! minOccurs="0" />
! <xs:element ref="cmhttp:httpAuthenticationScheme"
! minOccurs="0" />
!
</xs:sequence>
</xs:restriction>
--- 681,695 ----
<xs:element ref="cmbase:properties" minOccurs="0" />
<xs:element ref="cmbase:parent" />
! <xs:element ref="cmhttp:httpEndpointExtension"
! minOccurs="0">
! <xs:annotation>
! <xs:documentation>
! MUST occur if the http extension is
! supported AND the {type} property of the
! Binding component is
! http://www.w3.org/2006/01/wsdl/http.
! </xs:documentation>
! </xs:annotation>
! </xs:element>
</xs:sequence>
</xs:restriction>
Index: wsdlcm-http.xsd
===================================================================
RCS file: /sources/public/2002/ws/desc/test-suite/interchange/wsdlcm-http.xsd,v
retrieving revision 1.3
retrieving revision 1.4
diff -C 2 -d -r1.3 -r1.4
*** wsdlcm-http.xsd 10 Jun 2006 16:09:02 -0000 1.3
--- wsdlcm-http.xsd 10 Jun 2006 19:49:59 -0000 1.4
***************
*** 16,19 ****
--- 16,20 ----
2006-06-10: Arthur Ryman (ryman@ca.ibm.com)
- moved parent into base
+ - added wrapper elements for extensions
-->
***************
*** 28,32 ****
--- 29,89 ----
schemaLocation="wsdlcm-base.xsd" />
+ <xs:element name="httpBindingExtension" type="HttpBindingExtension" />
+ <xs:complexType name="HttpBindingExtension">
+ <xs:sequence>
+ <xs:element ref="httpCookies" />
+ <xs:element ref="httpMethodDefault" minOccurs="0" />
+ <xs:element ref="httpQueryParameterSeparatorDefault" />
+ <xs:element ref="httpTransferCodingDefault" minOccurs="0" />
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:element name="httpBindingFaultExtension"
+ type="HttpBindingFaultExtension" />
+
+ <xs:complexType name="HttpBindingFaultExtension">
+ <xs:sequence>
+ <xs:element ref="httpErrorStatusCode" />
+ <xs:element ref="httpHeaders" minOccurs="0" />
+ <xs:element ref="httpTransferCoding" minOccurs="0" />
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:element name="httpBindingOperationExtension"
+ type="HttpBindingOperationExtension" />
+
+ <xs:complexType name="HttpBindingOperationExtension">
+ <xs:sequence>
+ <xs:element ref="httpFaultSerialization" />
+ <xs:element ref="httpInputSerialization" />
+ <xs:element ref="httpLocation" minOccurs="0" />
+ <xs:element ref="httpLocationIgnoreUncited" minOccurs="0" />
+ <xs:element ref="httpMethod" minOccurs="0" />
+ <xs:element ref="httpOutputSerialization" />
+ <xs:element ref="httpQueryParameterSeparator" minOccurs="0" />
+ <xs:element ref="httpTransferCodingDefault" minOccurs="0" />
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:element name="httpBindingMessageReferenceExtension"
+ type="HttpBindingMessageReferenceExtension" />
+
+ <xs:complexType name="HttpBindingMessageReferenceExtension">
+ <xs:sequence>
+ <xs:element ref="httpHeaders" minOccurs="0" />
+ <xs:element ref="httpTransferCoding" minOccurs="0" />
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:element name="httpEndpointExtension"
+ type="HttpEndpointExtension" />
+
+ <xs:complexType name="HttpEndpointExtension">
+ <xs:sequence>
+ <xs:element ref="httpAuthenticationRealm" minOccurs="0" />
+ <xs:element ref="httpAuthenticationScheme" minOccurs="0" />
+ </xs:sequence>
+ </xs:complexType>
<xs:element name="httpAuthenticationRealm" type="xs:string" />
Index: wsdlcm-extensions.xsd
===================================================================
RCS file: /sources/public/2002/ws/desc/test-suite/interchange/wsdlcm-extensions.xsd,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** wsdlcm-extensions.xsd 10 Jun 2006 16:09:02 -0000 1.2
--- wsdlcm-extensions.xsd 10 Jun 2006 19:49:59 -0000 1.3
***************
*** 11,14 ****
--- 11,17 ----
- created
+ 2006-06-10: Arthur Ryman (ryman@ca.ibm.com)
+ - added wrapper elements for extensions
+
-->
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
***************
*** 17,21 ****
elementFormDefault="qualified">
! <xs:element name="safety" type="xs:boolean" />
</xs:schema>
\ No newline at end of file
--- 20,31 ----
elementFormDefault="qualified">
! <xs:element name="wsdlInterfaceOperationExtension"
! type="WsdlInterfaceOperationExtension" />
!
! <xs:complexType name="WsdlInterfaceOperationExtension">
! <xs:sequence>
! <xs:element name="safety" type="xs:boolean" />
! </xs:sequence>
! </xs:complexType>
</xs:schema>
\ No newline at end of file
Received on Saturday, 10 June 2006 19:50:10 UTC