- From: Arthur Ryman via cvs-syncmail <cvsmail@w3.org>
- Date: Sat, 11 Nov 2006 23:12:40 +0000
- To: public-ws-desc-eds@w3.org
Update of /sources/public/2002/ws/desc/test-suite/xmlcatalog/wsdl In directory hutz:/tmp/cvs-serv32428/test-suite/xmlcatalog/wsdl Modified Files: wsdl20-instance.xsd wsdl20.xsd wsdl20-http.xsd wsdl20-rpc.xsd wsdl20-soap.xsd wsdl20-extensions.xsd Log Message: Corrected errors in the WSDL 2.0 schemas for soap and http. Corrected multiple errors in test cases. Eliminated documents/bad/RPC-16B since it failed schema validation. Index: wsdl20-instance.xsd =================================================================== RCS file: /sources/public/2002/ws/desc/test-suite/xmlcatalog/wsdl/wsdl20-instance.xsd,v retrieving revision 1.4 retrieving revision 1.5 diff -C 2 -d -r1.4 -r1.5 *** wsdl20-instance.xsd 25 Jan 2006 18:32:46 -0000 1.4 --- wsdl20-instance.xsd 11 Nov 2006 23:12:38 -0000 1.5 *************** *** 1,4 **** ! <?xml version='1.0' encoding='UTF-8'?> ! <!-- W3C XML Schema defined in the Web Services Description (WSDL) Version 2.0 specification --- 1,3 ---- ! <?xml version="1.0" encoding="UTF-8"?><!-- W3C XML Schema defined in the Web Services Description (WSDL) Version 2.0 specification *************** *** 16,27 **** $Id$ ! --> ! ! <xs:schema xmlns:xs='http://www.w3.org/2001/XMLSchema' ! targetNamespace='http://www.w3.org/2006/01/wsdl-instance' ! xmlns:wsdli='http://www.w3.org/2006/01/wsdl-instance' ! elementFormDefault='qualified' ! xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ! xsi:schemaLocation="http://www.w3.org/2001/XMLSchema ../xsd/XMLSchema.xsd"> <xs:attribute name="wsdlLocation"> --- 15,19 ---- $Id$ ! --><xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance" targetNamespace="http://www.w3.org/2006/01/wsdl-instance" elementFormDefault="qualified" finalDefault="" blockDefault="" attributeFormDefault="unqualified"> <xs:attribute name="wsdlLocation"> *************** *** 38,40 **** </xs:attribute> ! </xs:schema> --- 30,32 ---- </xs:attribute> ! </xs:schema> \ No newline at end of file Index: wsdl20-http.xsd =================================================================== RCS file: /sources/public/2002/ws/desc/test-suite/xmlcatalog/wsdl/wsdl20-http.xsd,v retrieving revision 1.3 retrieving revision 1.4 diff -C 2 -d -r1.3 -r1.4 *** wsdl20-http.xsd 9 May 2006 00:51:29 -0000 1.3 --- wsdl20-http.xsd 11 Nov 2006 23:12:38 -0000 1.4 *************** *** 1,4 **** ! <?xml version='1.0' encoding='UTF-8'?> ! <!-- W3C XML Schema defined in the Web Services Description (WSDL) Version 2.0 Part 2: Adjuncts specification --- 1,3 ---- ! <?xml version="1.0" encoding="UTF-8"?><!-- W3C XML Schema defined in the Web Services Description (WSDL) Version 2.0 Part 2: Adjuncts specification *************** *** 16,38 **** $Id$ ! --> ! ! <xs:schema xmlns:xs='http://www.w3.org/2001/XMLSchema' ! targetNamespace='http://www.w3.org/2006/01/wsdl/http' ! xmlns:wsdl='http://www.w3.org/2006/01/wsdl' ! xmlns:whttp='http://www.w3.org/2006/01/wsdl/http' ! attributeFormDefault='qualified' ! xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ! xsi:schemaLocation="http://www.w3.org/2001/XMLSchema ../xsd/XMLSchema.xsd"> ! <xs:import namespace='http://www.w3.org/2006/01/wsdl' ! schemaLocation="wsdl20.xsd" /> ! <xs:attribute name='methodDefault' type='xs:string'/> ! <xs:attribute name='method' type='xs:string'/> ! <xs:attribute name='version' type='whttp:versionType'/> ! <xs:attribute name='location' type='xs:anyURI'/> <xs:attribute name="code"> --- 15,28 ---- $Id$ ! --><xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:wsdl="http://www.w3.org/2006/01/wsdl" xmlns:whttp="http://www.w3.org/2006/01/wsdl/http" targetNamespace="http://www.w3.org/2006/01/wsdl/http" elementFormDefault="qualified" attributeFormDefault="unqualified" finalDefault="" blockDefault=""> ! <xs:import namespace="http://www.w3.org/2006/01/wsdl" schemaLocation="wsdl20.xsd"/> ! <xs:attribute name="methodDefault" type="xs:string"/> ! <xs:attribute name="method" type="xs:string"/> ! <xs:attribute name="version" type="whttp:versionType"/> ! <xs:attribute name="location" type="xs:anyURI"/> <xs:attribute name="code"> *************** *** 48,63 **** </xs:attribute> ! <xs:attribute name='inputSerialization' type='xs:string'/> ! <xs:attribute name='outputSerialization' type='xs:string'/> ! <xs:attribute name='faultSerialization' type='xs:string'/> ! <xs:attribute name='queryParameterSeparatorDefault' type='xs:string'/> ! <xs:attribute name='defaultTransferCoding' type='xs:string'/> ! <xs:attribute name='transferCoding' type='xs:string'/> ! <xs:attribute name='cookies' type='xs:boolean'/> ! <xs:attribute name='authenticationType'> <xs:simpleType> <xs:restriction base="xs:token"> --- 38,62 ---- </xs:attribute> ! <xs:attribute name="inputSerialization" type="xs:string"/> ! <xs:attribute name="outputSerialization" type="xs:string"/> ! <xs:attribute name="faultSerialization" type="xs:string"/> ! <xs:attribute name="ignoreUncited" type="xs:boolean"/> ! <xs:simpleType name="queryParameterType"> ! <xs:restriction base="xs:string"> ! <xs:length value="1"/> ! </xs:restriction> ! </xs:simpleType> ! <xs:attribute name="queryParameterSeparatorDefault" type="whttp:queryParameterType"/> ! <xs:attribute name="queryParameterSeparator" type="whttp:queryParameterType"/> ! <xs:attribute name="defaultTransferCoding" type="xs:string"/> ! <xs:attribute name="transferCoding" type="xs:string"/> ! ! <xs:attribute name="cookies" type="xs:boolean"/> ! ! <xs:attribute name="authenticationType"> <xs:simpleType> <xs:restriction base="xs:token"> *************** *** 67,71 **** </xs:simpleType> </xs:attribute> ! <xs:attribute name='authenticationRealm' type='xs:string'/> <xs:simpleType name="versionType"> --- 66,70 ---- </xs:simpleType> </xs:attribute> ! <xs:attribute name="authenticationRealm" type="xs:string"/> <xs:simpleType name="versionType"> *************** *** 82,91 **** <xs:element name="header"> ! <xs:complexType> <xs:complexContent> ! <xs:extension base='wsdl:ExtensibleDocumentedType' > <xs:attribute name="name" type="whttp:httpTokenType" use="required"/> ! <xs:attribute name="type" type="xs:QName" use="required" /> ! <xs:attribute name="required" type="xs:boolean" /> </xs:extension> </xs:complexContent> --- 81,90 ---- <xs:element name="header"> ! <xs:complexType mixed="false"> <xs:complexContent> ! <xs:extension base="wsdl:ExtensibleDocumentedType"> <xs:attribute name="name" type="whttp:httpTokenType" use="required"/> ! <xs:attribute name="type" type="xs:QName" use="required"/> ! <xs:attribute name="required" type="xs:boolean"/> </xs:extension> </xs:complexContent> *************** *** 93,95 **** </xs:element> ! </xs:schema> --- 92,94 ---- </xs:element> ! </xs:schema> \ No newline at end of file Index: wsdl20-rpc.xsd =================================================================== RCS file: /sources/public/2002/ws/desc/test-suite/xmlcatalog/wsdl/wsdl20-rpc.xsd,v retrieving revision 1.5 retrieving revision 1.6 diff -C 2 -d -r1.5 -r1.6 *** wsdl20-rpc.xsd 25 Jan 2006 18:32:46 -0000 1.5 --- wsdl20-rpc.xsd 11 Nov 2006 23:12:38 -0000 1.6 *************** *** 1,4 **** ! <?xml version='1.0' encoding='UTF-8'?> ! <!-- W3C XML Schema defined in the Web Services Description (WSDL) Version 2.0 Adjuncts specification --- 1,3 ---- ! <?xml version="1.0" encoding="UTF-8"?><!-- W3C XML Schema defined in the Web Services Description (WSDL) Version 2.0 Adjuncts specification *************** *** 16,27 **** $Id$ ! --> ! ! <xs:schema xmlns:xs='http://www.w3.org/2001/XMLSchema' ! targetNamespace="http://www.w3.org/2006/01/wsdl/rpc" ! xmlns:wrpc="http://www.w3.org/2006/01/wsdl/rpc" ! elementFormDefault='qualified' ! xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ! xsi:schemaLocation="http://www.w3.org/2001/XMLSchema ../xsd/XMLSchema.xsd"> <xs:attribute name="signature" type="wrpc:signatureType"> --- 15,19 ---- $Id$ ! --><xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:wrpc="http://www.w3.org/2006/01/wsdl/rpc" targetNamespace="http://www.w3.org/2006/01/wsdl/rpc" elementFormDefault="qualified" finalDefault="" blockDefault="" attributeFormDefault="unqualified"> <xs:attribute name="signature" type="wrpc:signatureType"> *************** *** 36,54 **** <xs:simpleType name="signatureType"> ! <xs:list itemType="wrpc:signatureItemType" /> </xs:simpleType> <xs:simpleType name="signatureItemType"> ! <xs:union memberTypes="xs:QName wrpc:directionToken" /> </xs:simpleType> <xs:simpleType name="directionToken"> <xs:restriction base="xs:token"> ! <xs:enumeration value="#in" /> ! <xs:enumeration value="#out" /> ! <xs:enumeration value="#inout" /> ! <xs:enumeration value="#return" /> </xs:restriction> </xs:simpleType> ! </xs:schema> --- 28,46 ---- <xs:simpleType name="signatureType"> ! <xs:list itemType="wrpc:signatureItemType"/> </xs:simpleType> <xs:simpleType name="signatureItemType"> ! <xs:union memberTypes="xs:QName wrpc:directionToken"/> </xs:simpleType> <xs:simpleType name="directionToken"> <xs:restriction base="xs:token"> ! <xs:enumeration value="#in"/> ! <xs:enumeration value="#out"/> ! <xs:enumeration value="#inout"/> ! <xs:enumeration value="#return"/> </xs:restriction> </xs:simpleType> ! </xs:schema> \ No newline at end of file Index: wsdl20-soap.xsd =================================================================== RCS file: /sources/public/2002/ws/desc/test-suite/xmlcatalog/wsdl/wsdl20-soap.xsd,v retrieving revision 1.6 retrieving revision 1.7 diff -C 2 -d -r1.6 -r1.7 *** wsdl20-soap.xsd 25 Jan 2006 18:32:46 -0000 1.6 --- wsdl20-soap.xsd 11 Nov 2006 23:12:38 -0000 1.7 *************** *** 1,4 **** ! <?xml version="1.0" encoding="UTF-8"?> ! <!-- W3C XML Schema defined in the Web Services Description Language (WSDL) Version 2.0 Part 2: Adjuncts specification --- 1,3 ---- ! <?xml version="1.0" encoding="UTF-8"?><!-- W3C XML Schema defined in the Web Services Description Language (WSDL) Version 2.0 Part 2: Adjuncts specification *************** *** 16,51 **** $Id$ ! --> ! ! <xs:schema xmlns:xs='http://www.w3.org/2001/XMLSchema' ! targetNamespace="http://www.w3.org/2006/01/wsdl/soap" ! xmlns:wsoap="http://www.w3.org/2006/01/wsdl/soap" ! xmlns:wsdl="http://www.w3.org/2006/01/wsdl" ! elementFormDefault="qualified" attributeFormDefault="unqualified" ! xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ! xsi:schemaLocation="http://www.w3.org/2001/XMLSchema ../xsd/XMLSchema.xsd"> ! <xs:import namespace="http://www.w3.org/2006/01/wsdl" ! schemaLocation="wsdl20.xsd" /> ! <xs:attribute name="version" type="xs:string" /> ! <xs:attribute name="protocol" type="xs:anyURI" /> ! <xs:attribute name="mepDefault" type="xs:anyURI" /> ! <xs:attribute name="mep" type="xs:anyURI" /> ! <xs:attribute name="action" type="xs:anyURI" /> <xs:element name="module"> ! <xs:complexType> <xs:complexContent> ! <xs:extension base='wsdl:ExtensibleDocumentedType'> <xs:sequence> ! <xs:element ref="wsdl:property" minOccurs="0" ! maxOccurs='unbounded' /> </xs:sequence> ! <xs:attribute name="uri" type="xs:anyURI" ! use="required" /> ! <xs:attribute name="required" type="xs:boolean" /> </xs:extension> </xs:complexContent> --- 15,39 ---- $Id$ ! --><xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:wsoap="http://www.w3.org/2006/01/wsdl/soap" xmlns:wsdl="http://www.w3.org/2006/01/wsdl" targetNamespace="http://www.w3.org/2006/01/wsdl/soap" elementFormDefault="qualified" attributeFormDefault="unqualified" finalDefault="" blockDefault=""> ! <xs:import namespace="http://www.w3.org/2006/01/wsdl" schemaLocation="wsdl20.xsd"/> ! <xs:attribute name="version" type="xs:string"/> ! <xs:attribute name="protocol" type="xs:anyURI"/> ! <xs:attribute name="mepDefault" type="xs:anyURI"/> ! <xs:attribute name="mep" type="xs:anyURI"/> ! <xs:attribute name="action" type="xs:anyURI"/> <xs:element name="module"> ! <xs:complexType mixed="false"> <xs:complexContent> ! <xs:extension base="wsdl:ExtensibleDocumentedType"> <xs:sequence> ! <xs:element ref="wsdl:property" minOccurs="0" maxOccurs="unbounded"/> </xs:sequence> ! <xs:attribute name="ref" type="xs:anyURI" use="required"/> ! <xs:attribute name="required" type="xs:boolean"/> </xs:extension> </xs:complexContent> *************** *** 54,65 **** <xs:element name="header"> ! <xs:complexType> <xs:complexContent> ! <xs:extension base='wsdl:ExtensibleDocumentedType'> ! <xs:attribute name="element" type="xs:QName" ! use="required" /> ! <xs:attribute name="mustUnderstand" ! type="xs:boolean" /> ! <xs:attribute name="required" type="xs:boolean" /> </xs:extension> </xs:complexContent> --- 42,51 ---- <xs:element name="header"> ! <xs:complexType mixed="false"> <xs:complexContent> ! <xs:extension base="wsdl:ExtensibleDocumentedType"> ! <xs:attribute name="element" type="xs:QName" use="required"/> ! <xs:attribute name="mustUnderstand" type="xs:boolean"/> ! <xs:attribute name="required" type="xs:boolean"/> </xs:extension> </xs:complexContent> *************** *** 83,87 **** <xs:union memberTypes="wsoap:TokenAny"> <xs:simpleType> ! <xs:list itemType="xs:QName" /> </xs:simpleType> </xs:union> --- 69,73 ---- <xs:union memberTypes="wsoap:TokenAny"> <xs:simpleType> ! <xs:list itemType="xs:QName"/> </xs:simpleType> </xs:union> *************** *** 89,91 **** </xs:attribute> ! </xs:schema> --- 75,77 ---- </xs:attribute> ! </xs:schema> \ No newline at end of file Index: wsdl20-extensions.xsd =================================================================== RCS file: /sources/public/2002/ws/desc/test-suite/xmlcatalog/wsdl/wsdl20-extensions.xsd,v retrieving revision 1.3 retrieving revision 1.4 diff -C 2 -d -r1.3 -r1.4 *** wsdl20-extensions.xsd 25 Jan 2006 18:32:46 -0000 1.3 --- wsdl20-extensions.xsd 11 Nov 2006 23:12:38 -0000 1.4 *************** *** 1,4 **** ! <?xml version='1.0' encoding='UTF-8'?> ! <!-- W3C XML Schema defined in the Web Services Description (WSDL) Version 2.0 specifications --- 1,3 ---- ! <?xml version="1.0" encoding="UTF-8"?><!-- W3C XML Schema defined in the Web Services Description (WSDL) Version 2.0 specifications *************** *** 17,31 **** $Id$ ! --> ! ! <xs:schema xmlns:xs='http://www.w3.org/2001/XMLSchema' ! targetNamespace='http://www.w3.org/2006/01/wsdl-extensions' ! xmlns:wsdlx="http://www.w3.org/2006/01/wsdl-extensions" ! attributeFormDefault="qualified" ! elementFormDefault='qualified' ! xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ! xsi:schemaLocation="http://www.w3.org/2001/XMLSchema ../xsd/XMLSchema.xsd"> ! <xs:attribute name='safe' type="xs:boolean"> <xs:annotation> <xs:documentation> --- 16,22 ---- $Id$ ! --><xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:wsdlx="http://www.w3.org/2006/01/wsdl-extensions" targetNamespace="http://www.w3.org/2006/01/wsdl-extensions" attributeFormDefault="qualified" elementFormDefault="qualified" finalDefault="" blockDefault=""> ! <xs:attribute name="safe" type="xs:boolean"> <xs:annotation> <xs:documentation> *************** *** 57,59 **** </xs:attribute> ! </xs:schema> --- 48,50 ---- </xs:attribute> ! </xs:schema> \ No newline at end of file Index: wsdl20.xsd =================================================================== RCS file: /sources/public/2002/ws/desc/test-suite/xmlcatalog/wsdl/wsdl20.xsd,v retrieving revision 1.11 retrieving revision 1.12 diff -C 2 -d -r1.11 -r1.12 *** wsdl20.xsd 8 May 2006 23:52:18 -0000 1.11 --- wsdl20.xsd 11 Nov 2006 23:12:38 -0000 1.12 *************** *** 1,4 **** ! <?xml version='1.0' encoding='UTF-8'?> ! <!-- W3C XML Schema defined in the Web Services Description (WSDL) Version 2.0 specification --- 1,3 ---- ! <?xml version="1.0" encoding="UTF-8"?><!-- W3C XML Schema defined in the Web Services Description (WSDL) Version 2.0 specification *************** *** 16,35 **** $Id$ ! --> ! ! ! <xs:schema xmlns:xs='http://www.w3.org/2001/XMLSchema' ! targetNamespace='http://www.w3.org/2006/01/wsdl' ! elementFormDefault='qualified' xmlns:wsdl='http://www.w3.org/2006/01/wsdl'> ! <xs:element name='documentation' type='wsdl:DocumentationType' /> ! <xs:complexType name='DocumentationType' mixed='true' > <xs:sequence> ! <xs:any processContents='lax' minOccurs='0' maxOccurs='unbounded' /> </xs:sequence> ! <xs:anyAttribute namespace='##other' processContents='lax' /> </xs:complexType> ! <xs:complexType name='DocumentedType' > <xs:annotation> <xs:documentation> --- 15,29 ---- $Id$ ! --><xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:wsdl="http://www.w3.org/2006/01/wsdl" targetNamespace="http://www.w3.org/2006/01/wsdl" elementFormDefault="qualified" finalDefault="" blockDefault="" attributeFormDefault="unqualified"> ! <xs:element name="documentation" type="wsdl:DocumentationType"/> ! <xs:complexType name="DocumentationType" mixed="true"> <xs:sequence> ! <xs:any processContents="lax" minOccurs="0" maxOccurs="unbounded" namespace="##any"/> </xs:sequence> ! <xs:anyAttribute namespace="##other" processContents="lax"/> </xs:complexType> ! <xs:complexType name="DocumentedType" mixed="false"> <xs:annotation> <xs:documentation> *************** *** 38,46 **** </xs:annotation> <xs:sequence> ! <xs:element ref='wsdl:documentation' minOccurs='0' maxOccurs="unbounded"/> </xs:sequence> </xs:complexType> ! <xs:complexType name='ExtensibleDocumentedType' abstract='true' > <xs:annotation> <xs:documentation> --- 32,40 ---- </xs:annotation> <xs:sequence> ! <xs:element ref="wsdl:documentation" minOccurs="0" maxOccurs="unbounded"/> </xs:sequence> </xs:complexType> ! <xs:complexType name="ExtensibleDocumentedType" abstract="true" mixed="false"> <xs:annotation> <xs:documentation> *************** *** 50,55 **** </xs:annotation> <xs:complexContent> ! <xs:extension base='wsdl:DocumentedType' > ! <xs:anyAttribute namespace='##other' processContents='lax' /> </xs:extension> </xs:complexContent> --- 44,49 ---- </xs:annotation> <xs:complexContent> ! <xs:extension base="wsdl:DocumentedType"> ! <xs:anyAttribute namespace="##other" processContents="lax"/> </xs:extension> </xs:complexContent> *************** *** 57,76 **** <!-- description element decl and type def --> ! <xs:element name='description' type='wsdl:DescriptionType' > ! <xs:unique name='interface' > ! <xs:selector xpath='wsdl:interface' /> ! <xs:field xpath='@name' /> </xs:unique> ! <xs:unique name='binding' > ! <xs:selector xpath='wsdl:binding' /> ! <xs:field xpath='@name' /> </xs:unique> ! <xs:unique name='service' > ! <xs:selector xpath='wsdl:service' /> ! <xs:field xpath='@name' /> </xs:unique> </xs:element> ! <xs:complexType name='DescriptionType' > <xs:annotation> <xs:documentation> --- 51,70 ---- <!-- description element decl and type def --> ! <xs:element name="description" type="wsdl:DescriptionType"> ! <xs:unique name="interface"> ! <xs:selector xpath="wsdl:interface"/> ! <xs:field xpath="@name"/> </xs:unique> ! <xs:unique name="binding"> ! <xs:selector xpath="wsdl:binding"/> ! <xs:field xpath="@name"/> </xs:unique> ! <xs:unique name="service"> ! <xs:selector xpath="wsdl:service"/> ! <xs:field xpath="@name"/> </xs:unique> </xs:element> ! <xs:complexType name="DescriptionType" mixed="false"> <xs:annotation> <xs:documentation> *************** *** 90,104 **** </xs:annotation> <xs:complexContent> ! <xs:extension base='wsdl:ExtensibleDocumentedType' > ! <xs:choice minOccurs='0' maxOccurs='unbounded' > ! <xs:element ref='wsdl:import' /> ! <xs:element ref='wsdl:include' /> ! <xs:element ref='wsdl:types'/> ! <xs:element ref='wsdl:interface' /> ! <xs:element ref='wsdl:binding' /> ! <xs:element ref='wsdl:service' /> ! <xs:any namespace='##other' processContents='lax' /> </xs:choice> ! <xs:attribute name='targetNamespace' type='xs:anyURI' use='required' /> </xs:extension> </xs:complexContent> --- 84,98 ---- </xs:annotation> <xs:complexContent> ! <xs:extension base="wsdl:ExtensibleDocumentedType"> ! <xs:choice minOccurs="0" maxOccurs="unbounded"> ! <xs:element ref="wsdl:import"/> ! <xs:element ref="wsdl:include"/> ! <xs:element ref="wsdl:types"/> ! <xs:element ref="wsdl:interface"/> ! <xs:element ref="wsdl:binding"/> ! <xs:element ref="wsdl:service"/> ! <xs:any namespace="##other" processContents="lax" minOccurs="1" maxOccurs="1"/> </xs:choice> ! <xs:attribute name="targetNamespace" type="xs:anyURI" use="required"/> </xs:extension> </xs:complexContent> *************** *** 106,134 **** <!-- types for import and include elements --> ! <xs:element name='import' type='wsdl:ImportType' /> ! <xs:complexType name='ImportType' > <xs:complexContent> ! <xs:extension base='wsdl:ExtensibleDocumentedType' > ! <xs:attribute name='namespace' type='xs:anyURI' use='required' /> ! <xs:attribute name='location' type='xs:anyURI' use='optional' /> </xs:extension> </xs:complexContent> </xs:complexType> ! <xs:element name='include' type='wsdl:IncludeType' /> ! <xs:complexType name='IncludeType' > <xs:complexContent> ! <xs:extension base='wsdl:ExtensibleDocumentedType' > ! <xs:attribute name='location' type='xs:anyURI' use='required' /> </xs:extension> </xs:complexContent> </xs:complexType> ! <xs:element name='types' type='wsdl:TypesType' /> ! <xs:complexType name='TypesType' > <xs:complexContent> ! <xs:extension base='wsdl:ExtensibleDocumentedType' > <xs:sequence> ! <xs:any namespace='##other' minOccurs='0' maxOccurs='unbounded' /> </xs:sequence> </xs:extension> --- 100,134 ---- <!-- types for import and include elements --> ! <xs:element name="import" type="wsdl:ImportType"/> ! <xs:complexType name="ImportType" mixed="false"> <xs:complexContent> ! <xs:extension base="wsdl:ExtensibleDocumentedType"> ! <xs:sequence> ! <xs:any namespace="##other" minOccurs="0" maxOccurs="unbounded" processContents="strict"/> ! </xs:sequence> ! <xs:attribute name="namespace" type="xs:anyURI" use="required"/> ! <xs:attribute name="location" type="xs:anyURI" use="optional"/> </xs:extension> </xs:complexContent> </xs:complexType> ! <xs:element name="include" type="wsdl:IncludeType"/> ! <xs:complexType name="IncludeType" mixed="false"> <xs:complexContent> ! <xs:extension base="wsdl:ExtensibleDocumentedType"> ! <xs:sequence> ! <xs:any namespace="##other" minOccurs="0" maxOccurs="unbounded" processContents="strict"/> ! </xs:sequence> ! <xs:attribute name="location" type="xs:anyURI" use="required"/> </xs:extension> </xs:complexContent> </xs:complexType> ! <xs:element name="types" type="wsdl:TypesType"/> ! <xs:complexType name="TypesType" mixed="false"> <xs:complexContent> ! <xs:extension base="wsdl:ExtensibleDocumentedType"> <xs:sequence> ! <xs:any namespace="##other" minOccurs="0" maxOccurs="unbounded" processContents="strict"/> </xs:sequence> </xs:extension> *************** *** 137,169 **** <!-- parts related to wsdl:interface --> ! <xs:element name='interface' type='wsdl:InterfaceType' > ! <xs:unique name='operation' > ! <xs:selector xpath='wsdl:operation' /> ! <xs:field xpath='@name' /> </xs:unique> ! <xs:unique name='fault' > ! <xs:selector xpath='wsdl:fault' /> ! <xs:field xpath='@name' /> </xs:unique> </xs:element> ! <xs:complexType name='InterfaceType' > <xs:complexContent> ! <xs:extension base='wsdl:ExtensibleDocumentedType' > ! <xs:choice minOccurs='0' maxOccurs='unbounded' > ! <xs:element name='operation' type='wsdl:InterfaceOperationType' /> ! <xs:element name='fault' type='wsdl:InterfaceFaultType' /> ! <xs:element ref='wsdl:feature' /> ! <xs:element ref='wsdl:property' /> ! <xs:any namespace='##other' processContents='lax' /> </xs:choice> ! <xs:attribute name='name' type='xs:NCName' use='required' /> ! <xs:attribute name='extends' use='optional' > <xs:simpleType> ! <xs:list itemType='xs:QName' /> </xs:simpleType> </xs:attribute> ! <xs:attribute name='styleDefault' use='optional'> <xs:simpleType> ! <xs:list itemType='xs:anyURI' /> </xs:simpleType> </xs:attribute> --- 137,169 ---- <!-- parts related to wsdl:interface --> ! <xs:element name="interface" type="wsdl:InterfaceType"> ! <xs:unique name="operation"> ! <xs:selector xpath="wsdl:operation"/> ! <xs:field xpath="@name"/> </xs:unique> ! <xs:unique name="fault"> ! <xs:selector xpath="wsdl:fault"/> ! <xs:field xpath="@name"/> </xs:unique> </xs:element> ! <xs:complexType name="InterfaceType" mixed="false"> <xs:complexContent> ! <xs:extension base="wsdl:ExtensibleDocumentedType"> ! <xs:choice minOccurs="0" maxOccurs="unbounded"> ! <xs:element name="operation" type="wsdl:InterfaceOperationType"/> ! <xs:element name="fault" type="wsdl:InterfaceFaultType"/> ! <xs:element ref="wsdl:feature"/> ! <xs:element ref="wsdl:property"/> ! <xs:any namespace="##other" processContents="lax" minOccurs="1" maxOccurs="1"/> </xs:choice> ! <xs:attribute name="name" type="xs:NCName" use="required"/> ! <xs:attribute name="extends" use="optional"> <xs:simpleType> ! <xs:list itemType="xs:QName"/> </xs:simpleType> </xs:attribute> ! <xs:attribute name="styleDefault" use="optional"> <xs:simpleType> ! <xs:list itemType="xs:anyURI"/> </xs:simpleType> </xs:attribute> *************** *** 172,204 **** </xs:complexType> ! <xs:complexType name='InterfaceOperationType' > <xs:complexContent> ! <xs:extension base='wsdl:ExtensibleDocumentedType' > ! <xs:choice minOccurs='0' maxOccurs='unbounded' > ! <xs:element name='input' type='wsdl:MessageRefType' /> ! <xs:element name='output' type='wsdl:MessageRefType' /> ! <xs:element name='infault' type='wsdl:MessageRefFaultType' /> ! <xs:element name='outfault' type='wsdl:MessageRefFaultType' /> ! <xs:element ref='wsdl:feature' /> ! <xs:element ref='wsdl:property' /> ! <xs:any namespace='##other' processContents='lax' /> </xs:choice> ! <xs:attribute name='name' type='xs:NCName' use='required' /> ! <xs:attribute name='pattern' type='xs:anyURI' use='required' /> ! <xs:attribute name='style' type='xs:anyURI' use='optional' /> </xs:extension> </xs:complexContent> </xs:complexType> ! <xs:complexType name='MessageRefType' > <xs:complexContent> ! <xs:extension base='wsdl:ExtensibleDocumentedType' > ! <xs:choice minOccurs='0' maxOccurs='unbounded' > ! <xs:element ref='wsdl:feature' /> ! <xs:element ref='wsdl:property' /> ! <xs:any namespace='##other' processContents='lax' /> </xs:choice> ! <xs:attribute name='messageLabel' type='xs:NCName' use='optional' /> ! <xs:attribute name='element' type='wsdl:ElementReferenceType' use='optional' /> </xs:extension> </xs:complexContent> --- 172,205 ---- </xs:complexType> ! <xs:complexType name="InterfaceOperationType" mixed="false"> <xs:complexContent> ! <xs:extension base="wsdl:ExtensibleDocumentedType"> ! <xs:choice minOccurs="0" maxOccurs="unbounded"> ! <xs:element name="input" type="wsdl:MessageRefType"/> ! <xs:element name="output" type="wsdl:MessageRefType"/> ! <xs:element name="infault" type="wsdl:MessageRefFaultType"/> ! <xs:element name="outfault" type="wsdl:MessageRefFaultType"/> ! <xs:element ref="wsdl:feature"/> ! <xs:element ref="wsdl:property"/> ! <xs:any namespace="##other" processContents="lax" minOccurs="1" maxOccurs="1"/> </xs:choice> ! <xs:attribute name="name" type="xs:NCName" use="required"/> ! <xs:attribute name="pattern" type="xs:anyURI" use="required"/> ! <xs:attribute name="safe" type="xs:boolean" use="optional"/> ! <xs:attribute name="style" type="xs:anyURI" use="optional"/> </xs:extension> </xs:complexContent> </xs:complexType> ! <xs:complexType name="MessageRefType" mixed="false"> <xs:complexContent> ! <xs:extension base="wsdl:ExtensibleDocumentedType"> ! <xs:choice minOccurs="0" maxOccurs="unbounded"> ! <xs:element ref="wsdl:feature"/> ! <xs:element ref="wsdl:property"/> ! <xs:any namespace="##other" processContents="lax" minOccurs="1" maxOccurs="1"/> </xs:choice> ! <xs:attribute name="messageLabel" type="xs:NCName" use="optional"/> ! <xs:attribute name="element" type="wsdl:ElementReferenceType" use="optional"/> </xs:extension> </xs:complexContent> *************** *** 225,284 **** </xs:simpleType> ! <xs:complexType name='MessageRefFaultType'> <xs:complexContent> ! <xs:extension base='wsdl:ExtensibleDocumentedType' > ! <xs:choice minOccurs='0' maxOccurs='unbounded' > ! <xs:element ref='wsdl:feature' /> ! <xs:element ref='wsdl:property' /> ! <xs:any namespace='##other' processContents='lax' /> </xs:choice> ! <xs:attribute name='ref' type='xs:QName' use='required' /> ! <xs:attribute name='messageLabel' type='xs:NCName' use='optional' /> </xs:extension> </xs:complexContent> </xs:complexType> ! <xs:complexType name='InterfaceFaultType' > <xs:complexContent> ! <xs:extension base='wsdl:ExtensibleDocumentedType' > ! <xs:choice minOccurs='0' maxOccurs='unbounded' > ! <xs:element ref='wsdl:feature' /> ! <xs:element ref='wsdl:property' /> ! <xs:any namespace='##other' processContents='lax' /> </xs:choice> ! <xs:attribute name='name' type='xs:NCName' use='required' /> ! <xs:attribute name='element' type='xs:QName' use='optional' /> </xs:extension> </xs:complexContent> </xs:complexType> ! <xs:element name='feature' type='wsdl:FeatureType' /> ! <xs:complexType name='FeatureType' > <xs:complexContent> ! <xs:extension base='wsdl:ExtensibleDocumentedType' > ! <xs:choice minOccurs='0' maxOccurs='unbounded' > ! <xs:any namespace='##other' processContents='lax' /> </xs:choice> ! <xs:attribute name='ref' type="xs:anyURI" use='required' /> ! <xs:attribute name='required' type='xs:boolean' use='optional' /> </xs:extension> </xs:complexContent> </xs:complexType> ! <xs:element name='property' type='wsdl:PropertyType' /> ! <xs:complexType name='PropertyType' > <xs:complexContent> ! <xs:extension base='wsdl:ExtensibleDocumentedType' > <xs:sequence> <xs:choice minOccurs="0"> ! <xs:element name='value'/> ! <xs:element name='constraint' type='xs:QName' /> </xs:choice> ! <xs:any namespace='##other' ! processContents='lax' ! minOccurs='0' ! maxOccurs='unbounded' /> </xs:sequence> ! <xs:attribute name='ref' type="xs:anyURI" use='required' /> </xs:extension> </xs:complexContent> --- 226,282 ---- </xs:simpleType> ! <xs:complexType name="MessageRefFaultType" mixed="false"> <xs:complexContent> ! <xs:extension base="wsdl:ExtensibleDocumentedType"> ! <xs:choice minOccurs="0" maxOccurs="unbounded"> ! <xs:element ref="wsdl:feature"/> ! <xs:element ref="wsdl:property"/> ! <xs:any namespace="##other" processContents="lax" minOccurs="1" maxOccurs="1"/> </xs:choice> ! <xs:attribute name="ref" type="xs:QName" use="required"/> ! <xs:attribute name="messageLabel" type="xs:NCName" use="optional"/> </xs:extension> </xs:complexContent> </xs:complexType> ! <xs:complexType name="InterfaceFaultType" mixed="false"> <xs:complexContent> ! <xs:extension base="wsdl:ExtensibleDocumentedType"> ! <xs:choice minOccurs="0" maxOccurs="unbounded"> ! <xs:element ref="wsdl:feature"/> ! <xs:element ref="wsdl:property"/> ! <xs:any namespace="##other" processContents="lax" minOccurs="1" maxOccurs="1"/> </xs:choice> ! <xs:attribute name="name" type="xs:NCName" use="required"/> ! <xs:attribute name="element" type="xs:QName" use="optional"/> </xs:extension> </xs:complexContent> </xs:complexType> ! <xs:element name="feature" type="wsdl:FeatureType"/> ! <xs:complexType name="FeatureType" mixed="false"> <xs:complexContent> ! <xs:extension base="wsdl:ExtensibleDocumentedType"> ! <xs:choice minOccurs="0" maxOccurs="unbounded"> ! <xs:any namespace="##other" processContents="lax" minOccurs="1" maxOccurs="1"/> </xs:choice> ! <xs:attribute name="ref" type="xs:anyURI" use="required"/> ! <xs:attribute name="required" type="xs:boolean" use="optional"/> </xs:extension> </xs:complexContent> </xs:complexType> ! <xs:element name="property" type="wsdl:PropertyType"/> ! <xs:complexType name="PropertyType" mixed="false"> <xs:complexContent> ! <xs:extension base="wsdl:ExtensibleDocumentedType"> <xs:sequence> <xs:choice minOccurs="0"> ! <xs:element name="value" type="xs:anyType"/> ! <xs:element name="constraint" type="xs:QName"/> </xs:choice> ! <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/> </xs:sequence> ! <xs:attribute name="ref" type="xs:anyURI" use="required"/> </xs:extension> </xs:complexContent> *************** *** 286,360 **** <!-- types related to wsdl:binding --> ! <xs:element name='binding' type='wsdl:BindingType' /> ! <xs:complexType name='BindingType' > <xs:complexContent> ! <xs:extension base='wsdl:ExtensibleDocumentedType' > ! <xs:choice minOccurs='0' maxOccurs='unbounded' > ! <xs:element name='operation' type='wsdl:BindingOperationType' /> ! <xs:element name='fault' type='wsdl:BindingFaultType' /> ! <xs:element ref='wsdl:feature' /> ! <xs:element ref='wsdl:property' /> ! <xs:any namespace='##other' processContents='lax' /> </xs:choice> ! <xs:attribute name='name' type='xs:NCName' use='required' /> ! <xs:attribute name='type' type='xs:anyURI' use='required' /> ! <xs:attribute name='interface' type='xs:QName' use='optional' /> </xs:extension> </xs:complexContent> </xs:complexType> ! <xs:complexType name='BindingOperationType' > <xs:complexContent> ! <xs:extension base='wsdl:ExtensibleDocumentedType' > ! <xs:choice minOccurs='0' maxOccurs='unbounded' > ! <xs:element name='input' type='wsdl:BindingOperationMessageType' /> ! <xs:element name='output' type='wsdl:BindingOperationMessageType' /> ! <xs:element name='infault' type='wsdl:BindingOperationFaultType' /> ! <xs:element name='outfault' type='wsdl:BindingOperationFaultType' /> ! <xs:element ref='wsdl:feature' /> ! <xs:element ref='wsdl:property' /> ! <xs:any namespace='##other' processContents='lax' /> </xs:choice> ! <xs:attribute name='ref' type='xs:QName' use='required' /> </xs:extension> </xs:complexContent> </xs:complexType> ! <xs:complexType name='BindingOperationMessageType' > <xs:complexContent> ! <xs:extension base='wsdl:ExtensibleDocumentedType' > ! <xs:choice minOccurs='0' maxOccurs='unbounded' > ! <xs:element ref='wsdl:feature' /> ! <xs:element ref='wsdl:property' /> ! <xs:any namespace='##other' processContents='lax' /> </xs:choice> ! <xs:attribute name='messageLabel' type='xs:NCName' use='optional' /> </xs:extension> </xs:complexContent> </xs:complexType> ! <xs:complexType name='BindingOperationFaultType'> <xs:complexContent> ! <xs:extension base='wsdl:ExtensibleDocumentedType' > ! <xs:choice minOccurs='0' maxOccurs='unbounded' > ! <xs:element ref='wsdl:feature' /> ! <xs:element ref='wsdl:property' /> ! <xs:any namespace='##other' processContents='lax' /> </xs:choice> ! <xs:attribute name='ref' type='xs:QName' use='required' /> ! <xs:attribute name='messageLabel' type='xs:NCName' use='optional' /> </xs:extension> </xs:complexContent> </xs:complexType> ! <xs:complexType name='BindingFaultType' > <xs:complexContent> ! <xs:extension base='wsdl:ExtensibleDocumentedType' > ! <xs:choice minOccurs='0' maxOccurs='unbounded' > ! <xs:element ref='wsdl:feature' /> ! <xs:element ref='wsdl:property' /> ! <xs:any namespace='##other' processContents='lax' /> </xs:choice> ! <xs:attribute name='ref' type='xs:QName' use='required' /> </xs:extension> </xs:complexContent> --- 284,358 ---- <!-- types related to wsdl:binding --> ! <xs:element name="binding" type="wsdl:BindingType"/> ! <xs:complexType name="BindingType" mixed="false"> <xs:complexContent> ! <xs:extension base="wsdl:ExtensibleDocumentedType"> ! <xs:choice minOccurs="0" maxOccurs="unbounded"> ! <xs:element name="operation" type="wsdl:BindingOperationType"/> ! <xs:element name="fault" type="wsdl:BindingFaultType"/> ! <xs:element ref="wsdl:feature"/> ! <xs:element ref="wsdl:property"/> ! <xs:any namespace="##other" processContents="lax" minOccurs="1" maxOccurs="1"/> </xs:choice> ! <xs:attribute name="name" type="xs:NCName" use="required"/> ! <xs:attribute name="type" type="xs:anyURI" use="required"/> ! <xs:attribute name="interface" type="xs:QName" use="optional"/> </xs:extension> </xs:complexContent> </xs:complexType> ! <xs:complexType name="BindingOperationType" mixed="false"> <xs:complexContent> ! <xs:extension base="wsdl:ExtensibleDocumentedType"> ! <xs:choice minOccurs="0" maxOccurs="unbounded"> ! <xs:element name="input" type="wsdl:BindingOperationMessageType"/> ! <xs:element name="output" type="wsdl:BindingOperationMessageType"/> ! <xs:element name="infault" type="wsdl:BindingOperationFaultType"/> ! <xs:element name="outfault" type="wsdl:BindingOperationFaultType"/> ! <xs:element ref="wsdl:feature"/> ! <xs:element ref="wsdl:property"/> ! <xs:any namespace="##other" processContents="lax" minOccurs="1" maxOccurs="1"/> </xs:choice> ! <xs:attribute name="ref" type="xs:QName" use="required"/> </xs:extension> </xs:complexContent> </xs:complexType> ! <xs:complexType name="BindingOperationMessageType" mixed="false"> <xs:complexContent> ! <xs:extension base="wsdl:ExtensibleDocumentedType"> ! <xs:choice minOccurs="0" maxOccurs="unbounded"> ! <xs:element ref="wsdl:feature"/> ! <xs:element ref="wsdl:property"/> ! <xs:any namespace="##other" processContents="lax" minOccurs="1" maxOccurs="1"/> </xs:choice> ! <xs:attribute name="messageLabel" type="xs:NCName" use="optional"/> </xs:extension> </xs:complexContent> </xs:complexType> ! <xs:complexType name="BindingOperationFaultType" mixed="false"> <xs:complexContent> ! <xs:extension base="wsdl:ExtensibleDocumentedType"> ! <xs:choice minOccurs="0" maxOccurs="unbounded"> ! <xs:element ref="wsdl:feature"/> ! <xs:element ref="wsdl:property"/> ! <xs:any namespace="##other" processContents="lax" minOccurs="1" maxOccurs="1"/> </xs:choice> ! <xs:attribute name="ref" type="xs:QName" use="required"/> ! <xs:attribute name="messageLabel" type="xs:NCName" use="optional"/> </xs:extension> </xs:complexContent> </xs:complexType> ! <xs:complexType name="BindingFaultType" mixed="false"> <xs:complexContent> ! <xs:extension base="wsdl:ExtensibleDocumentedType"> ! <xs:choice minOccurs="0" maxOccurs="unbounded"> ! <xs:element ref="wsdl:feature"/> ! <xs:element ref="wsdl:property"/> ! <xs:any namespace="##other" processContents="lax" minOccurs="1" maxOccurs="1"/> </xs:choice> ! <xs:attribute name="ref" type="xs:QName" use="required"/> </xs:extension> </xs:complexContent> *************** *** 362,414 **** <!-- types related to service --> ! <xs:element name='service' type='wsdl:ServiceType' > ! <xs:unique name='endpoint' > ! <xs:selector xpath='wsdl:endpoint' /> ! <xs:field xpath='@name' /> </xs:unique> </xs:element> ! <xs:complexType name='ServiceType' > <xs:complexContent> ! <xs:extension base='wsdl:ExtensibleDocumentedType' > ! <xs:choice minOccurs='1' maxOccurs='unbounded' > ! <xs:element ref='wsdl:endpoint' /> ! <xs:element ref='wsdl:feature' /> ! <xs:element ref='wsdl:property' /> ! <xs:any namespace='##other' processContents='lax' /> </xs:choice> ! <xs:attribute name='name' type='xs:NCName' use='required' /> ! <xs:attribute name='interface' type='xs:QName' use='required' /> </xs:extension> </xs:complexContent> </xs:complexType> ! <xs:element name='endpoint' type='wsdl:EndpointType' /> ! <xs:complexType name='EndpointType' > <xs:complexContent> ! <xs:extension base='wsdl:ExtensibleDocumentedType' > ! <xs:choice minOccurs='0' maxOccurs='unbounded' > ! <xs:element ref='wsdl:feature' /> ! <xs:element ref='wsdl:property' /> ! <xs:any namespace='##other' processContents='lax' /> </xs:choice> ! <xs:attribute name='name' type='xs:NCName' use='required' /> ! <xs:attribute name='binding' type='xs:QName' use='required' /> ! <xs:attribute name='address' type='xs:anyURI' use='optional' /> </xs:extension> </xs:complexContent> </xs:complexType> ! <xs:attribute name='required' type='xs:boolean' /> ! <xs:complexType name='ExtensibilityElement' abstract='true' > <xs:annotation> <xs:documentation> This abstract type is intended to serve as the base type for ! extensibility elements. It includes the wsdl:required attribute which it is anticipated will be used by most extension elements </xs:documentation> </xs:annotation> ! <xs:attribute ref='wsdl:required' use='optional' /> </xs:complexType> ! </xs:schema> --- 360,412 ---- <!-- types related to service --> ! <xs:element name="service" type="wsdl:ServiceType"> ! <xs:unique name="endpoint"> ! <xs:selector xpath="wsdl:endpoint"/> ! <xs:field xpath="@name"/> </xs:unique> </xs:element> ! <xs:complexType name="ServiceType" mixed="false"> <xs:complexContent> ! <xs:extension base="wsdl:ExtensibleDocumentedType"> ! <xs:choice minOccurs="1" maxOccurs="unbounded"> ! <xs:element ref="wsdl:endpoint"/> ! <xs:element ref="wsdl:feature"/> ! <xs:element ref="wsdl:property"/> ! <xs:any namespace="##other" processContents="lax" minOccurs="1" maxOccurs="1"/> </xs:choice> ! <xs:attribute name="name" type="xs:NCName" use="required"/> ! <xs:attribute name="interface" type="xs:QName" use="required"/> </xs:extension> </xs:complexContent> </xs:complexType> ! <xs:element name="endpoint" type="wsdl:EndpointType"/> ! <xs:complexType name="EndpointType" mixed="false"> <xs:complexContent> ! <xs:extension base="wsdl:ExtensibleDocumentedType"> ! <xs:choice minOccurs="0" maxOccurs="unbounded"> ! <xs:element ref="wsdl:feature"/> ! <xs:element ref="wsdl:property"/> ! <xs:any namespace="##other" processContents="lax" minOccurs="1" maxOccurs="1"/> </xs:choice> ! <xs:attribute name="name" type="xs:NCName" use="required"/> ! <xs:attribute name="binding" type="xs:QName" use="required"/> ! <xs:attribute name="address" type="xs:anyURI" use="optional"/> </xs:extension> </xs:complexContent> </xs:complexType> ! <xs:attribute name="required" type="xs:boolean"/> ! <xs:complexType name="ExtensionElement" abstract="true" mixed="false"> <xs:annotation> <xs:documentation> This abstract type is intended to serve as the base type for ! extension elements. It includes the wsdl:required attribute which it is anticipated will be used by most extension elements </xs:documentation> </xs:annotation> ! <xs:attribute ref="wsdl:required" use="optional"/> </xs:complexType> ! </xs:schema> \ No newline at end of file
Received on Saturday, 11 November 2006 23:12:51 UTC