- From: Jonathan Marsh via cvs-syncmail <cvsmail@w3.org>
- Date: Tue, 09 May 2006 02:51:55 +0000
- To: public-ws-desc-eds@w3.org
Update of /sources/public/2002/ws/desc/test-suite/results/wsdl-xslt/ImportedWSDL-1G In directory hutz:/tmp/cvs-serv1540/test-suite/results/wsdl-xslt/ImportedWSDL-1G Modified Files: updateDetails.canonical.wsdlcm updateDetails-results.xml updateDetails.wsdlcm retrieveDetails.canonical.wsdlcm Log Message: wsdl-xslt updated results, canonicalization improvements, new summary. Index: updateDetails.wsdlcm =================================================================== RCS file: /sources/public/2002/ws/desc/test-suite/results/wsdl-xslt/ImportedWSDL-1G/updateDetails.wsdlcm,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** updateDetails.wsdlcm 8 May 2006 16:56:58 -0000 1.2 --- updateDetails.wsdlcm 9 May 2006 02:51:53 -0000 1.3 *************** *** 9,13 **** <localName>updateDetailsInterface</localName> </name> ! <extendedInterfaces>todo</extendedInterfaces> <interfaceOperations> <interfaceOperationComponent xml:id="IDA3AOP"> --- 9,15 ---- <localName>updateDetailsInterface</localName> </name> ! <extendedInterfaces> ! <interface ref="IDAERQP" /> ! </extendedInterfaces> <interfaceOperations> <interfaceOperationComponent xml:id="IDA3AOP"> *************** *** 22,26 **** <direction>in</direction> <messageContentModel>#element</messageContentModel> ! <elementDeclaration ref="" /> <parent ref="IDA3AOP" /> </interfaceMessageReferenceComponent> --- 24,28 ---- <direction>in</direction> <messageContentModel>#element</messageContentModel> ! <elementDeclaration ref="IDARQQP" /> <parent ref="IDA3AOP" /> </interfaceMessageReferenceComponent> *************** *** 29,33 **** <direction>out</direction> <messageContentModel>#element</messageContentModel> ! <elementDeclaration ref="" /> <parent ref="IDA3AOP" /> </interfaceMessageReferenceComponent> --- 31,35 ---- <direction>out</direction> <messageContentModel>#element</messageContentModel> ! <elementDeclaration ref="IDARQQP" /> <parent ref="IDA3AOP" /> </interfaceMessageReferenceComponent> *************** *** 37,42 **** --- 39,82 ---- </interfaceOperations> </interfaceComponent> + <interfaceComponent xml:id="IDAERQP"> + <name> + <namespaceName>http://greath.example.com/2004/services/retrieveDetails</namespaceName> + <localName>retrieveDetailsInterface</localName> + </name> + <interfaceOperations> + <interfaceOperationComponent xml:id="IDAGRQP"> + <name> + <namespaceName>http://greath.example.com/2004/services/retrieveDetails</namespaceName> + <localName>retrieve</localName> + </name> + <messageExchangePattern>http://www.w3.org/2006/01/wsdl/in-out</messageExchangePattern> + <interfaceMessageReferences> + <interfaceMessageReferenceComponent xml:id="IDAJRQP"> + <messageLabel>In</messageLabel> + <direction>in</direction> + <messageContentModel>#none</messageContentModel> + <parent ref="IDAGRQP" /> + </interfaceMessageReferenceComponent> + <interfaceMessageReferenceComponent xml:id="IDAMRQP"> + <messageLabel>Out</messageLabel> + <direction>out</direction> + <messageContentModel>#element</messageContentModel> + <elementDeclaration ref="IDARQQP" /> + <parent ref="IDAGRQP" /> + </interfaceMessageReferenceComponent> + </interfaceMessageReferences> + <parent ref="IDAERQP" /> + </interfaceOperationComponent> + </interfaceOperations> + </interfaceComponent> </interfaces> <elementDeclarations> + <elementDeclarationComponent xml:id="IDARQQP"> + <name> + <namespaceName>http://greath.example.com/2004/schemas/reservationDetails</namespaceName> + <localName>reservationDetails</localName> + </name> + <system>http://www.w3.org/2001/XMLSchema</system> + </elementDeclarationComponent> </elementDeclarations> <typeDefinitions> Index: updateDetails-results.xml =================================================================== RCS file: /sources/public/2002/ws/desc/test-suite/results/wsdl-xslt/ImportedWSDL-1G/updateDetails-results.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** updateDetails-results.xml 4 May 2006 03:19:37 -0000 1.1 --- updateDetails-results.xml 9 May 2006 02:51:53 -0000 1.2 *************** *** 2,157 **** <?xml-stylesheet type="text/xsl" href="../../results.xsl"?> <comparing aspirant="updateDetails.canonical.wsdlcm" archetype="../../Baseline/ImportedWSDL-1G/updateDetails.canonical.wsdlcm" source="../../../documents/good/ImportedWSDL-1G/updateDetails.wsdl"> - <failure xpath="/descriptionComponent/interfaces"> - <p>Different number of children (Expected 2 found 1).</p> - </failure> - <failure xpath="/descriptionComponent/interfaces/interfaceComponent"> - <p>Different number of children (Expected 2 found 3).</p> - </failure> - <failure xpath="/descriptionComponent/interfaces/interfaceComponent/name/namespaceName"> - <p>Element "namespaceName" value mismatch (found "http://greath.example.com/2004/services/updateDetails", expected "http://greath.example.com/2004/services/retrieveDetails").</p> - </failure> - <failure xpath="/descriptionComponent/interfaces/interfaceComponent/name/localName"> - <p>Element "localName" value mismatch (found "updateDetailsInterface", expected "retrieveDetailsInterface").</p> - </failure> - <failure xpath="/descriptionComponent/interfaces/interfaceComponent/extendedInterfaces"> - <p>Expected element "interfaceOperations" in namespace "http://www.w3.org/2002/ws/desc/wsdl/component", found element "extendedInterfaces" in namespace "http://www.w3.org/2002/ws/desc/wsdl/component".</p> - </failure> - <failure xpath="/descriptionComponent/interfaces/interfaceComponent"> - <p>Missing element "interfaceComponent" in namespace "http://www.w3.org/2002/ws/desc/wsdl/component".</p> - </failure> - <failure xpath="/descriptionComponent/elementDeclarations"> - <p>Different number of children (Expected 1 found 0).</p> - </failure> - <failure xpath="/descriptionComponent/elementDeclarations/elementDeclarationComponent"> - <p>Missing element "elementDeclarationComponent" in namespace "http://www.w3.org/2002/ws/desc/wsdl/component".</p> - </failure> - <failure xpath="/descriptionComponent/typeDefinitions/typeDefinitionComponent"> - <p>Attribute "xml:id" value mismatch (found "c6", expected "c11").</p> - </failure> - <failure xpath="/descriptionComponent/typeDefinitions/typeDefinitionComponent"> - <p>Attribute "xml:id" value mismatch (found "c7", expected "c12").</p> - </failure> - <failure xpath="/descriptionComponent/typeDefinitions/typeDefinitionComponent"> - <p>Attribute "xml:id" value mismatch (found "c8", expected "c13").</p> - </failure> - <failure xpath="/descriptionComponent/typeDefinitions/typeDefinitionComponent"> - <p>Attribute "xml:id" value mismatch (found "c9", expected "c14").</p> - </failure> - <failure xpath="/descriptionComponent/typeDefinitions/typeDefinitionComponent"> - <p>Attribute "xml:id" value mismatch (found "c10", expected "c15").</p> - </failure> - <failure xpath="/descriptionComponent/typeDefinitions/typeDefinitionComponent"> - <p>Attribute "xml:id" value mismatch (found "c11", expected "c16").</p> - </failure> - <failure xpath="/descriptionComponent/typeDefinitions/typeDefinitionComponent"> - <p>Attribute "xml:id" value mismatch (found "c12", expected "c17").</p> - </failure> - <failure xpath="/descriptionComponent/typeDefinitions/typeDefinitionComponent"> - <p>Attribute "xml:id" value mismatch (found "c13", expected "c18").</p> - </failure> - <failure xpath="/descriptionComponent/typeDefinitions/typeDefinitionComponent"> - <p>Attribute "xml:id" value mismatch (found "c14", expected "c19").</p> - </failure> - <failure xpath="/descriptionComponent/typeDefinitions/typeDefinitionComponent"> - <p>Attribute "xml:id" value mismatch (found "c15", expected "c20").</p> - </failure> - <failure xpath="/descriptionComponent/typeDefinitions/typeDefinitionComponent"> - <p>Attribute "xml:id" value mismatch (found "c16", expected "c21").</p> - </failure> - <failure xpath="/descriptionComponent/typeDefinitions/typeDefinitionComponent"> - <p>Attribute "xml:id" value mismatch (found "c17", expected "c22").</p> - </failure> - <failure xpath="/descriptionComponent/typeDefinitions/typeDefinitionComponent"> - <p>Attribute "xml:id" value mismatch (found "c18", expected "c23").</p> - </failure> - <failure xpath="/descriptionComponent/typeDefinitions/typeDefinitionComponent"> - <p>Attribute "xml:id" value mismatch (found "c19", expected "c24").</p> - </failure> - <failure xpath="/descriptionComponent/typeDefinitions/typeDefinitionComponent"> - <p>Attribute "xml:id" value mismatch (found "c20", expected "c25").</p> - </failure> - <failure xpath="/descriptionComponent/typeDefinitions/typeDefinitionComponent"> - <p>Attribute "xml:id" value mismatch (found "c21", expected "c26").</p> - </failure> - <failure xpath="/descriptionComponent/typeDefinitions/typeDefinitionComponent"> - <p>Attribute "xml:id" value mismatch (found "c22", expected "c27").</p> - </failure> - <failure xpath="/descriptionComponent/typeDefinitions/typeDefinitionComponent"> - <p>Attribute "xml:id" value mismatch (found "c23", expected "c28").</p> - </failure> - <failure xpath="/descriptionComponent/typeDefinitions/typeDefinitionComponent"> - <p>Attribute "xml:id" value mismatch (found "c24", expected "c29").</p> - </failure> - <failure xpath="/descriptionComponent/typeDefinitions/typeDefinitionComponent"> - <p>Attribute "xml:id" value mismatch (found "c25", expected "c30").</p> - </failure> - <failure xpath="/descriptionComponent/typeDefinitions/typeDefinitionComponent"> - <p>Attribute "xml:id" value mismatch (found "c26", expected "c31").</p> - </failure> - <failure xpath="/descriptionComponent/typeDefinitions/typeDefinitionComponent"> - <p>Attribute "xml:id" value mismatch (found "c27", expected "c32").</p> - </failure> - <failure xpath="/descriptionComponent/typeDefinitions/typeDefinitionComponent"> - <p>Attribute "xml:id" value mismatch (found "c28", expected "c33").</p> - </failure> - <failure xpath="/descriptionComponent/typeDefinitions/typeDefinitionComponent"> - <p>Attribute "xml:id" value mismatch (found "c29", expected "c34").</p> - </failure> - <failure xpath="/descriptionComponent/typeDefinitions/typeDefinitionComponent"> - <p>Attribute "xml:id" value mismatch (found "c30", expected "c35").</p> - </failure> - <failure xpath="/descriptionComponent/typeDefinitions/typeDefinitionComponent"> - <p>Attribute "xml:id" value mismatch (found "c31", expected "c36").</p> - </failure> - <failure xpath="/descriptionComponent/typeDefinitions/typeDefinitionComponent"> - <p>Attribute "xml:id" value mismatch (found "c32", expected "c37").</p> - </failure> - <failure xpath="/descriptionComponent/typeDefinitions/typeDefinitionComponent"> - <p>Attribute "xml:id" value mismatch (found "c33", expected "c38").</p> - </failure> - <failure xpath="/descriptionComponent/typeDefinitions/typeDefinitionComponent"> - <p>Attribute "xml:id" value mismatch (found "c34", expected "c39").</p> - </failure> - <failure xpath="/descriptionComponent/typeDefinitions/typeDefinitionComponent"> - <p>Attribute "xml:id" value mismatch (found "c35", expected "c40").</p> - </failure> - <failure xpath="/descriptionComponent/typeDefinitions/typeDefinitionComponent"> - <p>Attribute "xml:id" value mismatch (found "c36", expected "c41").</p> - </failure> - <failure xpath="/descriptionComponent/typeDefinitions/typeDefinitionComponent"> - <p>Attribute "xml:id" value mismatch (found "c37", expected "c42").</p> - </failure> - <failure xpath="/descriptionComponent/typeDefinitions/typeDefinitionComponent"> - <p>Attribute "xml:id" value mismatch (found "c38", expected "c43").</p> - </failure> - <failure xpath="/descriptionComponent/typeDefinitions/typeDefinitionComponent"> - <p>Attribute "xml:id" value mismatch (found "c39", expected "c44").</p> - </failure> - <failure xpath="/descriptionComponent/typeDefinitions/typeDefinitionComponent"> - <p>Attribute "xml:id" value mismatch (found "c40", expected "c45").</p> - </failure> - <failure xpath="/descriptionComponent/typeDefinitions/typeDefinitionComponent"> - <p>Attribute "xml:id" value mismatch (found "c41", expected "c46").</p> - </failure> - <failure xpath="/descriptionComponent/typeDefinitions/typeDefinitionComponent"> - <p>Attribute "xml:id" value mismatch (found "c42", expected "c47").</p> - </failure> - <failure xpath="/descriptionComponent/typeDefinitions/typeDefinitionComponent"> - <p>Attribute "xml:id" value mismatch (found "c43", expected "c48").</p> - </failure> - <failure xpath="/descriptionComponent/typeDefinitions/typeDefinitionComponent"> - <p>Attribute "xml:id" value mismatch (found "c44", expected "c49").</p> - </failure> - <failure xpath="/descriptionComponent/typeDefinitions/typeDefinitionComponent"> - <p>Attribute "xml:id" value mismatch (found "c45", expected "c50").</p> - </failure> - <failure xpath="/descriptionComponent/typeDefinitions/typeDefinitionComponent"> - <p>Attribute "xml:id" value mismatch (found "c46", expected "c51").</p> - </failure> - <failure xpath="/descriptionComponent/typeDefinitions/typeDefinitionComponent"> - <p>Attribute "xml:id" value mismatch (found "c47", expected "c52").</p> - </failure> - <failure xpath="/descriptionComponent/typeDefinitions/typeDefinitionComponent"> - <p>Attribute "xml:id" value mismatch (found "c48", expected "c53").</p> - </failure> </comparing> --- 2,4 ---- Index: retrieveDetails.canonical.wsdlcm =================================================================== RCS file: /sources/public/2002/ws/desc/test-suite/results/wsdl-xslt/ImportedWSDL-1G/retrieveDetails.canonical.wsdlcm,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** retrieveDetails.canonical.wsdlcm 8 May 2006 16:56:58 -0000 1.3 --- retrieveDetails.canonical.wsdlcm 9 May 2006 02:51:53 -0000 1.4 *************** *** 1,14 **** ! <?xml version="1.0" encoding="UTF-8"?> ! <!-- Generated by wsdl-component-model.xslt ! Jonathan Marsh, Microsoft, jmarsh@microsoft.com --> ! <descriptionComponent xml:id="c1" xmlns="http://www.w3.org/2002/ws/desc/wsdl/component"> ! <interfaces> ! <interfaceComponent xml:id="c2"> <name> <namespaceName>http://greath.example.com/2004/services/retrieveDetails</namespaceName> <localName>retrieveDetailsInterface</localName> </name> ! <interfaceOperations> ! <interfaceOperationComponent xml:id="c3"> <name> <namespaceName>http://greath.example.com/2004/services/retrieveDetails</namespaceName> --- 1,10 ---- ! <?xml version="1.0" encoding="UTF-8"?><!-- Generated by wsdl-component-model.xslt ! Jonathan Marsh, Microsoft, jmarsh@microsoft.com --><descriptionComponent xml:id="c1" xmlns="http://www.w3.org/2002/ws/desc/wsdl/component"> ! <interfaces><interfaceComponent xml:id="c2"> <name> <namespaceName>http://greath.example.com/2004/services/retrieveDetails</namespaceName> <localName>retrieveDetailsInterface</localName> </name> ! <interfaceOperations><interfaceOperationComponent xml:id="c3"> <name> <namespaceName>http://greath.example.com/2004/services/retrieveDetails</namespaceName> *************** *** 16,27 **** </name> <messageExchangePattern>http://www.w3.org/2006/01/wsdl/in-out</messageExchangePattern> ! <interfaceMessageReferences> ! <interfaceMessageReferenceComponent xml:id="c4"> <messageLabel>In</messageLabel> <direction>in</direction> <messageContentModel>#none</messageContentModel> <parent ref="c3"></parent> ! </interfaceMessageReferenceComponent> ! <interfaceMessageReferenceComponent xml:id="c5"> <messageLabel>Out</messageLabel> <direction>out</direction> --- 12,21 ---- </name> <messageExchangePattern>http://www.w3.org/2006/01/wsdl/in-out</messageExchangePattern> ! <interfaceMessageReferences><interfaceMessageReferenceComponent xml:id="c4"> <messageLabel>In</messageLabel> <direction>in</direction> <messageContentModel>#none</messageContentModel> <parent ref="c3"></parent> ! </interfaceMessageReferenceComponent><interfaceMessageReferenceComponent xml:id="c5"> <messageLabel>Out</messageLabel> <direction>out</direction> *************** *** 29,41 **** <elementDeclaration ref="c6"></elementDeclaration> <parent ref="c3"></parent> ! </interfaceMessageReferenceComponent> ! </interfaceMessageReferences> <parent ref="c2"></parent> ! </interfaceOperationComponent> ! </interfaceOperations> ! </interfaceComponent> ! </interfaces> ! <elementDeclarations> ! <elementDeclarationComponent xml:id="c6"> <name> <namespaceName>http://greath.example.com/2004/schemas/reservationDetails</namespaceName> --- 23,31 ---- <elementDeclaration ref="c6"></elementDeclaration> <parent ref="c3"></parent> ! </interfaceMessageReferenceComponent></interfaceMessageReferences> <parent ref="c2"></parent> ! </interfaceOperationComponent></interfaceOperations> ! </interfaceComponent></interfaces> ! <elementDeclarations><elementDeclarationComponent xml:id="c6"> <name> <namespaceName>http://greath.example.com/2004/schemas/reservationDetails</namespaceName> *************** *** 43,50 **** </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </elementDeclarationComponent> ! </elementDeclarations> ! <typeDefinitions> ! <typeDefinitionComponent xml:id="c7"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> --- 33,38 ---- </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </elementDeclarationComponent></elementDeclarations> ! <typeDefinitions><typeDefinitionComponent xml:id="c7"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> *************** *** 52,57 **** </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent> ! <typeDefinitionComponent xml:id="c8"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> --- 40,44 ---- </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent><typeDefinitionComponent xml:id="c8"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> *************** *** 59,64 **** </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent> ! <typeDefinitionComponent xml:id="c9"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> --- 46,50 ---- </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent><typeDefinitionComponent xml:id="c9"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> *************** *** 66,71 **** </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent> ! <typeDefinitionComponent xml:id="c10"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> --- 52,56 ---- </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent><typeDefinitionComponent xml:id="c10"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> *************** *** 73,78 **** </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent> ! <typeDefinitionComponent xml:id="c11"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> --- 58,62 ---- </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent><typeDefinitionComponent xml:id="c11"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> *************** *** 80,85 **** </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent> ! <typeDefinitionComponent xml:id="c12"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> --- 64,68 ---- </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent><typeDefinitionComponent xml:id="c12"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> *************** *** 87,92 **** </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent> ! <typeDefinitionComponent xml:id="c13"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> --- 70,74 ---- </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent><typeDefinitionComponent xml:id="c13"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> *************** *** 94,99 **** </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent> ! <typeDefinitionComponent xml:id="c14"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> --- 76,80 ---- </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent><typeDefinitionComponent xml:id="c14"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> *************** *** 101,106 **** </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent> ! <typeDefinitionComponent xml:id="c15"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> --- 82,86 ---- </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent><typeDefinitionComponent xml:id="c15"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> *************** *** 108,113 **** </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent> ! <typeDefinitionComponent xml:id="c16"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> --- 88,92 ---- </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent><typeDefinitionComponent xml:id="c16"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> *************** *** 115,120 **** </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent> ! <typeDefinitionComponent xml:id="c17"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> --- 94,98 ---- </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent><typeDefinitionComponent xml:id="c17"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> *************** *** 122,127 **** </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent> ! <typeDefinitionComponent xml:id="c18"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> --- 100,104 ---- </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent><typeDefinitionComponent xml:id="c18"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> *************** *** 129,134 **** </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent> ! <typeDefinitionComponent xml:id="c19"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> --- 106,110 ---- </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent><typeDefinitionComponent xml:id="c19"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> *************** *** 136,141 **** </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent> ! <typeDefinitionComponent xml:id="c20"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> --- 112,116 ---- </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent><typeDefinitionComponent xml:id="c20"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> *************** *** 143,148 **** </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent> ! <typeDefinitionComponent xml:id="c21"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> --- 118,122 ---- </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent><typeDefinitionComponent xml:id="c21"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> *************** *** 150,155 **** </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent> ! <typeDefinitionComponent xml:id="c22"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> --- 124,128 ---- </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent><typeDefinitionComponent xml:id="c22"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> *************** *** 157,162 **** </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent> ! <typeDefinitionComponent xml:id="c23"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> --- 130,134 ---- </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent><typeDefinitionComponent xml:id="c23"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> *************** *** 164,169 **** </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent> ! <typeDefinitionComponent xml:id="c24"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> --- 136,140 ---- </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent><typeDefinitionComponent xml:id="c24"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> *************** *** 171,176 **** </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent> ! <typeDefinitionComponent xml:id="c25"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> --- 142,146 ---- </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent><typeDefinitionComponent xml:id="c25"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> *************** *** 178,183 **** </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent> ! <typeDefinitionComponent xml:id="c26"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> --- 148,152 ---- </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent><typeDefinitionComponent xml:id="c26"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> *************** *** 185,190 **** </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent> ! <typeDefinitionComponent xml:id="c27"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> --- 154,158 ---- </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent><typeDefinitionComponent xml:id="c27"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> *************** *** 192,197 **** </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent> ! <typeDefinitionComponent xml:id="c28"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> --- 160,164 ---- </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent><typeDefinitionComponent xml:id="c28"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> *************** *** 199,204 **** </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent> ! <typeDefinitionComponent xml:id="c29"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> --- 166,170 ---- </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent><typeDefinitionComponent xml:id="c29"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> *************** *** 206,211 **** </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent> ! <typeDefinitionComponent xml:id="c30"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> --- 172,176 ---- </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent><typeDefinitionComponent xml:id="c30"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> *************** *** 213,218 **** </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent> ! <typeDefinitionComponent xml:id="c31"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> --- 178,182 ---- </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent><typeDefinitionComponent xml:id="c31"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> *************** *** 220,225 **** </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent> ! <typeDefinitionComponent xml:id="c32"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> --- 184,188 ---- </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent><typeDefinitionComponent xml:id="c32"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> *************** *** 227,232 **** </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent> ! <typeDefinitionComponent xml:id="c33"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> --- 190,194 ---- </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent><typeDefinitionComponent xml:id="c33"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> *************** *** 234,239 **** </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent> ! <typeDefinitionComponent xml:id="c34"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> --- 196,200 ---- </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent><typeDefinitionComponent xml:id="c34"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> *************** *** 241,246 **** </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent> ! <typeDefinitionComponent xml:id="c35"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> --- 202,206 ---- </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent><typeDefinitionComponent xml:id="c35"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> *************** *** 248,253 **** </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent> ! <typeDefinitionComponent xml:id="c36"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> --- 208,212 ---- </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent><typeDefinitionComponent xml:id="c36"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> *************** *** 255,260 **** </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent> ! <typeDefinitionComponent xml:id="c37"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> --- 214,218 ---- </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent><typeDefinitionComponent xml:id="c37"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> *************** *** 262,267 **** </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent> ! <typeDefinitionComponent xml:id="c38"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> --- 220,224 ---- </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent><typeDefinitionComponent xml:id="c38"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> *************** *** 269,274 **** </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent> ! <typeDefinitionComponent xml:id="c39"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> --- 226,230 ---- </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent><typeDefinitionComponent xml:id="c39"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> *************** *** 276,281 **** </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent> ! <typeDefinitionComponent xml:id="c40"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> --- 232,236 ---- </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent><typeDefinitionComponent xml:id="c40"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> *************** *** 283,288 **** </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent> ! <typeDefinitionComponent xml:id="c41"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> --- 238,242 ---- </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent><typeDefinitionComponent xml:id="c41"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> *************** *** 290,295 **** </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent> ! <typeDefinitionComponent xml:id="c42"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> --- 244,248 ---- </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent><typeDefinitionComponent xml:id="c42"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> *************** *** 297,302 **** </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent> ! <typeDefinitionComponent xml:id="c43"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> --- 250,254 ---- </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent><typeDefinitionComponent xml:id="c43"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> *************** *** 304,309 **** </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent> ! <typeDefinitionComponent xml:id="c44"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> --- 256,260 ---- </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent><typeDefinitionComponent xml:id="c44"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> *************** *** 311,316 **** </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent> ! <typeDefinitionComponent xml:id="c45"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> --- 262,266 ---- </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent><typeDefinitionComponent xml:id="c45"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> *************** *** 318,323 **** </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent> ! <typeDefinitionComponent xml:id="c46"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> --- 268,272 ---- </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent><typeDefinitionComponent xml:id="c46"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> *************** *** 325,330 **** </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent> ! <typeDefinitionComponent xml:id="c47"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> --- 274,278 ---- </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent><typeDefinitionComponent xml:id="c47"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> *************** *** 332,337 **** </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent> ! <typeDefinitionComponent xml:id="c48"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> --- 280,284 ---- </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent><typeDefinitionComponent xml:id="c48"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> *************** *** 339,344 **** </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent> ! <typeDefinitionComponent xml:id="c49"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> --- 286,290 ---- </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent><typeDefinitionComponent xml:id="c49"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> *************** *** 346,350 **** </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent> ! </typeDefinitions> ! </descriptionComponent> --- 292,295 ---- </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent></typeDefinitions> ! </descriptionComponent> \ No newline at end of file Index: updateDetails.canonical.wsdlcm =================================================================== RCS file: /sources/public/2002/ws/desc/test-suite/results/wsdl-xslt/ImportedWSDL-1G/updateDetails.canonical.wsdlcm,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** updateDetails.canonical.wsdlcm 8 May 2006 16:56:58 -0000 1.2 --- updateDetails.canonical.wsdlcm 9 May 2006 02:51:53 -0000 1.3 *************** *** 1,15 **** ! <?xml version="1.0" encoding="UTF-8"?> ! <!-- Generated by wsdl-component-model.xslt ! Jonathan Marsh, Microsoft, jmarsh@microsoft.com --> ! <descriptionComponent xml:id="c1" xmlns="http://www.w3.org/2002/ws/desc/wsdl/component"> ! <interfaces> ! <interfaceComponent xml:id="c2"> <name> <namespaceName>http://greath.example.com/2004/services/updateDetails</namespaceName> <localName>updateDetailsInterface</localName> </name> ! <extendedInterfaces></extendedInterfaces> ! <interfaceOperations> ! <interfaceOperationComponent xml:id="c3"> <name> <namespaceName>http://greath.example.com/2004/services/updateDetails</namespaceName> --- 1,36 ---- ! <?xml version="1.0" encoding="UTF-8"?><!-- Generated by wsdl-component-model.xslt ! Jonathan Marsh, Microsoft, jmarsh@microsoft.com --><descriptionComponent xml:id="c1" xmlns="http://www.w3.org/2002/ws/desc/wsdl/component"> ! <interfaces><interfaceComponent xml:id="c2"> ! <name> ! <namespaceName>http://greath.example.com/2004/services/retrieveDetails</namespaceName> ! <localName>retrieveDetailsInterface</localName> ! </name> ! <interfaceOperations><interfaceOperationComponent xml:id="c3"> ! <name> ! <namespaceName>http://greath.example.com/2004/services/retrieveDetails</namespaceName> ! <localName>retrieve</localName> ! </name> ! <messageExchangePattern>http://www.w3.org/2006/01/wsdl/in-out</messageExchangePattern> ! <interfaceMessageReferences><interfaceMessageReferenceComponent xml:id="c4"> ! <messageLabel>In</messageLabel> ! <direction>in</direction> ! <messageContentModel>#none</messageContentModel> ! <parent ref="c3"></parent> ! </interfaceMessageReferenceComponent><interfaceMessageReferenceComponent xml:id="c5"> ! <messageLabel>Out</messageLabel> ! <direction>out</direction> ! <messageContentModel>#element</messageContentModel> ! <elementDeclaration ref="c10"></elementDeclaration> ! <parent ref="c3"></parent> ! </interfaceMessageReferenceComponent></interfaceMessageReferences> ! <parent ref="c2"></parent> ! </interfaceOperationComponent></interfaceOperations> ! </interfaceComponent><interfaceComponent xml:id="c6"> <name> <namespaceName>http://greath.example.com/2004/services/updateDetails</namespaceName> <localName>updateDetailsInterface</localName> </name> ! <extendedInterfaces><interface ref="c2"></interface></extendedInterfaces> ! <interfaceOperations><interfaceOperationComponent xml:id="c7"> <name> <namespaceName>http://greath.example.com/2004/services/updateDetails</namespaceName> *************** *** 17,44 **** </name> <messageExchangePattern>http://www.w3.org/2006/01/wsdl/in-out</messageExchangePattern> ! <interfaceMessageReferences> ! <interfaceMessageReferenceComponent xml:id="c4"> <messageLabel>In</messageLabel> <direction>in</direction> <messageContentModel>#element</messageContentModel> ! <elementDeclaration></elementDeclaration> ! <parent ref="c3"></parent> ! </interfaceMessageReferenceComponent> ! <interfaceMessageReferenceComponent xml:id="c5"> <messageLabel>Out</messageLabel> <direction>out</direction> <messageContentModel>#element</messageContentModel> ! <elementDeclaration></elementDeclaration> ! <parent ref="c3"></parent> ! </interfaceMessageReferenceComponent> ! </interfaceMessageReferences> ! <parent ref="c2"></parent> ! </interfaceOperationComponent> ! </interfaceOperations> ! </interfaceComponent> ! </interfaces> ! <elementDeclarations></elementDeclarations> ! <typeDefinitions> ! <typeDefinitionComponent xml:id="c6"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> --- 38,65 ---- </name> <messageExchangePattern>http://www.w3.org/2006/01/wsdl/in-out</messageExchangePattern> ! <interfaceMessageReferences><interfaceMessageReferenceComponent xml:id="c8"> <messageLabel>In</messageLabel> <direction>in</direction> <messageContentModel>#element</messageContentModel> ! <elementDeclaration ref="c10"></elementDeclaration> ! <parent ref="c7"></parent> ! </interfaceMessageReferenceComponent><interfaceMessageReferenceComponent xml:id="c9"> <messageLabel>Out</messageLabel> <direction>out</direction> <messageContentModel>#element</messageContentModel> ! <elementDeclaration ref="c10"></elementDeclaration> ! <parent ref="c7"></parent> ! </interfaceMessageReferenceComponent></interfaceMessageReferences> ! <parent ref="c6"></parent> ! </interfaceOperationComponent></interfaceOperations> ! </interfaceComponent></interfaces> ! <elementDeclarations><elementDeclarationComponent xml:id="c10"> ! <name> ! <namespaceName>http://greath.example.com/2004/schemas/reservationDetails</namespaceName> ! <localName>reservationDetails</localName> ! </name> ! <system>http://www.w3.org/2001/XMLSchema</system> ! </elementDeclarationComponent></elementDeclarations> ! <typeDefinitions><typeDefinitionComponent xml:id="c11"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> *************** *** 46,51 **** </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent> ! <typeDefinitionComponent xml:id="c7"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> --- 67,71 ---- </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent><typeDefinitionComponent xml:id="c12"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> *************** *** 53,58 **** </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent> ! <typeDefinitionComponent xml:id="c8"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> --- 73,77 ---- </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent><typeDefinitionComponent xml:id="c13"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> *************** *** 60,65 **** </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent> ! <typeDefinitionComponent xml:id="c9"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> --- 79,83 ---- </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent><typeDefinitionComponent xml:id="c14"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> *************** *** 67,72 **** </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent> ! <typeDefinitionComponent xml:id="c10"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> --- 85,89 ---- </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent><typeDefinitionComponent xml:id="c15"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> *************** *** 74,79 **** </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent> ! <typeDefinitionComponent xml:id="c11"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> --- 91,95 ---- </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent><typeDefinitionComponent xml:id="c16"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> *************** *** 81,86 **** </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent> ! <typeDefinitionComponent xml:id="c12"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> --- 97,101 ---- </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent><typeDefinitionComponent xml:id="c17"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> *************** *** 88,93 **** </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent> ! <typeDefinitionComponent xml:id="c13"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> --- 103,107 ---- </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent><typeDefinitionComponent xml:id="c18"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> *************** *** 95,100 **** </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent> ! <typeDefinitionComponent xml:id="c14"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> --- 109,113 ---- </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent><typeDefinitionComponent xml:id="c19"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> *************** *** 102,107 **** </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent> ! <typeDefinitionComponent xml:id="c15"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> --- 115,119 ---- </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent><typeDefinitionComponent xml:id="c20"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> *************** *** 109,114 **** </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent> ! <typeDefinitionComponent xml:id="c16"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> --- 121,125 ---- </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent><typeDefinitionComponent xml:id="c21"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> *************** *** 116,121 **** </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent> ! <typeDefinitionComponent xml:id="c17"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> --- 127,131 ---- </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent><typeDefinitionComponent xml:id="c22"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> *************** *** 123,128 **** </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent> ! <typeDefinitionComponent xml:id="c18"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> --- 133,137 ---- </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent><typeDefinitionComponent xml:id="c23"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> *************** *** 130,135 **** </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent> ! <typeDefinitionComponent xml:id="c19"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> --- 139,143 ---- </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent><typeDefinitionComponent xml:id="c24"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> *************** *** 137,142 **** </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent> ! <typeDefinitionComponent xml:id="c20"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> --- 145,149 ---- </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent><typeDefinitionComponent xml:id="c25"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> *************** *** 144,149 **** </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent> ! <typeDefinitionComponent xml:id="c21"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> --- 151,155 ---- </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent><typeDefinitionComponent xml:id="c26"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> *************** *** 151,156 **** </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent> ! <typeDefinitionComponent xml:id="c22"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> --- 157,161 ---- </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent><typeDefinitionComponent xml:id="c27"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> *************** *** 158,163 **** </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent> ! <typeDefinitionComponent xml:id="c23"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> --- 163,167 ---- </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent><typeDefinitionComponent xml:id="c28"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> *************** *** 165,170 **** </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent> ! <typeDefinitionComponent xml:id="c24"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> --- 169,173 ---- </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent><typeDefinitionComponent xml:id="c29"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> *************** *** 172,177 **** </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent> ! <typeDefinitionComponent xml:id="c25"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> --- 175,179 ---- </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent><typeDefinitionComponent xml:id="c30"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> *************** *** 179,184 **** </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent> ! <typeDefinitionComponent xml:id="c26"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> --- 181,185 ---- </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent><typeDefinitionComponent xml:id="c31"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> *************** *** 186,191 **** </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent> ! <typeDefinitionComponent xml:id="c27"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> --- 187,191 ---- </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent><typeDefinitionComponent xml:id="c32"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> *************** *** 193,198 **** </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent> ! <typeDefinitionComponent xml:id="c28"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> --- 193,197 ---- </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent><typeDefinitionComponent xml:id="c33"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> *************** *** 200,205 **** </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent> ! <typeDefinitionComponent xml:id="c29"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> --- 199,203 ---- </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent><typeDefinitionComponent xml:id="c34"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> *************** *** 207,212 **** </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent> ! <typeDefinitionComponent xml:id="c30"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> --- 205,209 ---- </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent><typeDefinitionComponent xml:id="c35"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> *************** *** 214,219 **** </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent> ! <typeDefinitionComponent xml:id="c31"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> --- 211,215 ---- </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent><typeDefinitionComponent xml:id="c36"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> *************** *** 221,226 **** </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent> ! <typeDefinitionComponent xml:id="c32"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> --- 217,221 ---- </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent><typeDefinitionComponent xml:id="c37"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> *************** *** 228,233 **** </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent> ! <typeDefinitionComponent xml:id="c33"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> --- 223,227 ---- </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent><typeDefinitionComponent xml:id="c38"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> *************** *** 235,240 **** </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent> ! <typeDefinitionComponent xml:id="c34"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> --- 229,233 ---- </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent><typeDefinitionComponent xml:id="c39"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> *************** *** 242,247 **** </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent> ! <typeDefinitionComponent xml:id="c35"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> --- 235,239 ---- </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent><typeDefinitionComponent xml:id="c40"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> *************** *** 249,254 **** </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent> ! <typeDefinitionComponent xml:id="c36"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> --- 241,245 ---- </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent><typeDefinitionComponent xml:id="c41"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> *************** *** 256,261 **** </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent> ! <typeDefinitionComponent xml:id="c37"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> --- 247,251 ---- </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent><typeDefinitionComponent xml:id="c42"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> *************** *** 263,268 **** </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent> ! <typeDefinitionComponent xml:id="c38"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> --- 253,257 ---- </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent><typeDefinitionComponent xml:id="c43"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> *************** *** 270,275 **** </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent> ! <typeDefinitionComponent xml:id="c39"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> --- 259,263 ---- </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent><typeDefinitionComponent xml:id="c44"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> *************** *** 277,282 **** </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent> ! <typeDefinitionComponent xml:id="c40"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> --- 265,269 ---- </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent><typeDefinitionComponent xml:id="c45"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> *************** *** 284,289 **** </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent> ! <typeDefinitionComponent xml:id="c41"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> --- 271,275 ---- </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent><typeDefinitionComponent xml:id="c46"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> *************** *** 291,296 **** </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent> ! <typeDefinitionComponent xml:id="c42"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> --- 277,281 ---- </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent><typeDefinitionComponent xml:id="c47"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> *************** *** 298,303 **** </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent> ! <typeDefinitionComponent xml:id="c43"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> --- 283,287 ---- </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent><typeDefinitionComponent xml:id="c48"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> *************** *** 305,310 **** </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent> ! <typeDefinitionComponent xml:id="c44"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> --- 289,293 ---- </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent><typeDefinitionComponent xml:id="c49"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> *************** *** 312,317 **** </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent> ! <typeDefinitionComponent xml:id="c45"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> --- 295,299 ---- </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent><typeDefinitionComponent xml:id="c50"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> *************** *** 319,324 **** </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent> ! <typeDefinitionComponent xml:id="c46"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> --- 301,305 ---- </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent><typeDefinitionComponent xml:id="c51"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> *************** *** 326,331 **** </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent> ! <typeDefinitionComponent xml:id="c47"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> --- 307,311 ---- </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent><typeDefinitionComponent xml:id="c52"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> *************** *** 333,338 **** </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent> ! <typeDefinitionComponent xml:id="c48"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> --- 313,317 ---- </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent><typeDefinitionComponent xml:id="c53"> <name> <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName> *************** *** 340,344 **** </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent> ! </typeDefinitions> ! </descriptionComponent> --- 319,322 ---- </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent></typeDefinitions> ! </descriptionComponent> \ No newline at end of file
Received on Tuesday, 9 May 2006 02:53:03 UTC