- From: Jonathan Marsh via cvs-syncmail <cvsmail@w3.org>
- Date: Sun, 27 May 2007 15:00:17 +0000
- To: public-ws-desc-eds@w3.org
Update of /sources/public/2002/ws/desc/test-suite/results/Baseline/SAWSDL-6G In directory hutz:/tmp/cvs-serv18823/test-suite/results/Baseline/SAWSDL-6G Modified Files: 06-complextype-annotation.canonical.wsdlcm Added Files: 06-multiple-complextype-annotation.canonical.wsdlcm Log Message: Updated SAWSDL testcases to match latest versions. Fixed QName reference bug in swasdl:elementDeclarationExtension. --- NEW FILE: 06-multiple-complextype-annotation.canonical.wsdlcm --- <?xml version="1.0" encoding="UTF-8"?> <!-- Generated by wsdl-component-model.xslt, Jonathan Marsh, WSO2, jonathan@wso2.com --> <descriptionComponent xmlns="http://www.w3.org/2002/ws/desc/wsdl/component" xmlns:sawsdl="http://www.w3.org/2007/01/sawsdl#" xmlns:sawsdlcm="http://www.w3.org/2002/ws/desc/wsdl/component-sawsdl" xmlns:wsacm="http://www.w3.org/2002/ws/desc/wsdl/component-ws-addressing" xmlns:soapcm="http://www.w3.org/2002/ws/desc/wsdl/component-soap" xmlns:rpccm="http://www.w3.org/2002/ws/desc/wsdl/component-rpc" xmlns:httpcm="http://www.w3.org/2002/ws/desc/wsdl/component-http" xmlns:base="http://www.w3.org/2002/ws/desc/wsdl/component-base" xmlns:ext="http://www.w3.org/2002/ws/desc/wsdl/component-extensions" xml:id="c1"> <extensions> <base:uri>http://www.w3.org/ns/wsdl-extensions</base:uri> <base:uri>http://www.w3.org/ns/wsdl/http</base:uri> <base:uri>http://www.w3.org/ns/wsdl/rpc</base:uri> <base:uri>http://www.w3.org/ns/wsdl/soap</base:uri> <base:uri>http://www.w3.org/2007/01/sawsdl#</base:uri> </extensions> <interfaces> <interfaceComponent xml:id="c2"> <name> <base:namespaceName>http://www.w3.org/2002/ws/sawsdl/spec/wsdl/order#</base:namespaceName> <base:localName>Order</base:localName> </name> <interfaceOperations> <interfaceOperationComponent xml:id="c3"> <name> <base:namespaceName>http://www.w3.org/2002/ws/sawsdl/spec/wsdl/order#</base:namespaceName> <base:localName>order</base:localName> </name> <messageExchangePattern>http://www.w3.org/ns/wsdl/in-out</messageExchangePattern> <interfaceMessageReferences> <interfaceMessageReferenceComponent xml:id="c4"> <messageLabel>In</messageLabel> <direction>in</direction> <messageContentModel>#element</messageContentModel> <elementDeclaration ref="c6"/> <base:parent ref="c3"/> </interfaceMessageReferenceComponent> <interfaceMessageReferenceComponent xml:id="c5"> <messageLabel>Out</messageLabel> <direction>out</direction> <messageContentModel>#element</messageContentModel> <elementDeclaration ref="c7"/> <base:parent ref="c3"/> </interfaceMessageReferenceComponent> </interfaceMessageReferences> <base:parent ref="c2"/> <ext:wsdlInterfaceOperationExtension> <ext:safety>false</ext:safety> </ext:wsdlInterfaceOperationExtension> <sawsdlcm:sawsdlInterfaceOperationExtension/> </interfaceOperationComponent> </interfaceOperations> <sawsdlcm:sawsdlInterfaceExtension/> </interfaceComponent> </interfaces> <elementDeclarations> <elementDeclarationComponent xml:id="c6"> <name> <base:namespaceName>http://www.w3.org/2002/ws/sawsdl/spec/wsdl/order#</base:namespaceName> <base:localName>OrderRequest</base:localName> </name> <system>http://www.w3.org/2001/XMLSchema</system> <sawsdlcm:sawsdlElementDeclarationExtension> <sawsdlcm:modelReference> <base:uri>http://example.org/elementAnnotation</base:uri> <base:uri>http://www.w3.org/2002/ws/sawsdl/spec/ontology/purchaseorder#OrderRequest</base:uri> <base:uri>http://example.org/typeAnnotation</base:uri> </sawsdlcm:modelReference> </sawsdlcm:sawsdlElementDeclarationExtension> </elementDeclarationComponent> <elementDeclarationComponent xml:id="c7"> <name> <base:namespaceName>http://www.w3.org/2002/ws/sawsdl/spec/wsdl/order#</base:namespaceName> <base:localName>OrderResponse</base:localName> </name> <system>http://www.w3.org/2001/XMLSchema</system> <sawsdlcm:sawsdlElementDeclarationExtension/> </elementDeclarationComponent> </elementDeclarations> <typeDefinitions> <typeDefinitionComponent xml:id="c8"> <name> <base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName> <base:localName>anyURI</base:localName> </name> <system>http://www.w3.org/2001/XMLSchema</system> <sawsdlcm:sawsdlTypeDefinitionExtension/> </typeDefinitionComponent> <typeDefinitionComponent xml:id="c9"> <name> <base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName> <base:localName>base64Binary</base:localName> </name> <system>http://www.w3.org/2001/XMLSchema</system> <sawsdlcm:sawsdlTypeDefinitionExtension/> </typeDefinitionComponent> <typeDefinitionComponent xml:id="c10"> <name> <base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName> <base:localName>boolean</base:localName> </name> <system>http://www.w3.org/2001/XMLSchema</system> <sawsdlcm:sawsdlTypeDefinitionExtension/> </typeDefinitionComponent> <typeDefinitionComponent xml:id="c11"> <name> <base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName> <base:localName>byte</base:localName> </name> <system>http://www.w3.org/2001/XMLSchema</system> <sawsdlcm:sawsdlTypeDefinitionExtension/> </typeDefinitionComponent> <typeDefinitionComponent xml:id="c12"> <name> <base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName> <base:localName>date</base:localName> </name> <system>http://www.w3.org/2001/XMLSchema</system> <sawsdlcm:sawsdlTypeDefinitionExtension/> </typeDefinitionComponent> <typeDefinitionComponent xml:id="c13"> <name> <base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName> <base:localName>dateTime</base:localName> </name> <system>http://www.w3.org/2001/XMLSchema</system> <sawsdlcm:sawsdlTypeDefinitionExtension/> </typeDefinitionComponent> <typeDefinitionComponent xml:id="c14"> <name> <base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName> <base:localName>decimal</base:localName> </name> <system>http://www.w3.org/2001/XMLSchema</system> <sawsdlcm:sawsdlTypeDefinitionExtension/> </typeDefinitionComponent> <typeDefinitionComponent xml:id="c15"> <name> <base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName> <base:localName>double</base:localName> </name> <system>http://www.w3.org/2001/XMLSchema</system> <sawsdlcm:sawsdlTypeDefinitionExtension/> </typeDefinitionComponent> <typeDefinitionComponent xml:id="c16"> <name> <base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName> <base:localName>duration</base:localName> </name> <system>http://www.w3.org/2001/XMLSchema</system> <sawsdlcm:sawsdlTypeDefinitionExtension/> </typeDefinitionComponent> <typeDefinitionComponent xml:id="c17"> <name> <base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName> <base:localName>ENTITIES</base:localName> </name> <system>http://www.w3.org/2001/XMLSchema</system> <sawsdlcm:sawsdlTypeDefinitionExtension/> </typeDefinitionComponent> <typeDefinitionComponent xml:id="c18"> <name> <base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName> <base:localName>ENTITY</base:localName> </name> <system>http://www.w3.org/2001/XMLSchema</system> <sawsdlcm:sawsdlTypeDefinitionExtension/> </typeDefinitionComponent> <typeDefinitionComponent xml:id="c19"> <name> <base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName> <base:localName>float</base:localName> </name> <system>http://www.w3.org/2001/XMLSchema</system> <sawsdlcm:sawsdlTypeDefinitionExtension/> </typeDefinitionComponent> <typeDefinitionComponent xml:id="c20"> <name> <base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName> <base:localName>gDay</base:localName> </name> <system>http://www.w3.org/2001/XMLSchema</system> <sawsdlcm:sawsdlTypeDefinitionExtension/> </typeDefinitionComponent> <typeDefinitionComponent xml:id="c21"> <name> <base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName> <base:localName>gMonth</base:localName> </name> <system>http://www.w3.org/2001/XMLSchema</system> <sawsdlcm:sawsdlTypeDefinitionExtension/> </typeDefinitionComponent> <typeDefinitionComponent xml:id="c22"> <name> <base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName> <base:localName>gMonthDay</base:localName> </name> <system>http://www.w3.org/2001/XMLSchema</system> <sawsdlcm:sawsdlTypeDefinitionExtension/> </typeDefinitionComponent> <typeDefinitionComponent xml:id="c23"> <name> <base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName> <base:localName>gYear</base:localName> </name> <system>http://www.w3.org/2001/XMLSchema</system> <sawsdlcm:sawsdlTypeDefinitionExtension/> </typeDefinitionComponent> <typeDefinitionComponent xml:id="c24"> <name> <base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName> <base:localName>gYearMonth</base:localName> </name> <system>http://www.w3.org/2001/XMLSchema</system> <sawsdlcm:sawsdlTypeDefinitionExtension/> </typeDefinitionComponent> <typeDefinitionComponent xml:id="c25"> <name> <base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName> <base:localName>hexBinary</base:localName> </name> <system>http://www.w3.org/2001/XMLSchema</system> <sawsdlcm:sawsdlTypeDefinitionExtension/> </typeDefinitionComponent> <typeDefinitionComponent xml:id="c26"> <name> <base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName> <base:localName>ID</base:localName> </name> <system>http://www.w3.org/2001/XMLSchema</system> <sawsdlcm:sawsdlTypeDefinitionExtension/> </typeDefinitionComponent> <typeDefinitionComponent xml:id="c27"> <name> <base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName> <base:localName>IDREF</base:localName> </name> <system>http://www.w3.org/2001/XMLSchema</system> <sawsdlcm:sawsdlTypeDefinitionExtension/> </typeDefinitionComponent> <typeDefinitionComponent xml:id="c28"> <name> <base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName> <base:localName>IDREFS</base:localName> </name> <system>http://www.w3.org/2001/XMLSchema</system> <sawsdlcm:sawsdlTypeDefinitionExtension/> </typeDefinitionComponent> <typeDefinitionComponent xml:id="c29"> <name> <base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName> <base:localName>int</base:localName> </name> <system>http://www.w3.org/2001/XMLSchema</system> <sawsdlcm:sawsdlTypeDefinitionExtension/> </typeDefinitionComponent> <typeDefinitionComponent xml:id="c30"> <name> <base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName> <base:localName>integer</base:localName> </name> <system>http://www.w3.org/2001/XMLSchema</system> <sawsdlcm:sawsdlTypeDefinitionExtension/> </typeDefinitionComponent> <typeDefinitionComponent xml:id="c31"> <name> <base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName> <base:localName>language</base:localName> </name> <system>http://www.w3.org/2001/XMLSchema</system> <sawsdlcm:sawsdlTypeDefinitionExtension/> </typeDefinitionComponent> <typeDefinitionComponent xml:id="c32"> <name> <base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName> <base:localName>long</base:localName> </name> <system>http://www.w3.org/2001/XMLSchema</system> <sawsdlcm:sawsdlTypeDefinitionExtension/> </typeDefinitionComponent> <typeDefinitionComponent xml:id="c33"> <name> <base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName> <base:localName>Name</base:localName> </name> <system>http://www.w3.org/2001/XMLSchema</system> <sawsdlcm:sawsdlTypeDefinitionExtension/> </typeDefinitionComponent> <typeDefinitionComponent xml:id="c34"> <name> <base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName> <base:localName>NCName</base:localName> </name> <system>http://www.w3.org/2001/XMLSchema</system> <sawsdlcm:sawsdlTypeDefinitionExtension/> </typeDefinitionComponent> <typeDefinitionComponent xml:id="c35"> <name> <base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName> <base:localName>negativeInteger</base:localName> </name> <system>http://www.w3.org/2001/XMLSchema</system> <sawsdlcm:sawsdlTypeDefinitionExtension/> </typeDefinitionComponent> <typeDefinitionComponent xml:id="c36"> <name> <base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName> <base:localName>NMTOKEN</base:localName> </name> <system>http://www.w3.org/2001/XMLSchema</system> <sawsdlcm:sawsdlTypeDefinitionExtension/> </typeDefinitionComponent> <typeDefinitionComponent xml:id="c37"> <name> <base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName> <base:localName>NMTOKENS</base:localName> </name> <system>http://www.w3.org/2001/XMLSchema</system> <sawsdlcm:sawsdlTypeDefinitionExtension/> </typeDefinitionComponent> <typeDefinitionComponent xml:id="c38"> <name> <base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName> <base:localName>nonNegativeInteger</base:localName> </name> <system>http://www.w3.org/2001/XMLSchema</system> <sawsdlcm:sawsdlTypeDefinitionExtension/> </typeDefinitionComponent> <typeDefinitionComponent xml:id="c39"> <name> <base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName> <base:localName>nonPositiveInteger</base:localName> </name> <system>http://www.w3.org/2001/XMLSchema</system> <sawsdlcm:sawsdlTypeDefinitionExtension/> </typeDefinitionComponent> <typeDefinitionComponent xml:id="c40"> <name> <base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName> <base:localName>normalizedString</base:localName> </name> <system>http://www.w3.org/2001/XMLSchema</system> <sawsdlcm:sawsdlTypeDefinitionExtension/> </typeDefinitionComponent> <typeDefinitionComponent xml:id="c41"> <name> <base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName> <base:localName>NOTATION</base:localName> </name> <system>http://www.w3.org/2001/XMLSchema</system> <sawsdlcm:sawsdlTypeDefinitionExtension/> </typeDefinitionComponent> <typeDefinitionComponent xml:id="c42"> <name> <base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName> <base:localName>positiveInteger</base:localName> </name> <system>http://www.w3.org/2001/XMLSchema</system> <sawsdlcm:sawsdlTypeDefinitionExtension/> </typeDefinitionComponent> <typeDefinitionComponent xml:id="c43"> <name> <base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName> <base:localName>QName</base:localName> </name> <system>http://www.w3.org/2001/XMLSchema</system> <sawsdlcm:sawsdlTypeDefinitionExtension/> </typeDefinitionComponent> <typeDefinitionComponent xml:id="c44"> <name> <base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName> <base:localName>short</base:localName> </name> <system>http://www.w3.org/2001/XMLSchema</system> <sawsdlcm:sawsdlTypeDefinitionExtension/> </typeDefinitionComponent> <typeDefinitionComponent xml:id="c45"> <name> <base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName> <base:localName>string</base:localName> </name> <system>http://www.w3.org/2001/XMLSchema</system> <sawsdlcm:sawsdlTypeDefinitionExtension/> </typeDefinitionComponent> <typeDefinitionComponent xml:id="c46"> <name> <base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName> <base:localName>time</base:localName> </name> <system>http://www.w3.org/2001/XMLSchema</system> <sawsdlcm:sawsdlTypeDefinitionExtension/> </typeDefinitionComponent> <typeDefinitionComponent xml:id="c47"> <name> <base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName> <base:localName>token</base:localName> </name> <system>http://www.w3.org/2001/XMLSchema</system> <sawsdlcm:sawsdlTypeDefinitionExtension/> </typeDefinitionComponent> <typeDefinitionComponent xml:id="c48"> <name> <base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName> <base:localName>unsignedByte</base:localName> </name> <system>http://www.w3.org/2001/XMLSchema</system> <sawsdlcm:sawsdlTypeDefinitionExtension/> </typeDefinitionComponent> <typeDefinitionComponent xml:id="c49"> <name> <base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName> <base:localName>unsignedInt</base:localName> </name> <system>http://www.w3.org/2001/XMLSchema</system> <sawsdlcm:sawsdlTypeDefinitionExtension/> </typeDefinitionComponent> <typeDefinitionComponent xml:id="c50"> <name> <base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName> <base:localName>unsignedLong</base:localName> </name> <system>http://www.w3.org/2001/XMLSchema</system> <sawsdlcm:sawsdlTypeDefinitionExtension/> </typeDefinitionComponent> <typeDefinitionComponent xml:id="c51"> <name> <base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName> <base:localName>unsignedShort</base:localName> </name> <system>http://www.w3.org/2001/XMLSchema</system> <sawsdlcm:sawsdlTypeDefinitionExtension/> </typeDefinitionComponent> <typeDefinitionComponent xml:id="c52"> <name> <base:namespaceName>http://www.w3.org/2002/ws/sawsdl/spec/wsdl/order#</base:namespaceName> <base:localName>confirmation</base:localName> </name> <system>http://www.w3.org/2001/XMLSchema</system> <sawsdlcm:sawsdlTypeDefinitionExtension/> </typeDefinitionComponent> <typeDefinitionComponent xml:id="c53"> <name> <base:namespaceName>http://www.w3.org/2002/ws/sawsdl/spec/wsdl/order#</base:namespaceName> <base:localName>item</base:localName> </name> <system>http://www.w3.org/2001/XMLSchema</system> <sawsdlcm:sawsdlTypeDefinitionExtension> <sawsdlcm:modelReference> <base:uri>http://www.w3.org/2002/ws/sawsdl/spec/ontology/purchaseorder#Item</base:uri> </sawsdlcm:modelReference> </sawsdlcm:sawsdlTypeDefinitionExtension> </typeDefinitionComponent> <typeDefinitionComponent xml:id="c54"> <name> <base:namespaceName>http://www.w3.org/2002/ws/sawsdl/spec/wsdl/order#</base:namespaceName> <base:localName>OrderRequestType</base:localName> </name> <system>http://www.w3.org/2001/XMLSchema</system> <sawsdlcm:sawsdlTypeDefinitionExtension> <sawsdlcm:modelReference> <base:uri>http://www.w3.org/2002/ws/sawsdl/spec/ontology/purchaseorder#OrderRequest</base:uri> <base:uri/> <base:uri/> <base:uri/> <base:uri/> <base:uri/> <base:uri/> <base:uri/> <base:uri/> <base:uri/> <base:uri/> <base:uri/> <base:uri/> <base:uri/> <base:uri/> <base:uri/> <base:uri/> <base:uri/> <base:uri/> <base:uri/> <base:uri/> <base:uri/> <base:uri/> <base:uri/> <base:uri/> <base:uri/> <base:uri/> <base:uri/> <base:uri/> <base:uri/> <base:uri/> <base:uri/> <base:uri/> <base:uri/> <base:uri>http://example.org/typeAnnotation</base:uri> </sawsdlcm:modelReference> </sawsdlcm:sawsdlTypeDefinitionExtension> </typeDefinitionComponent> </typeDefinitions> </descriptionComponent> Index: 06-complextype-annotation.canonical.wsdlcm =================================================================== RCS file: /sources/public/2002/ws/desc/test-suite/results/Baseline/SAWSDL-6G/06-complextype-annotation.canonical.wsdlcm,v retrieving revision 1.2 retrieving revision 1.3 diff -C 2 -d -r1.2 -r1.3 *** 06-complextype-annotation.canonical.wsdlcm 23 Mar 2007 05:52:21 -0000 1.2 --- 06-complextype-annotation.canonical.wsdlcm 27 May 2007 15:00:15 -0000 1.3 *************** *** 63,67 **** </name> <system>http://www.w3.org/2001/XMLSchema</system> ! <sawsdlcm:sawsdlElementDeclarationExtension/> </elementDeclarationComponent> <elementDeclarationComponent xml:id="c7"> --- 63,71 ---- </name> <system>http://www.w3.org/2001/XMLSchema</system> ! <sawsdlcm:sawsdlElementDeclarationExtension> ! <sawsdlcm:modelReference> ! <base:uri>http://www.w3.org/2002/ws/sawsdl/spec/ontology/purchaseorder#OrderRequest</base:uri> ! </sawsdlcm:modelReference> ! </sawsdlcm:sawsdlElementDeclarationExtension> </elementDeclarationComponent> <elementDeclarationComponent xml:id="c7"> *************** *** 447,450 **** --- 451,466 ---- </sawsdlcm:sawsdlTypeDefinitionExtension> </typeDefinitionComponent> + <typeDefinitionComponent xml:id="c54"> + <name> + <base:namespaceName>http://www.w3.org/2002/ws/sawsdl/spec/wsdl/order#</base:namespaceName> + <base:localName>OrderRequestType</base:localName> + </name> + <system>http://www.w3.org/2001/XMLSchema</system> + <sawsdlcm:sawsdlTypeDefinitionExtension> + <sawsdlcm:modelReference> + <base:uri>http://www.w3.org/2002/ws/sawsdl/spec/ontology/purchaseorder#OrderRequest</base:uri> + </sawsdlcm:modelReference> + </sawsdlcm:sawsdlTypeDefinitionExtension> + </typeDefinitionComponent> </typeDefinitions> </descriptionComponent>
Received on Sunday, 27 May 2007 15:00:20 UTC