2002/ws/desc/test-suite/results/Woden/Import-2G XSDImport.wsdlcm,1.4,1.5 XSDImport2.wsdlcm,1.4,1.5

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

Modified Files:
	XSDImport.wsdlcm XSDImport2.wsdlcm 
Log Message:
6/1 Woden results.

Index: XSDImport2.wsdlcm
===================================================================
RCS file: /sources/public/2002/ws/desc/test-suite/results/Woden/Import-2G/XSDImport2.wsdlcm,v
retrieving revision 1.4
retrieving revision 1.5
diff -C 2 -d -r1.4 -r1.5
*** XSDImport2.wsdlcm	31 May 2006 18:29:35 -0000	1.4
--- XSDImport2.wsdlcm	1 Jun 2006 21:52:52 -0000	1.5
***************
*** 6,12 ****
   xmlns:cmrpc='http://www.w3.org/2002/ws/desc/wsdl/component-rpc'
   xmlns:cmsoap='http://www.w3.org/2002/ws/desc/wsdl/component-soap'
! xml:id='id-207447226'>
    <interfaces>
!     <interfaceComponent xml:id='id-2034263226'>
        <name>
          <cmbase:namespaceName>http://example.org/XSDImport</cmbase:namespaceName>
--- 6,12 ----
   xmlns:cmrpc='http://www.w3.org/2002/ws/desc/wsdl/component-rpc'
   xmlns:cmsoap='http://www.w3.org/2002/ws/desc/wsdl/component-soap'
! xml:id='id-641477031'>
    <interfaces>
!     <interfaceComponent xml:id='id-1806920103'>
        <name>
          <cmbase:namespaceName>http://example.org/XSDImport</cmbase:namespaceName>
***************
*** 14,18 ****
        </name>
        <interfaceOperations>
!         <interfaceOperationComponent xml:id='id-2061460666'>
            <name>
              <cmbase:namespaceName>http://example.org/XSDImport</cmbase:namespaceName>
--- 14,18 ----
        </name>
        <interfaceOperations>
!         <interfaceOperationComponent xml:id='id-1828235687'>
            <name>
              <cmbase:namespaceName>http://example.org/XSDImport</cmbase:namespaceName>
***************
*** 21,40 ****
            <messageExchangePattern>http://www.w3.org/2006/01/wsdl/in-out</messageExchangePattern>
            <interfaceMessageReferences>
!             <interfaceMessageReferenceComponent xml:id='id-2073961658'>
                <messageLabel>In</messageLabel>
                <direction>in</direction>
                <messageContentModel>#element</messageContentModel>
!               <elementDeclaration ref='id-431105210'/>
!               <parent ref='id-2061460666'/>
              </interfaceMessageReferenceComponent>
!             <interfaceMessageReferenceComponent xml:id='id-2104485050'>
                <messageLabel>Out</messageLabel>
                <direction>out</direction>
                <messageContentModel>#element</messageContentModel>
!               <elementDeclaration ref='id-430777530'/>
!               <parent ref='id-2061460666'/>
              </interfaceMessageReferenceComponent>
            </interfaceMessageReferences>
!           <parent ref='id-2034263226'/>
          </interfaceOperationComponent>
        </interfaceOperations>
--- 21,40 ----
            <messageExchangePattern>http://www.w3.org/2006/01/wsdl/in-out</messageExchangePattern>
            <interfaceMessageReferences>
!             <interfaceMessageReferenceComponent xml:id='id-1816078759'>
                <messageLabel>In</messageLabel>
                <direction>in</direction>
                <messageContentModel>#element</messageContentModel>
!               <elementDeclaration ref='id-2144758183'/>
!               <parent ref='id-1828235687'/>
              </interfaceMessageReferenceComponent>
!             <interfaceMessageReferenceComponent xml:id='id-1813817767'>
                <messageLabel>Out</messageLabel>
                <direction>out</direction>
                <messageContentModel>#element</messageContentModel>
!               <elementDeclaration ref='id-2144692647'/>
!               <parent ref='id-1828235687'/>
              </interfaceMessageReferenceComponent>
            </interfaceMessageReferences>
!           <parent ref='id-1806920103'/>
          </interfaceOperationComponent>
        </interfaceOperations>
***************
*** 42,46 ****
    </interfaces>
    <elementDeclarations>
!     <elementDeclarationComponent xml:id='id-430777530'>
        <name>
          <cmbase:namespaceName>http://example.org/name</cmbase:namespaceName>
--- 42,46 ----
    </interfaces>
    <elementDeclarations>
!     <elementDeclarationComponent xml:id='id-2144692647'>
        <name>
          <cmbase:namespaceName>http://example.org/name</cmbase:namespaceName>
***************
*** 49,53 ****
        <system>http://www.w3.org/2001/XMLSchema</system>
      </elementDeclarationComponent>
!     <elementDeclarationComponent xml:id='id-431105210'>
        <name>
          <cmbase:namespaceName>http://example.org/name</cmbase:namespaceName>
--- 49,53 ----
        <system>http://www.w3.org/2001/XMLSchema</system>
      </elementDeclarationComponent>
!     <elementDeclarationComponent xml:id='id-2144758183'>
        <name>
          <cmbase:namespaceName>http://example.org/name</cmbase:namespaceName>
***************
*** 58,62 ****
    </elementDeclarations>
    <typeDefinitions>
!     <typeDefinitionComponent xml:id='id-512533690'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
--- 58,62 ----
    </elementDeclarations>
    <typeDefinitions>
!     <typeDefinitionComponent xml:id='id-2138646951'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
***************
*** 65,69 ****
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-473867450'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
--- 65,69 ----
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-2132453799'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
***************
*** 72,76 ****
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-515482810'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
--- 72,76 ----
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-2135271847'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
***************
*** 79,83 ****
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-515548346'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
--- 79,83 ----
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-2135075239'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
***************
*** 86,90 ****
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-515155130'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
--- 86,90 ----
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-2134944167'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
***************
*** 93,97 ****
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-520578234'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
--- 93,97 ----
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-2125146535'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
***************
*** 100,104 ****
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-520512698'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
--- 100,104 ----
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-2125080999'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
***************
*** 107,111 ****
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-519234746'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
--- 107,111 ----
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-2130749863'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
***************
*** 114,118 ****
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-482583738'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
--- 114,118 ----
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-2132781479'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
***************
*** 121,125 ****
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-522183866'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
--- 121,125 ----
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-2125638055'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
***************
*** 128,132 ****
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-524461242'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
--- 128,132 ----
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-2136648103'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
***************
*** 135,139 ****
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-482387130'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
--- 135,139 ----
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-2131798439'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
***************
*** 142,146 ****
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-519496890'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
--- 142,146 ----
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-2131012007'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
***************
*** 149,153 ****
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-521790650'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
--- 149,153 ----
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-2125506983'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
***************
*** 156,160 ****
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-524657850'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
--- 156,160 ----
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-2136058279'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
***************
*** 163,167 ****
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-515810490'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
--- 163,167 ----
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-2135337383'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
***************
*** 170,174 ****
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-513254586'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
--- 170,174 ----
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-2138057127'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
***************
*** 177,181 ****
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-518972602'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
--- 177,181 ----
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-2131536295'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
***************
*** 184,188 ****
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-482780346'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
--- 184,188 ----
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-2131929511'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
***************
*** 191,195 ****
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-473801914'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
--- 191,195 ----
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-2132650407'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
***************
*** 198,202 ****
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-525051066'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
--- 198,202 ----
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-2136189351'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
***************
*** 205,209 ****
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-514958522'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
--- 205,209 ----
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-2135796135'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
***************
*** 212,216 ****
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-519169210'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
--- 212,216 ----
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-2130946471'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
***************
*** 219,223 ****
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-512795834'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
--- 219,223 ----
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-2138909095'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
***************
*** 226,230 ****
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-522118330'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
--- 226,230 ----
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-2125572519'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
***************
*** 233,237 ****
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-522052794'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
--- 233,237 ----
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-2125769127'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
***************
*** 240,244 ****
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-482452666'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
--- 240,244 ----
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-2131863975'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
***************
*** 247,251 ****
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-515613882'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
--- 247,251 ----
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-2135140775'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
***************
*** 254,258 ****
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-528311482'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
--- 254,258 ----
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-2123704743'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
***************
*** 261,265 ****
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-512926906'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
--- 261,265 ----
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-2138778023'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
***************
*** 268,272 ****
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-520119482'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
--- 268,272 ----
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-2124949927'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
***************
*** 275,279 ****
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-520250554'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
--- 275,279 ----
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-2123770279'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
***************
*** 282,286 ****
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-473736378'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
--- 282,286 ----
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-2132584871'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
***************
*** 289,293 ****
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-512271546'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
--- 289,293 ----
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-2137336231'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
***************
*** 296,300 ****
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-512599226'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
--- 296,300 ----
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-2138712487'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
***************
*** 303,307 ****
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-524723386'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
--- 303,307 ----
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-2136910247'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
***************
*** 310,314 ****
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-520316090'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
--- 310,314 ----
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-2123835815'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
***************
*** 317,321 ****
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-473932986'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
--- 317,321 ----
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-2132519335'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
***************
*** 324,328 ****
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-515876026'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
--- 324,328 ----
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-2135402919'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
***************
*** 331,335 ****
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-513516730'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
--- 331,335 ----
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-2138319271'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
***************
*** 338,342 ****
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-525313210'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
--- 338,342 ----
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-2136451495'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
***************
*** 345,349 ****
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-515286202'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
--- 345,349 ----
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-2135861671'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
***************
*** 352,356 ****
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-515679418'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
--- 352,356 ----
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-2136517031'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
***************
*** 359,363 ****
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-522577082'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
--- 359,363 ----
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-2135730599'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>

Index: XSDImport.wsdlcm
===================================================================
RCS file: /sources/public/2002/ws/desc/test-suite/results/Woden/Import-2G/XSDImport.wsdlcm,v
retrieving revision 1.4
retrieving revision 1.5
diff -C 2 -d -r1.4 -r1.5
*** XSDImport.wsdlcm	31 May 2006 18:29:35 -0000	1.4
--- XSDImport.wsdlcm	1 Jun 2006 21:52:52 -0000	1.5
***************
*** 6,12 ****
   xmlns:cmrpc='http://www.w3.org/2002/ws/desc/wsdl/component-rpc'
   xmlns:cmsoap='http://www.w3.org/2002/ws/desc/wsdl/component-soap'
! xml:id='id-112747708'>
    <interfaces>
!     <interfaceComponent xml:id='id-400319674'>
        <name>
          <cmbase:namespaceName>http://example.org/XSDImport</cmbase:namespaceName>
--- 6,12 ----
   xmlns:cmrpc='http://www.w3.org/2002/ws/desc/wsdl/component-rpc'
   xmlns:cmsoap='http://www.w3.org/2002/ws/desc/wsdl/component-soap'
! xml:id='id-621472166'>
    <interfaces>
!     <interfaceComponent xml:id='id-1626581415'>
        <name>
          <cmbase:namespaceName>http://example.org/XSDImport</cmbase:namespaceName>
***************
*** 14,18 ****
        </name>
        <interfaceOperations>
!         <interfaceOperationComponent xml:id='id-678896826'>
            <name>
              <cmbase:namespaceName>http://example.org/XSDImport</cmbase:namespaceName>
--- 14,18 ----
        </name>
        <interfaceOperations>
!         <interfaceOperationComponent xml:id='id-1623402919'>
            <name>
              <cmbase:namespaceName>http://example.org/XSDImport</cmbase:namespaceName>
***************
*** 21,40 ****
            <messageExchangePattern>http://www.w3.org/2006/01/wsdl/in-out</messageExchangePattern>
            <interfaceMessageReferences>
!             <interfaceMessageReferenceComponent xml:id='id-687432890'>
                <messageLabel>In</messageLabel>
                <direction>in</direction>
                <messageContentModel>#element</messageContentModel>
!               <elementDeclaration ref='id-1063429306'/>
!               <parent ref='id-678896826'/>
              </interfaceMessageReferenceComponent>
!             <interfaceMessageReferenceComponent xml:id='id-693593274'>
                <messageLabel>Out</messageLabel>
                <direction>out</direction>
                <messageContentModel>#element</messageContentModel>
!               <elementDeclaration ref='id-1063101626'/>
!               <parent ref='id-678896826'/>
              </interfaceMessageReferenceComponent>
            </interfaceMessageReferences>
!           <parent ref='id-400319674'/>
          </interfaceOperationComponent>
        </interfaceOperations>
--- 21,40 ----
            <messageExchangePattern>http://www.w3.org/2006/01/wsdl/in-out</messageExchangePattern>
            <interfaceMessageReferences>
!             <interfaceMessageReferenceComponent xml:id='id-1658497447'>
                <messageLabel>In</messageLabel>
                <direction>in</direction>
                <messageContentModel>#element</messageContentModel>
!               <elementDeclaration ref='id-2041211303'/>
!               <parent ref='id-1623402919'/>
              </interfaceMessageReferenceComponent>
!             <interfaceMessageReferenceComponent xml:id='id-1647847847'>
                <messageLabel>Out</messageLabel>
                <direction>out</direction>
                <messageContentModel>#element</messageContentModel>
!               <elementDeclaration ref='id-2041145767'/>
!               <parent ref='id-1623402919'/>
              </interfaceMessageReferenceComponent>
            </interfaceMessageReferences>
!           <parent ref='id-1626581415'/>
          </interfaceOperationComponent>
        </interfaceOperations>
***************
*** 42,46 ****
    </interfaces>
    <elementDeclarations>
!     <elementDeclarationComponent xml:id='id-1063101626'>
        <name>
          <cmbase:namespaceName>http://example.org/name</cmbase:namespaceName>
--- 42,46 ----
    </interfaces>
    <elementDeclarations>
!     <elementDeclarationComponent xml:id='id-2041145767'>
        <name>
          <cmbase:namespaceName>http://example.org/name</cmbase:namespaceName>
***************
*** 49,53 ****
        <system>http://www.w3.org/2001/XMLSchema</system>
      </elementDeclarationComponent>
!     <elementDeclarationComponent xml:id='id-1063429306'>
        <name>
          <cmbase:namespaceName>http://example.org/name</cmbase:namespaceName>
--- 49,53 ----
        <system>http://www.w3.org/2001/XMLSchema</system>
      </elementDeclarationComponent>
!     <elementDeclarationComponent xml:id='id-2041211303'>
        <name>
          <cmbase:namespaceName>http://example.org/name</cmbase:namespaceName>
***************
*** 58,62 ****
    </elementDeclarations>
    <typeDefinitions>
!     <typeDefinitionComponent xml:id='id-1055941818'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
--- 58,62 ----
    </elementDeclarations>
    <typeDefinitions>
!     <typeDefinitionComponent xml:id='id-2034018727'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
***************
*** 65,69 ****
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-1050076346'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
--- 65,69 ----
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-2044602791'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
***************
*** 72,76 ****
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-1053680826'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
--- 72,76 ----
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-2031692199'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
***************
*** 79,83 ****
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-1053746362'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
--- 79,83 ----
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-2030447015'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
***************
*** 86,90 ****
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-1053353146'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
--- 86,90 ----
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-2030315943'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
***************
*** 93,97 ****
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-1042703546'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
--- 93,97 ----
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-2037295527'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
***************
*** 100,104 ****
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-1042375866'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
--- 100,104 ----
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-2037229991'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
***************
*** 107,111 ****
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-1049158842'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
--- 107,111 ----
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-2042898855'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
***************
*** 114,118 ****
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-1050404026'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
--- 114,118 ----
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-2043881895'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
***************
*** 121,125 ****
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-1044309178'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
--- 121,125 ----
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-2037787047'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
***************
*** 128,132 ****
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-1054270650'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
--- 128,132 ----
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-2032019879'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
***************
*** 135,139 ****
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-1050207418'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
--- 135,139 ----
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-2043947431'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
***************
*** 142,146 ****
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-1049420986'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
--- 142,146 ----
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-2044209575'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
***************
*** 149,153 ****
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-1043915962'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
--- 149,153 ----
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-2037655975'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
***************
*** 156,160 ****
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-1054467258'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
--- 156,160 ----
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-2031430055'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
***************
*** 163,167 ****
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-1054008506'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
--- 163,167 ----
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-2031757735'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
***************
*** 170,174 ****
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-1056662714'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
--- 170,174 ----
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-2033428903'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
***************
*** 177,181 ****
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-1048896698'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
--- 177,181 ----
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-2042636711'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
***************
*** 184,188 ****
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-1050600634'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
--- 184,188 ----
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-2044078503'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
***************
*** 191,195 ****
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-1050010810'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
--- 191,195 ----
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-2043750823'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
***************
*** 198,202 ****
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-1054860474'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
--- 198,202 ----
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-2031561127'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
***************
*** 205,209 ****
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-1053156538'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
--- 205,209 ----
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-2030119335'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
***************
*** 212,216 ****
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-1049617594'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
--- 212,216 ----
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-2043095463'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
***************
*** 219,223 ****
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-1056203962'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
--- 219,223 ----
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-2033232295'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
***************
*** 226,230 ****
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-1043981498'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
--- 226,230 ----
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-2037721511'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
***************
*** 233,237 ****
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-1044178106'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
--- 233,237 ----
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-2030578087'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
***************
*** 240,244 ****
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-1050272954'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
--- 240,244 ----
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-2044012967'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
***************
*** 247,251 ****
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-1053811898'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
--- 247,251 ----
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-2030512551'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
***************
*** 254,258 ****
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-1042048186'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
--- 254,258 ----
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-2036902311'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
***************
*** 261,265 ****
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-1056335034'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
--- 261,265 ----
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-2034149799'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
***************
*** 268,272 ****
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-1042506938'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
--- 268,272 ----
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-2037098919'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
***************
*** 275,279 ****
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-1042113722'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
--- 275,279 ----
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-2036967847'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
***************
*** 282,286 ****
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-1049945274'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
--- 282,286 ----
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-2043685287'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
***************
*** 289,293 ****
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-1055679674'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
--- 289,293 ----
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-2033756583'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
***************
*** 296,300 ****
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-1056007354'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
--- 296,300 ----
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-2034084263'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
***************
*** 303,307 ****
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-1054532794'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
--- 303,307 ----
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-2031233447'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
***************
*** 310,314 ****
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-1042441402'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
--- 310,314 ----
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-2037033383'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
***************
*** 317,321 ****
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-1050141882'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
--- 317,321 ----
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-2044668327'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
***************
*** 324,328 ****
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-1054074042'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
--- 324,328 ----
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-2031823271'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
***************
*** 331,335 ****
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-1056924858'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
--- 331,335 ----
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-2033691047'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
***************
*** 338,342 ****
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-1055122618'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
--- 338,342 ----
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-2032871847'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
***************
*** 345,349 ****
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-1053484218'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
--- 345,349 ----
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-2030184871'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
***************
*** 352,356 ****
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-1053877434'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
--- 352,356 ----
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-2031888807'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
***************
*** 359,363 ****
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-1053091002'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>
--- 359,363 ----
        <system>http://www.w3.org/2001/XMLSchema</system>
      </typeDefinitionComponent>
!     <typeDefinitionComponent xml:id='id-2030053799'>
        <name>
          <cmbase:namespaceName>http://www.w3.org/2001/XMLSchema</cmbase:namespaceName>

Received on Thursday, 1 June 2006 21:53:18 UTC