- From: Arthur Ryman via cvs-syncmail <cvsmail@w3.org>
- Date: Sat, 10 Jun 2006 16:09:05 +0000
- To: public-ws-desc-eds@w3.org
Update of /sources/public/2002/ws/desc/test-suite/interchange In directory hutz:/tmp/cvs-serv6926/test-suite/interchange Modified Files: wsdlcm.xsd wsdlcm-rpc.xsd wsdlcm-soap.xsd wsdlcm-http.xsd wsdlcm-extensions.xsd wsdlcm-base.xsd Log Message: moved parent, features, and properties into base Index: wsdlcm-rpc.xsd =================================================================== RCS file: /sources/public/2002/ws/desc/test-suite/interchange/wsdlcm-rpc.xsd,v retrieving revision 1.3 retrieving revision 1.4 diff -C 2 -d -r1.3 -r1.4 *** wsdlcm-rpc.xsd 19 May 2006 14:27:48 -0000 1.3 --- wsdlcm-rpc.xsd 10 Jun 2006 16:09:02 -0000 1.4 *************** *** 8,12 **** ChangeLog: ! 2005-05-08 Arthur Ryman ryman@ca.ibm.com - created --- 8,12 ---- ChangeLog: ! 2006-05-08 Arthur Ryman (ryman@ca.ibm.com) - created Index: wsdlcm-http.xsd =================================================================== RCS file: /sources/public/2002/ws/desc/test-suite/interchange/wsdlcm-http.xsd,v retrieving revision 1.2 retrieving revision 1.3 diff -C 2 -d -r1.2 -r1.3 *** wsdlcm-http.xsd 19 May 2006 19:22:47 -0000 1.2 --- wsdlcm-http.xsd 10 Jun 2006 16:09:02 -0000 1.3 *************** *** 8,17 **** ChangeLog: ! 2005-05-08 Arthur Ryman (ryman@ca.ibm.com) - created ! 2005-05-19 Arthur Ryman (ryman@ca.ibm.com) - modifed HttpErrorStatusCodeType to be consistent with SOAP complex type --> <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" --- 8,20 ---- ChangeLog: ! 2006-05-08 Arthur Ryman (ryman@ca.ibm.com) - created ! 2006-05-19 Arthur Ryman (ryman@ca.ibm.com) - modifed HttpErrorStatusCodeType to be consistent with SOAP complex type + 2006-06-10: Arthur Ryman (ryman@ca.ibm.com) + - moved parent into base + --> <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" *************** *** 34,38 **** <xs:element name="httpCookies" type="xs:boolean" /> ! <xs:element name="httpErrorStatusCode" type="HttpErrorStatusCodeType" /> <xs:element name="httpFaultSerialization" type="xs:string" /> --- 37,42 ---- <xs:element name="httpCookies" type="xs:boolean" /> ! <xs:element name="httpErrorStatusCode" ! type="HttpErrorStatusCodeType" /> <xs:element name="httpFaultSerialization" type="xs:string" /> *************** *** 75,79 **** </xs:annotation> <xs:sequence> ! <xs:element name="code" type="xs:int" minOccurs="0"/> </xs:sequence> </xs:complexType> --- 79,83 ---- </xs:annotation> <xs:sequence> ! <xs:element name="code" type="xs:int" minOccurs="0" /> </xs:sequence> </xs:complexType> *************** *** 103,107 **** <xs:element name="typeDefinition" type="cmbase:Ref" /> <xs:element name="required" type="xs:boolean" /> ! <xs:element name="parent" type="cmbase:Ref" /> </xs:sequence> </xs:restriction> --- 107,111 ---- <xs:element name="typeDefinition" type="cmbase:Ref" /> <xs:element name="required" type="xs:boolean" /> ! <xs:element ref="cmbase:parent" /> </xs:sequence> </xs:restriction> Index: wsdlcm-extensions.xsd =================================================================== RCS file: /sources/public/2002/ws/desc/test-suite/interchange/wsdlcm-extensions.xsd,v retrieving revision 1.1 retrieving revision 1.2 diff -C 2 -d -r1.1 -r1.2 *** wsdlcm-extensions.xsd 9 May 2006 01:04:43 -0000 1.1 --- wsdlcm-extensions.xsd 10 Jun 2006 16:09:02 -0000 1.2 *************** *** 8,12 **** ChangeLog: ! 2005-05-08 Arthur Ryman ryman@ca.ibm.com - created --- 8,12 ---- ChangeLog: ! 2006-05-08 Arthur Ryman (ryman@ca.ibm.com) - created Index: wsdlcm.xsd =================================================================== RCS file: /sources/public/2002/ws/desc/test-suite/interchange/wsdlcm.xsd,v retrieving revision 1.6 retrieving revision 1.7 diff -C 2 -d -r1.6 -r1.7 *** wsdlcm.xsd 9 May 2006 01:04:43 -0000 1.6 --- wsdlcm.xsd 10 Jun 2006 16:09:02 -0000 1.7 *************** *** 8,14 **** ChangeLog: ! 2005-05-07 Arthur Ryman ryman@ca.ibm.com - added documentation about canonical order of set-valued properties --> <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" --- 8,17 ---- ChangeLog: ! 2006-05-07 Arthur Ryman (ryman@ca.ibm.com) - added documentation about canonical order of set-valued properties + 2006-06-10: Arthur Ryman (ryman@ca.ibm.com) + - moved parent, features, and properties into base + --> <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" *************** *** 156,163 **** <xs:element name="interfaceOperations" type="InterfaceOperationComponents" minOccurs="0" /> ! <xs:element name="features" type="FeatureComponents" ! minOccurs="0" /> ! <xs:element name="properties" ! type="PropertyComponents" minOccurs="0" /> </xs:sequence> </xs:restriction> --- 159,164 ---- <xs:element name="interfaceOperations" type="InterfaceOperationComponents" minOccurs="0" /> ! <xs:element ref="cmbase:features" minOccurs="0" /> ! <xs:element ref="cmbase:properties" minOccurs="0" /> </xs:sequence> </xs:restriction> *************** *** 201,209 **** <xs:element name="elementDeclaration" type="cmbase:Ref" minOccurs="0" /> ! <xs:element name="features" type="FeatureComponents" ! minOccurs="0" /> ! <xs:element name="properties" ! type="PropertyComponents" minOccurs="0" /> ! <xs:element name="parent" type="cmbase:Ref" /> </xs:sequence> </xs:restriction> --- 202,208 ---- <xs:element name="elementDeclaration" type="cmbase:Ref" minOccurs="0" /> ! <xs:element ref="cmbase:features" minOccurs="0" /> ! <xs:element ref="cmbase:properties" minOccurs="0" /> ! <xs:element ref="cmbase:parent" /> </xs:sequence> </xs:restriction> *************** *** 243,251 **** <xs:element name="style" type="cmbase:Uris" minOccurs="0" /> ! <xs:element name="features" type="FeatureComponents" ! minOccurs="0" /> ! <xs:element name="properties" ! type="PropertyComponents" minOccurs="0" /> ! <xs:element name="parent" type="cmbase:Ref" /> <!-- Extensions --> --- 242,248 ---- <xs:element name="style" type="cmbase:Uris" minOccurs="0" /> ! <xs:element ref="cmbase:features" minOccurs="0" /> ! <xs:element ref="cmbase:properties" minOccurs="0" /> ! <xs:element ref="cmbase:parent" /> <!-- Extensions --> *************** *** 290,298 **** <xs:element name="elementDeclaration" type="cmbase:Ref" minOccurs="0" /> ! <xs:element name="features" type="FeatureComponents" ! minOccurs="0" /> ! <xs:element name="properties" ! type="PropertyComponents" minOccurs="0" /> ! <xs:element name="parent" type="cmbase:Ref" /> </xs:sequence> </xs:restriction> --- 287,293 ---- <xs:element name="elementDeclaration" type="cmbase:Ref" minOccurs="0" /> ! <xs:element ref="cmbase:features" minOccurs="0" /> ! <xs:element ref="cmbase:properties" minOccurs="0" /> ! <xs:element ref="cmbase:parent" /> </xs:sequence> </xs:restriction> *************** *** 327,396 **** <xs:element name="direction" type="cmbase:Direction" /> ! <xs:element name="features" type="FeatureComponents" ! minOccurs="0" /> ! <xs:element name="properties" ! type="PropertyComponents" minOccurs="0" /> ! <xs:element name="parent" type="cmbase:Ref" /> ! </xs:sequence> ! </xs:restriction> ! </xs:complexContent> ! </xs:complexType> ! ! <xs:complexType name="FeatureComponents"> ! <xs:annotation> ! <xs:documentation> ! The sequence is sorted by the key of Feature. ! </xs:documentation> ! </xs:annotation> ! <xs:sequence> ! <xs:element name="featureComponent" type="FeatureComponent" ! maxOccurs="unbounded" /> ! </xs:sequence> ! </xs:complexType> ! ! <xs:complexType name="FeatureComponent"> ! <xs:annotation> ! <xs:documentation> ! The key of Feature is (ref). ! </xs:documentation> ! </xs:annotation> ! <xs:complexContent> ! <xs:restriction base="cmbase:Component"> ! <xs:sequence> ! <xs:element name="ref" type="xs:anyURI" /> ! <xs:element name="required" type="xs:boolean" /> ! <xs:element name="parent" type="cmbase:Ref" /> ! </xs:sequence> ! </xs:restriction> ! </xs:complexContent> ! </xs:complexType> ! ! <xs:complexType name="PropertyComponents"> ! <xs:annotation> ! <xs:documentation> ! The sequence is sorted by the key of Property. ! </xs:documentation> ! </xs:annotation> ! <xs:sequence> ! <xs:element name="propertyComponent" ! type="PropertyComponent" maxOccurs="unbounded" /> ! </xs:sequence> ! </xs:complexType> ! ! <xs:complexType name="PropertyComponent"> ! <xs:annotation> ! <xs:documentation> ! The key of Property is (ref). ! </xs:documentation> ! </xs:annotation> ! <xs:complexContent> ! <xs:restriction base="cmbase:Component"> ! <xs:sequence> ! <xs:element name="ref" type="xs:anyURI" /> ! <xs:element name="valueConstraint" type="cmbase:Ref" ! minOccurs="0" /> ! <xs:element name="value" type="cmbase:Any" ! minOccurs="0" /> ! <xs:element name="parent" type="cmbase:Ref" /> </xs:sequence> </xs:restriction> --- 322,328 ---- <xs:element name="direction" type="cmbase:Direction" /> ! <xs:element ref="cmbase:features" minOccurs="0" /> ! <xs:element ref="cmbase:properties" minOccurs="0" /> ! <xs:element ref="cmbase:parent" /> </xs:sequence> </xs:restriction> *************** *** 427,434 **** <xs:element name="bindingOperations" type="BindingOperationComponents" minOccurs="0" /> ! <xs:element name="features" type="FeatureComponents" ! minOccurs="0" /> ! <xs:element name="properties" ! type="PropertyComponents" minOccurs="0" /> <!-- HTTP Binding Extension --> --- 359,364 ---- <xs:element name="bindingOperations" type="BindingOperationComponents" minOccurs="0" /> ! <xs:element ref="cmbase:features" minOccurs="0" /> ! <xs:element ref="cmbase:properties" minOccurs="0" /> <!-- HTTP Binding Extension --> *************** *** 476,484 **** <xs:sequence> <xs:element name="interfaceFault" type="cmbase:Ref" /> ! <xs:element name="features" type="FeatureComponents" ! minOccurs="0" /> ! <xs:element name="properties" ! type="PropertyComponents" minOccurs="0" /> ! <xs:element name="parent" type="cmbase:Ref" /> <!-- HTTP Binding Extension --> --- 406,412 ---- <xs:sequence> <xs:element name="interfaceFault" type="cmbase:Ref" /> ! <xs:element ref="cmbase:features" minOccurs="0" /> ! <xs:element ref="cmbase:properties" minOccurs="0" /> ! <xs:element ref="cmbase:parent" /> <!-- HTTP Binding Extension --> *************** *** 530,538 **** <xs:element name="bindingMessageReferences" type="BindingMessageReferenceComponents" minOccurs="0" /> ! <xs:element name="features" type="FeatureComponents" ! minOccurs="0" /> ! <xs:element name="properties" ! type="PropertyComponents" minOccurs="0" /> ! <xs:element name="parent" type="cmbase:Ref" /> <!-- HTTP Binding Extension --> --- 458,464 ---- <xs:element name="bindingMessageReferences" type="BindingMessageReferenceComponents" minOccurs="0" /> ! <xs:element ref="cmbase:features" minOccurs="0" /> ! <xs:element ref="cmbase:properties" minOccurs="0" /> ! <xs:element ref="cmbase:parent" /> <!-- HTTP Binding Extension --> *************** *** 587,595 **** <xs:element name="interfaceMessageReference" type="cmbase:Ref" /> ! <xs:element name="features" type="FeatureComponents" ! minOccurs="0" /> ! <xs:element name="properties" ! type="PropertyComponents" minOccurs="0" /> ! <xs:element name="parent" type="cmbase:Ref" /> <!-- HTTP Binding Extension --> --- 513,519 ---- <xs:element name="interfaceMessageReference" type="cmbase:Ref" /> ! <xs:element ref="cmbase:features" minOccurs="0" /> ! <xs:element ref="cmbase:properties" minOccurs="0" /> ! <xs:element ref="cmbase:parent" /> <!-- HTTP Binding Extension --> *************** *** 633,641 **** <xs:element name="interfaceFaultReference" type="cmbase:Ref" /> ! <xs:element name="features" type="FeatureComponents" ! minOccurs="0" /> ! <xs:element name="properties" ! type="PropertyComponents" minOccurs="0" /> ! <xs:element name="parent" type="cmbase:Ref" /> <!-- SOAP Binding Extension --> --- 557,563 ---- <xs:element name="interfaceFaultReference" type="cmbase:Ref" /> ! <xs:element ref="cmbase:features" minOccurs="0" /> ! <xs:element ref="cmbase:properties" minOccurs="0" /> ! <xs:element ref="cmbase:parent" /> <!-- SOAP Binding Extension --> *************** *** 673,680 **** <xs:element name="endpoints" type="EndpointComponents" /> ! <xs:element name="features" type="FeatureComponents" ! minOccurs="0" /> ! <xs:element name="properties" ! type="PropertyComponents" minOccurs="0" /> </xs:sequence> </xs:restriction> --- 595,600 ---- <xs:element name="endpoints" type="EndpointComponents" /> ! <xs:element ref="cmbase:features" minOccurs="0" /> ! <xs:element ref="cmbase:properties" minOccurs="0" /> </xs:sequence> </xs:restriction> *************** *** 707,715 **** <xs:element name="address" type="xs:anyURI" minOccurs="0" /> ! <xs:element name="features" type="FeatureComponents" ! minOccurs="0" /> ! <xs:element name="properties" ! type="PropertyComponents" minOccurs="0" /> ! <xs:element name="parent" type="cmbase:Ref" /> <!-- HTTP Binding Extension --> --- 627,633 ---- <xs:element name="address" type="xs:anyURI" minOccurs="0" /> ! <xs:element ref="cmbase:features" minOccurs="0" /> ! <xs:element ref="cmbase:properties" minOccurs="0" /> ! <xs:element ref="cmbase:parent" /> <!-- HTTP Binding Extension --> Index: wsdlcm-base.xsd =================================================================== RCS file: /sources/public/2002/ws/desc/test-suite/interchange/wsdlcm-base.xsd,v retrieving revision 1.2 retrieving revision 1.3 diff -C 2 -d -r1.2 -r1.3 *** wsdlcm-base.xsd 24 May 2006 19:27:37 -0000 1.2 --- wsdlcm-base.xsd 10 Jun 2006 16:09:02 -0000 1.3 *************** *** 8,14 **** ChangeLog: ! 2005-05-08 Arthur Ryman ryman@ca.ibm.com - refactored wsdlcm.xsd --> <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" --- 8,17 ---- ChangeLog: ! 2006-05-08 Arthur Ryman (ryman@ca.ibm.com) - refactored wsdlcm.xsd + 2006-06-10: Arthur Ryman (ryman@ca.ibm.com) + - moved parent, features, and properties into base + --> <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" *************** *** 83,85 **** --- 86,154 ---- </xs:complexType> + <xs:complexType name="FeatureComponents"> + <xs:annotation> + <xs:documentation> + The sequence is sorted by the key of Feature. + </xs:documentation> + </xs:annotation> + <xs:sequence> + <xs:element name="featureComponent" type="FeatureComponent" + maxOccurs="unbounded" /> + </xs:sequence> + </xs:complexType> + + <xs:complexType name="FeatureComponent"> + <xs:annotation> + <xs:documentation> + The key of Feature is (ref). + </xs:documentation> + </xs:annotation> + <xs:complexContent> + <xs:restriction base="Component"> + <xs:sequence> + <xs:element name="ref" type="xs:anyURI" /> + <xs:element name="required" type="xs:boolean" /> + <xs:element ref="parent" /> + </xs:sequence> + </xs:restriction> + </xs:complexContent> + </xs:complexType> + + <xs:complexType name="PropertyComponents"> + <xs:annotation> + <xs:documentation> + The sequence is sorted by the key of Property. + </xs:documentation> + </xs:annotation> + <xs:sequence> + <xs:element name="propertyComponent" + type="PropertyComponent" maxOccurs="unbounded" /> + </xs:sequence> + </xs:complexType> + + <xs:complexType name="PropertyComponent"> + <xs:annotation> + <xs:documentation> + The key of Property is (ref). + </xs:documentation> + </xs:annotation> + <xs:complexContent> + <xs:restriction base="Component"> + <xs:sequence> + <xs:element name="ref" type="xs:anyURI" /> + <xs:element name="valueConstraint" type="Ref" + minOccurs="0" /> + <xs:element name="value" type="Any" minOccurs="0" /> + <xs:element ref="parent" /> + </xs:sequence> + </xs:restriction> + </xs:complexContent> + </xs:complexType> + + <xs:element name="parent" type="Ref" /> + + <xs:element name="features" type="FeatureComponents" /> + + <xs:element name="properties" type="PropertyComponents" /> + </xs:schema> Index: wsdlcm-soap.xsd =================================================================== RCS file: /sources/public/2002/ws/desc/test-suite/interchange/wsdlcm-soap.xsd,v retrieving revision 1.3 retrieving revision 1.4 diff -C 2 -d -r1.3 -r1.4 *** wsdlcm-soap.xsd 19 May 2006 19:06:15 -0000 1.3 --- wsdlcm-soap.xsd 10 Jun 2006 16:09:02 -0000 1.4 *************** *** 8,17 **** ChangeLog: ! 2005-05-08 Arthur Ryman (ryman@ca.ibm.com) - created ! 2005-05-19 Arthur Ryman (ryman@ca.ibm.com) - corrected SoapFaultCodeType and SoapFaultSubcodesType to use complex type for QNames --> <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" --- 8,19 ---- ChangeLog: ! 2006-05-08 Arthur Ryman (ryman@ca.ibm.com) - created ! 2006-05-19 Arthur Ryman (ryman@ca.ibm.com) - corrected SoapFaultCodeType and SoapFaultSubcodesType to use complex type for QNames + 2006-06-10: Arthur Ryman (ryman@ca.ibm.com) + - moved parent into base --> <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" *************** *** 50,54 **** </xs:annotation> <xs:sequence> ! <xs:element name="code" type="cmbase:QName" minOccurs="0"/> </xs:sequence> </xs:complexType> --- 52,56 ---- </xs:annotation> <xs:sequence> ! <xs:element name="code" type="cmbase:QName" minOccurs="0" /> </xs:sequence> </xs:complexType> *************** *** 61,68 **** </xs:annotation> <xs:sequence> ! <xs:element name="subcodes" type="CodesType" minOccurs="0"/> </xs:sequence> </xs:complexType> ! <xs:complexType name="CodesType"> <xs:annotation> --- 63,70 ---- </xs:annotation> <xs:sequence> ! <xs:element name="subcodes" type="CodesType" minOccurs="0" /> </xs:sequence> </xs:complexType> ! <xs:complexType name="CodesType"> <xs:annotation> *************** *** 72,76 **** </xs:annotation> <xs:sequence> ! <xs:element name="code" type="cmbase:QName" minOccurs="0" maxOccurs="unbounded" /> </xs:sequence> </xs:complexType> --- 74,79 ---- </xs:annotation> <xs:sequence> ! <xs:element name="code" type="cmbase:QName" minOccurs="0" ! maxOccurs="unbounded" /> </xs:sequence> </xs:complexType> *************** *** 102,106 **** <xs:element name="mustUnderstand" type="xs:boolean" /> <xs:element name="required" type="xs:boolean" /> ! <xs:element name="parent" type="cmbase:Ref" /> </xs:sequence> </xs:restriction> --- 105,109 ---- <xs:element name="mustUnderstand" type="xs:boolean" /> <xs:element name="required" type="xs:boolean" /> ! <xs:element ref="cmbase:parent" /> </xs:sequence> </xs:restriction> *************** *** 131,135 **** <xs:element name="ref" type="xs:anyURI" /> <xs:element name="required" type="xs:boolean" /> ! <xs:element name="parent" type="cmbase:Ref" /> </xs:sequence> </xs:restriction> --- 134,138 ---- <xs:element name="ref" type="xs:anyURI" /> <xs:element name="required" type="xs:boolean" /> ! <xs:element ref="cmbase:parent" /> </xs:sequence> </xs:restriction>
Received on Saturday, 10 June 2006 16:09:18 UTC