- From: Jonathan Marsh via cvs-syncmail <cvsmail@w3.org>
- Date: Sun, 27 May 2007 15:00:15 +0000
- To: public-ws-desc-eds@w3.org
Update of /sources/public/2002/ws/desc/test-suite/documents/good/SAWSDL-6G
In directory hutz:/tmp/cvs-serv18823/test-suite/documents/good/SAWSDL-6G
Modified Files:
TestMetadata.xml 06-complextype-annotation.wsdl
Added Files:
06-multiple-complextype-annotation.filename
06-multiple-complextype-annotation.wsdl
Log Message:
Updated SAWSDL testcases to match latest versions.
Fixed QName reference bug in swasdl:elementDeclarationExtension.
--- NEW FILE: 06-multiple-complextype-annotation.wsdl ---
<?xml version="1.0" encoding="UTF-8"?>
<wsdl:description
targetNamespace="http://www.w3.org/2002/ws/sawsdl/spec/wsdl/order#"
xmlns="http://www.w3.org/2002/ws/sawsdl/spec/wsdl/order#"
xmlns:wsdl="http://www.w3.org/ns/wsdl"
xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:sawsdl="http://www.w3.org/2007/01/sawsdl#">
<wsdl:types>
<xs:schema targetNamespace="http://www.w3.org/2002/ws/sawsdl/spec/wsdl/order#" elementFormDefault="qualified">
<xs:element name="OrderRequest" type="OrderRequestType"
sawsdl:modelReference="http://example.org/elementAnnotation" />
<xs:complexType name="OrderRequestType"
sawsdl:modelReference="http://www.w3.org/2002/ws/sawsdl/spec/ontology/purchaseorder#OrderRequest
http://example.org/typeAnnotation">
<xs:sequence>
<xs:element name="customerNo" type="xs:integer" />
<xs:element name="orderItem" type="item" minOccurs="1" maxOccurs="unbounded" />
</xs:sequence>
</xs:complexType>
<xs:complexType name="item"
sawsdl:modelReference="http://www.w3.org/2002/ws/sawsdl/spec/ontology/purchaseorder#Item">
<xs:all>
<xs:element name="UPC" type="xs:string" />
</xs:all>
<xs:attribute name="quantity" type="xs:integer" />
</xs:complexType>
<xs:element name="OrderResponse" type="confirmation" />
<xs:simpleType name="confirmation">
<xs:restriction base="xs:string">
<xs:enumeration value="Confirmed" />
<xs:enumeration value="Pending" />
<xs:enumeration value="Rejected" />
</xs:restriction>
</xs:simpleType>
</xs:schema>
</wsdl:types>
<wsdl:interface name="Order">
<wsdl:operation name="order" pattern="http://www.w3.org/ns/wsdl/in-out">
<wsdl:input element="OrderRequest" />
<wsdl:output element="OrderResponse" />
</wsdl:operation>
</wsdl:interface>
</wsdl:description>
Index: TestMetadata.xml
===================================================================
RCS file: /sources/public/2002/ws/desc/test-suite/documents/good/SAWSDL-6G/TestMetadata.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** TestMetadata.xml 9 Feb 2007 04:13:21 -0000 1.1
--- TestMetadata.xml 27 May 2007 15:00:13 -0000 1.2
***************
*** 12,15 ****
--- 12,16 ----
<Inputs>
<Input role="root">06-complextype-annotation.wsdl</Input>
+ <Input>06-multiple-complextype-annotation.wsdl</Input>
<Input role="required-extension">http://www.w3.org/2007/01/sawsdl#</Input>
</Inputs>
--- NEW FILE: 06-multiple-complextype-annotation.filename ---
<filename>SAWSDL-6G/06-multiple-complextype-annotation.wsdl</filename>
Index: 06-complextype-annotation.wsdl
===================================================================
RCS file: /sources/public/2002/ws/desc/test-suite/documents/good/SAWSDL-6G/06-complextype-annotation.wsdl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** 06-complextype-annotation.wsdl 23 Mar 2007 05:52:14 -0000 1.2
--- 06-complextype-annotation.wsdl 27 May 2007 15:00:13 -0000 1.3
***************
*** 9,20 ****
<wsdl:types>
<xs:schema targetNamespace="http://www.w3.org/2002/ws/sawsdl/spec/wsdl/order#" elementFormDefault="qualified">
! <xs:element name="OrderRequest">
! <xs:complexType>
! <xs:sequence>
! <xs:element name="customerNo" type="xs:integer" />
! <xs:element name="orderItem" type="item" minOccurs="1" maxOccurs="unbounded" />
! </xs:sequence>
! </xs:complexType>
! </xs:element>
<xs:complexType name="item"
sawsdl:modelReference="http://www.w3.org/2002/ws/sawsdl/spec/ontology/purchaseorder#Item">
--- 9,21 ----
<wsdl:types>
<xs:schema targetNamespace="http://www.w3.org/2002/ws/sawsdl/spec/wsdl/order#" elementFormDefault="qualified">
! <xs:element name="OrderRequest" type="OrderRequestType" />
! <xs:complexType name="OrderRequestType"
! sawsdl:modelReference="http://www.w3.org/2002/ws/sawsdl/spec/ontology/purchaseorder#OrderRequest">
! <xs:sequence>
! <xs:element name="customerNo" type="xs:integer" />
! <xs:element name="orderItem" type="item" minOccurs="1" maxOccurs="unbounded" />
! </xs:sequence>
! </xs:complexType>
!
<xs:complexType name="item"
sawsdl:modelReference="http://www.w3.org/2002/ws/sawsdl/spec/ontology/purchaseorder#Item">
Received on Sunday, 27 May 2007 15:00:18 UTC