2002/ws/desc/test-suite/results/Baseline/Import-2G XSDImport2.canonical.wsdlcm,1.2,1.3

Update of /sources/public/2002/ws/desc/test-suite/results/Baseline/Import-2G
In directory hutz:/tmp/cvs-serv22819/test-suite/results/Baseline/Import-2G

Modified Files:
	XSDImport2.canonical.wsdlcm 
Log Message:
Fixed bug in baseline - equivalent components must be collapsed.

Index: XSDImport2.canonical.wsdlcm
===================================================================
RCS file: /sources/public/2002/ws/desc/test-suite/results/Baseline/Import-2G/XSDImport2.canonical.wsdlcm,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** XSDImport2.canonical.wsdlcm	16 May 2006 21:48:10 -0000	1.2
--- XSDImport2.canonical.wsdlcm	17 May 2006 04:41:07 -0000	1.3
***************
*** 1,62 ****
  <?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://example.org/XSDImport</namespaceName>
! <localName>Names</localName>
! </name>
! <interfaceOperations><interfaceOperationComponent xml:id="c3">
! <name>
! <namespaceName>http://example.org/XSDImport</namespaceName>
! <localName>getNameFromSIN</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>#element</messageContentModel>
! <elementDeclaration ref="c11">
! </elementDeclaration>
! <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://example.org/XSDImport</namespaceName>
  <localName>Names</localName>
  </name>
! <interfaceOperations><interfaceOperationComponent xml:id="c7">
! <name>
! <namespaceName>http://example.org/XSDImport</namespaceName>
! <localName>getNameFromSIN</localName>
! </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="c11">
! </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://example.org/name</namespaceName>
--- 1,47 ----
  <?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://example.org/XSDImport</namespaceName>
  <localName>Names</localName>
  </name>
! <interfaceOperations>
! <interfaceOperationComponent xml:id="c3">
!   <name>
!   <namespaceName>http://example.org/XSDImport</namespaceName>
!   <localName>getNameFromSIN</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>#element</messageContentModel>
!   <elementDeclaration
!   ref="c7"> </elementDeclaration>
!   <parent ref="c3"
!   />
!   </interfaceMessageReferenceComponent>
!   <interfaceMessageReferenceComponent
!   xml:id="c5">
!   <messageLabel>Out</messageLabel>
!   <direction>out</direction>
!   <messageContentModel>#element</messageContentModel>
!   <elementDeclaration
!   ref="c6"> </elementDeclaration>
!   <parent ref="c3"
!   />
!   </interfaceMessageReferenceComponent>
!   </interfaceMessageReferences>
!   <parent ref="c2"/>
! </interfaceOperationComponent>
! </interfaceOperations>
! </interfaceComponent>
! </interfaces>
! <elementDeclarations>
! <elementDeclarationComponent xml:id="c6">
  <name>
  <namespaceName>http://example.org/name</namespaceName>
***************
*** 64,68 ****
  </name>
  <system>http://www.w3.org/2001/XMLSchema</system>
! </elementDeclarationComponent><elementDeclarationComponent xml:id="c11">
  <name>
  <namespaceName>http://example.org/name</namespaceName>
--- 49,54 ----
  </name>
  <system>http://www.w3.org/2001/XMLSchema</system>
! </elementDeclarationComponent>
! <elementDeclarationComponent xml:id="c7">
  <name>
  <namespaceName>http://example.org/name</namespaceName>
***************
*** 70,75 ****
  </name>
  <system>http://www.w3.org/2001/XMLSchema</system>
! </elementDeclarationComponent></elementDeclarations>
! <typeDefinitions><typeDefinitionComponent xml:id="c12">
  <name>
  <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
--- 56,63 ----
  </name>
  <system>http://www.w3.org/2001/XMLSchema</system>
! </elementDeclarationComponent>
! </elementDeclarations>
! <typeDefinitions>
! <typeDefinitionComponent xml:id="c8">
  <name>
  <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
***************
*** 77,81 ****
  </name>
  <system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c13">
  <name>
  <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
--- 65,70 ----
  </name>
  <system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent>
! <typeDefinitionComponent xml:id="c9">
  <name>
  <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
***************
*** 83,87 ****
  </name>
  <system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c14">
  <name>
  <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
--- 72,77 ----
  </name>
  <system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent>
! <typeDefinitionComponent xml:id="c10">
  <name>
  <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
***************
*** 89,93 ****
  </name>
  <system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c15">
  <name>
  <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
--- 79,84 ----
  </name>
  <system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent>
! <typeDefinitionComponent xml:id="c11">
  <name>
  <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
***************
*** 95,99 ****
  </name>
  <system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c16">
  <name>
  <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
--- 86,91 ----
  </name>
  <system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent>
! <typeDefinitionComponent xml:id="c12">
  <name>
  <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
***************
*** 101,105 ****
  </name>
  <system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c17">
  <name>
  <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
--- 93,98 ----
  </name>
  <system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent>
! <typeDefinitionComponent xml:id="c13">
  <name>
  <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
***************
*** 107,111 ****
  </name>
  <system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c18">
  <name>
  <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
--- 100,105 ----
  </name>
  <system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent>
! <typeDefinitionComponent xml:id="c14">
  <name>
  <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
***************
*** 113,117 ****
  </name>
  <system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c19">
  <name>
  <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
--- 107,112 ----
  </name>
  <system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent>
! <typeDefinitionComponent xml:id="c15">
  <name>
  <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
***************
*** 119,123 ****
  </name>
  <system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c20">
  <name>
  <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
--- 114,119 ----
  </name>
  <system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent>
! <typeDefinitionComponent xml:id="c16">
  <name>
  <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
***************
*** 125,129 ****
  </name>
  <system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c21">
  <name>
  <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
--- 121,126 ----
  </name>
  <system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent>
! <typeDefinitionComponent xml:id="c17">
  <name>
  <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
***************
*** 131,135 ****
  </name>
  <system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c22">
  <name>
  <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
--- 128,133 ----
  </name>
  <system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent>
! <typeDefinitionComponent xml:id="c18">
  <name>
  <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
***************
*** 137,141 ****
  </name>
  <system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c23">
  <name>
  <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
--- 135,140 ----
  </name>
  <system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent>
! <typeDefinitionComponent xml:id="c19">
  <name>
  <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
***************
*** 143,147 ****
  </name>
  <system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c24">
  <name>
  <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
--- 142,147 ----
  </name>
  <system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent>
! <typeDefinitionComponent xml:id="c20">
  <name>
  <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
***************
*** 149,153 ****
  </name>
  <system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c25">
  <name>
  <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
--- 149,154 ----
  </name>
  <system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent>
! <typeDefinitionComponent xml:id="c21">
  <name>
  <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
***************
*** 155,159 ****
  </name>
  <system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c26">
  <name>
  <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
--- 156,161 ----
  </name>
  <system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent>
! <typeDefinitionComponent xml:id="c22">
  <name>
  <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
***************
*** 161,165 ****
  </name>
  <system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c27">
  <name>
  <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
--- 163,168 ----
  </name>
  <system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent>
! <typeDefinitionComponent xml:id="c23">
  <name>
  <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
***************
*** 167,171 ****
  </name>
  <system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c28">
  <name>
  <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
--- 170,175 ----
  </name>
  <system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent>
! <typeDefinitionComponent xml:id="c24">
  <name>
  <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
***************
*** 173,177 ****
  </name>
  <system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c29">
  <name>
  <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
--- 177,182 ----
  </name>
  <system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent>
! <typeDefinitionComponent xml:id="c25">
  <name>
  <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
***************
*** 179,183 ****
  </name>
  <system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c30">
  <name>
  <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
--- 184,189 ----
  </name>
  <system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent>
! <typeDefinitionComponent xml:id="c26">
  <name>
  <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
***************
*** 185,189 ****
  </name>
  <system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c31">
  <name>
  <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
--- 191,196 ----
  </name>
  <system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent>
! <typeDefinitionComponent xml:id="c27">
  <name>
  <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
***************
*** 191,195 ****
  </name>
  <system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c32">
  <name>
  <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
--- 198,203 ----
  </name>
  <system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent>
! <typeDefinitionComponent xml:id="c28">
  <name>
  <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
***************
*** 197,201 ****
  </name>
  <system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c33">
  <name>
  <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
--- 205,210 ----
  </name>
  <system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent>
! <typeDefinitionComponent xml:id="c29">
  <name>
  <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
***************
*** 203,207 ****
  </name>
  <system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c34">
  <name>
  <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
--- 212,217 ----
  </name>
  <system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent>
! <typeDefinitionComponent xml:id="c30">
  <name>
  <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
***************
*** 209,213 ****
  </name>
  <system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c35">
  <name>
  <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
--- 219,224 ----
  </name>
  <system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent>
! <typeDefinitionComponent xml:id="c31">
  <name>
  <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
***************
*** 215,219 ****
  </name>
  <system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c36">
  <name>
  <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
--- 226,231 ----
  </name>
  <system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent>
! <typeDefinitionComponent xml:id="c32">
  <name>
  <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
***************
*** 221,225 ****
  </name>
  <system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c37">
  <name>
  <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
--- 233,238 ----
  </name>
  <system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent>
! <typeDefinitionComponent xml:id="c33">
  <name>
  <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
***************
*** 227,231 ****
  </name>
  <system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c38">
  <name>
  <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
--- 240,245 ----
  </name>
  <system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent>
! <typeDefinitionComponent xml:id="c34">
  <name>
  <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
***************
*** 233,237 ****
  </name>
  <system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c39">
  <name>
  <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
--- 247,252 ----
  </name>
  <system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent>
! <typeDefinitionComponent xml:id="c35">
  <name>
  <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
***************
*** 239,243 ****
  </name>
  <system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c40">
  <name>
  <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
--- 254,259 ----
  </name>
  <system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent>
! <typeDefinitionComponent xml:id="c36">
  <name>
  <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
***************
*** 245,249 ****
  </name>
  <system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c41">
  <name>
  <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
--- 261,266 ----
  </name>
  <system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent>
! <typeDefinitionComponent xml:id="c37">
  <name>
  <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
***************
*** 251,255 ****
  </name>
  <system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c42">
  <name>
  <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
--- 268,273 ----
  </name>
  <system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent>
! <typeDefinitionComponent xml:id="c38">
  <name>
  <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
***************
*** 257,261 ****
  </name>
  <system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c43">
  <name>
  <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
--- 275,280 ----
  </name>
  <system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent>
! <typeDefinitionComponent xml:id="c39">
  <name>
  <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
***************
*** 263,267 ****
  </name>
  <system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c44">
  <name>
  <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
--- 282,287 ----
  </name>
  <system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent>
! <typeDefinitionComponent xml:id="c40">
  <name>
  <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
***************
*** 269,273 ****
  </name>
  <system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c45">
  <name>
  <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
--- 289,294 ----
  </name>
  <system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent>
! <typeDefinitionComponent xml:id="c41">
  <name>
  <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
***************
*** 275,279 ****
  </name>
  <system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c46">
  <name>
  <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
--- 296,301 ----
  </name>
  <system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent>
! <typeDefinitionComponent xml:id="c42">
  <name>
  <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
***************
*** 281,285 ****
  </name>
  <system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c47">
  <name>
  <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
--- 303,308 ----
  </name>
  <system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent>
! <typeDefinitionComponent xml:id="c43">
  <name>
  <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
***************
*** 287,291 ****
  </name>
  <system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c48">
  <name>
  <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
--- 310,315 ----
  </name>
  <system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent>
! <typeDefinitionComponent xml:id="c44">
  <name>
  <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
***************
*** 293,297 ****
  </name>
  <system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c49">
  <name>
  <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
--- 317,322 ----
  </name>
  <system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent>
! <typeDefinitionComponent xml:id="c45">
  <name>
  <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
***************
*** 299,303 ****
  </name>
  <system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c50">
  <name>
  <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
--- 324,329 ----
  </name>
  <system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent>
! <typeDefinitionComponent xml:id="c46">
  <name>
  <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
***************
*** 305,309 ****
  </name>
  <system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c51">
  <name>
  <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
--- 331,336 ----
  </name>
  <system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent>
! <typeDefinitionComponent xml:id="c47">
  <name>
  <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
***************
*** 311,315 ****
  </name>
  <system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c52">
  <name>
  <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
--- 338,343 ----
  </name>
  <system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent>
! <typeDefinitionComponent xml:id="c48">
  <name>
  <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
***************
*** 317,321 ****
  </name>
  <system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c53">
  <name>
  <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
--- 345,350 ----
  </name>
  <system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent>
! <typeDefinitionComponent xml:id="c49">
  <name>
  <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
***************
*** 323,327 ****
  </name>
  <system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c54">
  <name>
  <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
--- 352,357 ----
  </name>
  <system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent>
! <typeDefinitionComponent xml:id="c50">
  <name>
  <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
***************
*** 329,333 ****
  </name>
  <system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c55">
  <name>
  <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
--- 359,364 ----
  </name>
  <system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent>
! <typeDefinitionComponent xml:id="c51">
  <name>
  <namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
***************
*** 335,338 ****
  </name>
  <system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent></typeDefinitions>
! </descriptionComponent>
\ No newline at end of file
--- 366,370 ----
  </name>
  <system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent>
! </typeDefinitions>
! </descriptionComponent>

Received on Wednesday, 17 May 2006 04:41:17 UTC