- From: Arthur Ryman via cvs-syncmail <cvsmail@w3.org>
- Date: Wed, 09 Nov 2005 19:36:36 +0000
- To: public-ws-desc-eds@w3.org
Update of /sources/public/2002/ws/desc/test-suite/xmlcatalog/wsdl
In directory hutz:/tmp/cvs-serv21427/test-suite/xmlcatalog/wsdl
Modified Files:
wsdl20.xsd wsdl20-extensions.xsd wsdl20-instance.xsd
wsdl20-rpc.xsd wsdl20-soap.xsd
Added Files:
wsdl20-http.xsd
Log Message:
Updated WSDL 2.0 namespaces to 2005/08 version. Begin work on test suite coverage reports.
Index: wsdl20-instance.xsd
===================================================================
RCS file: /sources/public/2002/ws/desc/test-suite/xmlcatalog/wsdl/wsdl20-instance.xsd,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** wsdl20-instance.xsd 1 May 2005 15:04:01 -0000 1.2
--- wsdl20-instance.xsd 9 Nov 2005 19:36:34 -0000 1.3
***************
*** 1,4 ****
<?xml version='1.0' encoding='UTF-8'?>
- <!-- $Id$ -->
<!--
W3C XML Schema defined in the Web Services Description (WSDL)
--- 1,3 ----
***************
*** 6,23 ****
http://www.w3.org/TR/wsdl20
! Copyright (c) 2004 World Wide Web Consortium,
!
(Massachusetts Institute of Technology, European Research Consortium for
Informatics and Mathematics, Keio University). All Rights Reserved. This
! work is distributed under the W3C(r) Software License [1] in the hope that
it will be useful, but WITHOUT ANY WARRANTY; without even the implied
warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
!
[1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
-->
<xs:schema xmlns:xs='http://www.w3.org/2001/XMLSchema'
! targetNamespace='http://www.w3.org/2005/05/wsdl-instance'
! xmlns:wsdli="http://www.w3.org/2005/05/wsdl-instance"
elementFormDefault='qualified'
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--- 5,24 ----
http://www.w3.org/TR/wsdl20
! Copyright © 2005 World Wide Web Consortium,
!
(Massachusetts Institute of Technology, European Research Consortium for
Informatics and Mathematics, Keio University). All Rights Reserved. This
! work is distributed under the W3C® Software License [1] in the hope that
it will be useful, but WITHOUT ANY WARRANTY; without even the implied
warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
!
[1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
+
+ $Id$
-->
<xs:schema xmlns:xs='http://www.w3.org/2001/XMLSchema'
! targetNamespace='http://www.w3.org/2005/08/wsdl-instance'
! xmlns:wsdli='http://www.w3.org/2005/08/wsdl-instance'
elementFormDefault='qualified'
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--- NEW FILE: wsdl20-http.xsd ---
<?xml version='1.0' encoding='UTF-8'?>
<!--
W3C XML Schema defined in the Web Services Description (WSDL)
Version 2.0 Part 2: Adjuncts specification
http://www.w3.org/TR/wsdl20-adjuncts
Copyright © 2005 World Wide Web Consortium,
(Massachusetts Institute of Technology, European Research Consortium for
Informatics and Mathematics, Keio University). All Rights Reserved. This
work is distributed under the W3C® Software License [1] in the hope that
it will be useful, but WITHOUT ANY WARRANTY; without even the implied
warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
[1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
$Id$
-->
<xs:schema xmlns:xs='http://www.w3.org/2001/XMLSchema'
targetNamespace='http://www.w3.org/2005/08/wsdl/http'
xmlns:wsdl='http://www.w3.org/2005/08/wsdl'
xmlns:whttp='http://www.w3.org/2005/08/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/2005/08/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">
<xs:simpleType>
<xs:union memberTypes="xs:int">
<xs:simpleType>
<xs:restriction base="xs:token">
<xs:enumeration value="#any"/>
</xs:restriction>
</xs:simpleType>
</xs:union>
</xs:simpleType>
</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">
<xs:enumeration value="basic"/>
<xs:enumeration value="digest"/>
</xs:restriction>
</xs:simpleType>
</xs:attribute>
<xs:attribute name='authenticationRealm' type='xs:string'/>
<xs:simpleType name="versionType">
<xs:restriction base="xs:string">
<xs:pattern value="[0-9]+\.[0-9]+"/>
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="httpTopkenType">
<xs:restriction base="xs:string">
<xs:pattern value="[!#-'*+\-.0-9A-Z^-z|~]+"/>
</xs:restriction>
</xs:simpleType>
<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>
</xs:complexType>
</xs:element>
</xs:schema>
Index: wsdl20-rpc.xsd
===================================================================
RCS file: /sources/public/2002/ws/desc/test-suite/xmlcatalog/wsdl/wsdl20-rpc.xsd,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** wsdl20-rpc.xsd 1 May 2005 15:04:01 -0000 1.3
--- wsdl20-rpc.xsd 9 Nov 2005 19:36:34 -0000 1.4
***************
*** 1,23 ****
<?xml version='1.0' encoding='UTF-8'?>
- <!-- $Id$ -->
<!--
W3C XML Schema defined in the Web Services Description (WSDL)
! Version 2.0 specification
! http://www.w3.org/TR/wsdl20
- Copyright (c) 2004 World Wide Web Consortium,
-
(Massachusetts Institute of Technology, European Research Consortium for
Informatics and Mathematics, Keio University). All Rights Reserved. This
! work is distributed under the W3C(r) Software License [1] in the hope that
it will be useful, but WITHOUT ANY WARRANTY; without even the implied
warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
!
[1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
-->
<xs:schema xmlns:xs='http://www.w3.org/2001/XMLSchema'
! targetNamespace="http://www.w3.org/2005/05/wsdl/rpc"
! xmlns:wrpc="http://www.w3.org/2005/05/wsdl/rpc"
elementFormDefault='qualified'
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--- 1,24 ----
<?xml version='1.0' encoding='UTF-8'?>
<!--
W3C XML Schema defined in the Web Services Description (WSDL)
! Version 2.0 Adjuncts specification
! http://www.w3.org/TR/wsdl20-adjuncts
!
! Copyright © 2005 World Wide Web Consortium,
(Massachusetts Institute of Technology, European Research Consortium for
Informatics and Mathematics, Keio University). All Rights Reserved. This
! work is distributed under the W3C® Software License [1] in the hope that
it will be useful, but WITHOUT ANY WARRANTY; without even the implied
warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
!
[1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
+
+ $Id$
-->
<xs:schema xmlns:xs='http://www.w3.org/2001/XMLSchema'
! targetNamespace="http://www.w3.org/2005/08/wsdl/rpc"
! xmlns:wrpc="http://www.w3.org/2005/08/wsdl/rpc"
elementFormDefault='qualified'
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
***************
*** 39,43 ****
<xs:simpleType name="signatureItemType">
! <xs:union memberTypes="wrpc:directionToken xs:QName" />
</xs:simpleType>
--- 40,44 ----
<xs:simpleType name="signatureItemType">
! <xs:union memberTypes="xs:QName wrpc:directionToken" />
</xs:simpleType>
Index: wsdl20-soap.xsd
===================================================================
RCS file: /sources/public/2002/ws/desc/test-suite/xmlcatalog/wsdl/wsdl20-soap.xsd,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** wsdl20-soap.xsd 1 May 2005 15:04:01 -0000 1.4
--- wsdl20-soap.xsd 9 Nov 2005 19:36:34 -0000 1.5
***************
*** 2,28 ****
<!--
W3C XML Schema defined in the Web Services Description Language
! (WSDL) Version 2.0 Part 3: Bindings specification
! http://www.w3.org/TR/wsdl20-bindings
- Copyright (c) 2004 World Wide Web Consortium,
-
(Massachusetts Institute of Technology, European Research Consortium for
Informatics and Mathematics, Keio University). All Rights Reserved. This
! work is distributed under the W3C(r) Software License [1] in the hope that
it will be useful, but WITHOUT ANY WARRANTY; without even the implied
warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
!
[1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
-->
<xs:schema xmlns:xs='http://www.w3.org/2001/XMLSchema'
! targetNamespace="http://www.w3.org/2005/05/wsdl/soap"
! xmlns:tns="http://www.w3.org/2005/05/wsdl/soap"
! xmlns:wsdl="http://www.w3.org/2005/05/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/2005/05/wsdl"
schemaLocation="wsdl20.xsd" />
--- 2,30 ----
<!--
W3C XML Schema defined in the Web Services Description Language
! (WSDL) Version 2.0 Part 2: Adjuncts specification
! http://www.w3.org/TR/wsdl20-adjuncts
!
! Copyright © 2005 World Wide Web Consortium,
(Massachusetts Institute of Technology, European Research Consortium for
Informatics and Mathematics, Keio University). All Rights Reserved. This
! work is distributed under the W3C® Software License [1] in the hope that
it will be useful, but WITHOUT ANY WARRANTY; without even the implied
warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
!
[1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
+
+ $Id$
-->
<xs:schema xmlns:xs='http://www.w3.org/2001/XMLSchema'
! targetNamespace="http://www.w3.org/2005/08/wsdl/soap"
! xmlns:wsoap="http://www.w3.org/2005/08/wsdl/soap"
! xmlns:wsdl="http://www.w3.org/2005/08/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/2005/08/wsdl"
schemaLocation="wsdl20.xsd" />
***************
*** 57,62 ****
<xs:attribute name="element" type="xs:QName"
use="required" />
! <xs:attribute name="mustUnderstnad"
type="xs:boolean" />
</xs:extension>
</xs:complexContent>
--- 59,65 ----
<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>
***************
*** 64,72 ****
</xs:element>
! <xs:attribute name="code" type="xs:QName" />
<xs:attribute name="subcodes">
<xs:simpleType>
<xs:list itemType="xs:QName" />
</xs:simpleType>
</xs:attribute>
--- 67,90 ----
</xs:element>
! <xs:simpleType name="TokenAny">
! <xs:restriction base="xs:token">
! <xs:enumeration value="#any"/>
! </xs:restriction>
! </xs:simpleType>
!
! <xs:attribute name="code">
! <xs:simpleType>
! <xs:union memberTypes="xs:QName wsoap:TokenAny"/>
! </xs:simpleType>
! </xs:attribute>
!
<xs:attribute name="subcodes">
+ <xs:simpleType>
+ <xs:union memberTypes="wsoap:TokenAny">
<xs:simpleType>
<xs:list itemType="xs:QName" />
</xs:simpleType>
+ </xs:union>
+ </xs:simpleType>
</xs:attribute>
Index: wsdl20-extensions.xsd
===================================================================
RCS file: /sources/public/2002/ws/desc/test-suite/xmlcatalog/wsdl/wsdl20-extensions.xsd,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** wsdl20-extensions.xsd 16 Jun 2005 22:04:31 -0000 1.1
--- wsdl20-extensions.xsd 9 Nov 2005 19:36:34 -0000 1.2
***************
*** 1,50 ****
<?xml version='1.0' encoding='UTF-8'?>
- <!-- $Id$ -->
<!--
W3C XML Schema defined in the Web Services Description (WSDL)
! Version 2.0 specification
http://www.w3.org/TR/wsdl20-adjuncts
! Copyright (c) 2005 World Wide Web Consortium,
(Massachusetts Institute of Technology, European Research Consortium for
Informatics and Mathematics, Keio University). All Rights Reserved. This
! work is distributed under the W3C(r) Software License [1] in the hope that
it will be useful, but WITHOUT ANY WARRANTY; without even the implied
warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
[1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
-->
<xs:schema xmlns:xs='http://www.w3.org/2001/XMLSchema'
! targetNamespace='http://www.w3.org/2005/05/wsdl-extensions'
! xmlns:wsdlx="http://www.w3.org/2005/05/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:attribute name="interface" type="xs:QName">
! <xs:annotation>
! <xs:documentation>
! This attribute may be used to annotate element or
! attribute definitions to indicate that the content
! refers to Web service that implements the specified
! interface.
! </xs:documentation>
! </xs:annotation>
! </xs:attribute>
! <xs:attribute name="binding" type="xs:QName">
! <xs:annotation>
! <xs:documentation>
! This attribute may be used to annotate element or
! attribute definitions to indicate that the content
! refers to Web service that implements the specified
! binding.
! </xs:documentation>
! </xs:annotation>
! </xs:attribute>
</xs:schema>
--- 1,59 ----
<?xml version='1.0' encoding='UTF-8'?>
<!--
W3C XML Schema defined in the Web Services Description (WSDL)
! Version 2.0 specifications
! http://www.w3.org/TR/wsdl20
http://www.w3.org/TR/wsdl20-adjuncts
! Copyright © 2005 World Wide Web Consortium,
(Massachusetts Institute of Technology, European Research Consortium for
Informatics and Mathematics, Keio University). All Rights Reserved. This
! work is distributed under the W3C® Software License [1] in the hope that
it will be useful, but WITHOUT ANY WARRANTY; without even the implied
warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
[1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
+
+ $Id$
-->
<xs:schema xmlns:xs='http://www.w3.org/2001/XMLSchema'
! targetNamespace='http://www.w3.org/2005/08/wsdl-extensions'
! xmlns:wsdlx="http://www.w3.org/2005/08/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>
! This attribute may be used to annotate an
! interface operation to indicate that it
! provides a safe interaction.
! </xs:documentation>
! </xs:annotation>
! </xs:attribute>
!
! <xs:attribute name="interface" type="xs:QName">
! <xs:annotation>
! <xs:documentation>
! This attribute may be used to annotate element or
! attribute definitions to indicate that the content refers
! to Web service that implements the specified interface.
! </xs:documentation>
! </xs:annotation>
! </xs:attribute>
! <xs:attribute name="binding" type="xs:QName">
! <xs:annotation>
! <xs:documentation>
! This attribute may be used to annotate element or
! attribute definitions to indicate that the content refers
! to Web service that implements the specified binding.
! </xs:documentation>
! </xs:annotation>
! </xs:attribute>
</xs:schema>
Index: wsdl20.xsd
===================================================================
RCS file: /sources/public/2002/ws/desc/test-suite/xmlcatalog/wsdl/wsdl20.xsd,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** wsdl20.xsd 16 Jun 2005 22:04:31 -0000 1.7
--- wsdl20.xsd 9 Nov 2005 19:36:34 -0000 1.8
***************
*** 1,4 ****
<?xml version='1.0' encoding='UTF-8'?>
- <!-- $Id$ -->
<!--
W3C XML Schema defined in the Web Services Description (WSDL)
--- 1,3 ----
***************
*** 6,24 ****
http://www.w3.org/TR/wsdl20
! Copyright (c) 2004 World Wide Web Consortium,
!
(Massachusetts Institute of Technology, European Research Consortium for
Informatics and Mathematics, Keio University). All Rights Reserved. This
! work is distributed under the W3C(r) Software License [1] in the hope that
it will be useful, but WITHOUT ANY WARRANTY; without even the implied
warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
!
[1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
-->
<xs:schema xmlns:xs='http://www.w3.org/2001/XMLSchema'
! targetNamespace='http://www.w3.org/2005/05/wsdl'
! xmlns:wsdl="http://www.w3.org/2005/05/wsdl"
! elementFormDefault='qualified'
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.w3.org/2001/XMLSchema ../xsd/XMLSchema.xsd">
--- 5,25 ----
http://www.w3.org/TR/wsdl20
! Copyright © 2005 World Wide Web Consortium,
!
(Massachusetts Institute of Technology, European Research Consortium for
Informatics and Mathematics, Keio University). All Rights Reserved. This
! work is distributed under the W3C® Software License [1] in the hope that
it will be useful, but WITHOUT ANY WARRANTY; without even the implied
warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
!
[1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
+
+ $Id$
-->
+
<xs:schema xmlns:xs='http://www.w3.org/2001/XMLSchema'
! targetNamespace='http://www.w3.org/2005/08/wsdl'
! elementFormDefault='qualified' xmlns:wsdl='http://www.w3.org/2005/08/wsdl'
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.w3.org/2001/XMLSchema ../xsd/XMLSchema.xsd">
***************
*** 76,81 ****
<xs:annotation>
<xs:documentation>
Please refer to the WSDL 2.0 specification for
! additional constraints on the contents of this type.
</xs:documentation>
</xs:annotation>
--- 77,92 ----
<xs:annotation>
<xs:documentation>
+ Although correct, this type declaration does not capture
+ all the constraints on the contents of the wsdl:description
+ element as defined by the WSDL 2.0 specification.
+
+ In particular, the ordering constraints wrt elements preceding
+ and following the wsdl:types child element are not captured, as
+ attempts to incorporate such restrictions in the schema
+ ran afoul of the UPA (Unique Particle Attribution) rule
+ in the XML Schema language.
+
Please refer to the WSDL 2.0 specification for
! additional information on the contents of this type.
</xs:documentation>
</xs:annotation>
***************
*** 264,268 ****
<xs:sequence>
<xs:choice minOccurs="0">
! <xs:element name='value' type='xs:anyType' />
<xs:element name='constraint' type='xs:QName' />
</xs:choice>
--- 275,279 ----
<xs:sequence>
<xs:choice minOccurs="0">
! <xs:element name='value'/>
<xs:element name='constraint' type='xs:QName' />
</xs:choice>
***************
*** 404,406 ****
</xs:complexType>
! </xs:schema>
\ No newline at end of file
--- 415,417 ----
</xs:complexType>
! </xs:schema>
Received on Wednesday, 9 November 2005 19:37:33 UTC