- From: Jonathan Marsh via cvs-syncmail <cvsmail@w3.org>
- Date: Tue, 21 Nov 2006 15:02:09 +0000
- To: public-ws-desc-eds@w3.org
Update of /sources/public/2002/ws/desc/test-suite/results/wsdl-xslt/LocationTemplate-1G
In directory hutz:/tmp/cvs-serv9903/test-suite/results/wsdl-xslt/LocationTemplate-1G
Modified Files:
SOAPservice.canonical.wsdlcm SOAPservice.wsdlcm
Log Message:
Added curly bracket escaping test to LocationTemplate -1G
Index: SOAPservice.wsdlcm
===================================================================
RCS file: /sources/public/2002/ws/desc/test-suite/results/wsdl-xslt/LocationTemplate-1G/SOAPservice.wsdlcm,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** SOAPservice.wsdlcm 20 Nov 2006 02:32:23 -0000 1.1
--- SOAPservice.wsdlcm 21 Nov 2006 15:02:06 -0000 1.2
***************
*** 181,187 ****
</soapcm:soapBindingExtension>
</bindingComponent>
</bindings>
<services>
! <serviceComponent xml:id="N1008F">
<name>
<base:namespaceName>http://example.org/message-test</base:namespaceName>
--- 181,209 ----
</soapcm:soapBindingExtension>
</bindingComponent>
+ <bindingComponent xml:id="N1008F">
+ <name>
+ <base:namespaceName>http://example.org/message-test</base:namespaceName>
+ <base:localName>Escaping</base:localName>
+ </name>
+ <interface ref="N10017"/>
+ <type>http://www.w3.org/2006/01/wsdl/soap</type>
+ <bindingOperations>
+ <bindingOperationComponent xml:id="N10099">
+ <interfaceOperation ref="N1001D"/>
+ <base:parent ref="N1008F"/>
+ <soapcm:soapBindingOperationExtension>
+ <httpcm:httpLocation>datespace/{year}.html?passphrase={{4(^$@!}}4^@*}}</httpcm:httpLocation>
+ </soapcm:soapBindingOperationExtension>
+ </bindingOperationComponent>
+ </bindingOperations>
+ <soapcm:soapBindingExtension>
+ <httpcm:httpCookies>false</httpcm:httpCookies>
+ <soapcm:soapUnderlyingProtocol>http://www.w3.org/2003/05/soap/bindings/HTTP/</soapcm:soapUnderlyingProtocol>
+ <soapcm:soapVersion>1.2</soapcm:soapVersion>
+ </soapcm:soapBindingExtension>
+ </bindingComponent>
</bindings>
<services>
! <serviceComponent xml:id="N100A0">
<name>
<base:namespaceName>http://example.org/message-test</base:namespaceName>
***************
*** 190,233 ****
<interface ref="N10017"/>
<endpoints>
! <endpointComponent xml:id="N10096">
<name>PathsEndpoint</name>
<binding ref="N1002D"/>
<address>http://example.org/</address>
! <base:parent ref="N1008F"/>
<soapcm:soapEndpointExtension/>
</endpointComponent>
! <endpointComponent xml:id="N1009B">
<name>MixedPathsQueryParamsEndpoint</name>
<binding ref="N1003D"/>
<address>http://example.org/</address>
! <base:parent ref="N1008F"/>
<soapcm:soapEndpointExtension/>
</endpointComponent>
! <endpointComponent xml:id="N100A0">
<name>AutoQueryParamsEndpoint</name>
<binding ref="N1004D"/>
<address>http://example.org/</address>
! <base:parent ref="N1008F"/>
<soapcm:soapEndpointExtension/>
</endpointComponent>
! <endpointComponent xml:id="N100A5">
<name>AutoRemainderEndpoint</name>
<binding ref="N1005E"/>
<address>http://example.org/</address>
! <base:parent ref="N1008F"/>
<soapcm:soapEndpointExtension/>
</endpointComponent>
! <endpointComponent xml:id="N100AA">
<name>IgnoreUncidedEndpoint</name>
<binding ref="N1006E"/>
<address>http://example.org/</address>
! <base:parent ref="N1008F"/>
<soapcm:soapEndpointExtension/>
</endpointComponent>
! <endpointComponent xml:id="N100AF">
<name>AdditionalQueryParamsEndpoint</name>
<binding ref="N1007F"/>
<address>http://example.org/</address>
! <base:parent ref="N1008F"/>
<soapcm:soapEndpointExtension/>
</endpointComponent>
--- 212,262 ----
<interface ref="N10017"/>
<endpoints>
! <endpointComponent xml:id="N100A7">
<name>PathsEndpoint</name>
<binding ref="N1002D"/>
<address>http://example.org/</address>
! <base:parent ref="N100A0"/>
<soapcm:soapEndpointExtension/>
</endpointComponent>
! <endpointComponent xml:id="N100AC">
<name>MixedPathsQueryParamsEndpoint</name>
<binding ref="N1003D"/>
<address>http://example.org/</address>
! <base:parent ref="N100A0"/>
<soapcm:soapEndpointExtension/>
</endpointComponent>
! <endpointComponent xml:id="N100B1">
<name>AutoQueryParamsEndpoint</name>
<binding ref="N1004D"/>
<address>http://example.org/</address>
! <base:parent ref="N100A0"/>
<soapcm:soapEndpointExtension/>
</endpointComponent>
! <endpointComponent xml:id="N100B6">
<name>AutoRemainderEndpoint</name>
<binding ref="N1005E"/>
<address>http://example.org/</address>
! <base:parent ref="N100A0"/>
<soapcm:soapEndpointExtension/>
</endpointComponent>
! <endpointComponent xml:id="N100BB">
<name>IgnoreUncidedEndpoint</name>
<binding ref="N1006E"/>
<address>http://example.org/</address>
! <base:parent ref="N100A0"/>
<soapcm:soapEndpointExtension/>
</endpointComponent>
! <endpointComponent xml:id="N100C0">
<name>AdditionalQueryParamsEndpoint</name>
<binding ref="N1007F"/>
<address>http://example.org/</address>
! <base:parent ref="N100A0"/>
! <soapcm:soapEndpointExtension/>
! </endpointComponent>
! <endpointComponent xml:id="N100C5">
! <name>EscapingEndpoint</name>
! <binding ref="N1008F"/>
! <address>http://example.org/</address>
! <base:parent ref="N100A0"/>
<soapcm:soapEndpointExtension/>
</endpointComponent>
Index: SOAPservice.canonical.wsdlcm
===================================================================
RCS file: /sources/public/2002/ws/desc/test-suite/results/wsdl-xslt/LocationTemplate-1G/SOAPservice.canonical.wsdlcm,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** SOAPservice.canonical.wsdlcm 20 Nov 2006 02:32:23 -0000 1.1
--- SOAPservice.canonical.wsdlcm 21 Nov 2006 15:02:06 -0000 1.2
***************
*** 22,26 ****
<direction>in</direction>
<messageContentModel>#element</messageContentModel>
! <elementDeclaration ref="c25"/>
<base:parent ref="c3"/>
</interfaceMessageReferenceComponent><interfaceMessageReferenceComponent xml:id="c5">
--- 22,26 ----
<direction>in</direction>
<messageContentModel>#element</messageContentModel>
! <elementDeclaration ref="c28"/>
<base:parent ref="c3"/>
</interfaceMessageReferenceComponent><interfaceMessageReferenceComponent xml:id="c5">
***************
*** 28,32 ****
<direction>out</direction>
<messageContentModel>#element</messageContentModel>
! <elementDeclaration ref="c26"/>
<base:parent ref="c3"/>
</interfaceMessageReferenceComponent></interfaceMessageReferences>
--- 28,32 ----
<direction>out</direction>
<messageContentModel>#element</messageContentModel>
! <elementDeclaration ref="c29"/>
<base:parent ref="c3"/>
</interfaceMessageReferenceComponent></interfaceMessageReferences>
***************
*** 98,102 ****
<name>
<base:namespaceName>http://example.org/message-test</base:namespaceName>
! <base:localName>IgnoreUncited</base:localName>
</name>
<interface ref="c2"/>
--- 98,102 ----
<name>
<base:namespaceName>http://example.org/message-test</base:namespaceName>
! <base:localName>Escaping</base:localName>
</name>
<interface ref="c2"/>
***************
*** 106,110 ****
<base:parent ref="c12"/>
<soapcm:soapBindingOperationExtension>
! <httpcm:httpLocation>datespace/{year}.html?start={time}</httpcm:httpLocation>
</soapcm:soapBindingOperationExtension>
</bindingOperationComponent></bindingOperations>
--- 106,110 ----
<base:parent ref="c12"/>
<soapcm:soapBindingOperationExtension>
! <httpcm:httpLocation>datespace/{year}.html?passphrase={{4(^$@!}}4^@*}}</httpcm:httpLocation>
</soapcm:soapBindingOperationExtension>
</bindingOperationComponent></bindingOperations>
***************
*** 117,121 ****
<name>
<base:namespaceName>http://example.org/message-test</base:namespaceName>
! <base:localName>MixedPathsQueryParams</base:localName>
</name>
<interface ref="c2"/>
--- 117,121 ----
<name>
<base:namespaceName>http://example.org/message-test</base:namespaceName>
! <base:localName>IgnoreUncited</base:localName>
</name>
<interface ref="c2"/>
***************
*** 125,129 ****
<base:parent ref="c14"/>
<soapcm:soapBindingOperationExtension>
! <httpcm:httpLocation>datespace/{year}/{month}.html?day={day};start={time};end={time}</httpcm:httpLocation>
</soapcm:soapBindingOperationExtension>
</bindingOperationComponent></bindingOperations>
--- 125,129 ----
<base:parent ref="c14"/>
<soapcm:soapBindingOperationExtension>
! <httpcm:httpLocation>datespace/{year}.html?start={time}</httpcm:httpLocation>
</soapcm:soapBindingOperationExtension>
</bindingOperationComponent></bindingOperations>
***************
*** 136,140 ****
<name>
<base:namespaceName>http://example.org/message-test</base:namespaceName>
! <base:localName>Paths</base:localName>
</name>
<interface ref="c2"/>
--- 136,140 ----
<name>
<base:namespaceName>http://example.org/message-test</base:namespaceName>
! <base:localName>MixedPathsQueryParams</base:localName>
</name>
<interface ref="c2"/>
***************
*** 144,147 ****
--- 144,166 ----
<base:parent ref="c16"/>
<soapcm:soapBindingOperationExtension>
+ <httpcm:httpLocation>datespace/{year}/{month}.html?day={day};start={time};end={time}</httpcm:httpLocation>
+ </soapcm:soapBindingOperationExtension>
+ </bindingOperationComponent></bindingOperations>
+ <soapcm:soapBindingExtension>
+ <httpcm:httpCookies>false</httpcm:httpCookies>
+ <soapcm:soapUnderlyingProtocol>http://www.w3.org/2003/05/soap/bindings/HTTP/</soapcm:soapUnderlyingProtocol>
+ <soapcm:soapVersion>1.2</soapcm:soapVersion>
+ </soapcm:soapBindingExtension>
+ </bindingComponent><bindingComponent xml:id="c18">
+ <name>
+ <base:namespaceName>http://example.org/message-test</base:namespaceName>
+ <base:localName>Paths</base:localName>
+ </name>
+ <interface ref="c2"/>
+ <type>http://www.w3.org/2006/01/wsdl/soap</type>
+ <bindingOperations><bindingOperationComponent xml:id="c19">
+ <interfaceOperation ref="c3"/>
+ <base:parent ref="c18"/>
+ <soapcm:soapBindingOperationExtension>
<httpcm:httpLocation>datespace/{year}/{month}/{day}/{time}-{time}.html</httpcm:httpLocation>
</soapcm:soapBindingOperationExtension>
***************
*** 153,157 ****
</soapcm:soapBindingExtension>
</bindingComponent></bindings>
! <services><serviceComponent xml:id="c18">
<name>
<base:namespaceName>http://example.org/message-test</base:namespaceName>
--- 172,176 ----
</soapcm:soapBindingExtension>
</bindingComponent></bindings>
! <services><serviceComponent xml:id="c20">
<name>
<base:namespaceName>http://example.org/message-test</base:namespaceName>
***************
*** 159,201 ****
</name>
<interface ref="c2"/>
! <endpoints><endpointComponent xml:id="c19">
<name>AdditionalQueryParamsEndpoint</name>
<binding ref="c6"/>
<address>http://example.org/</address>
! <base:parent ref="c18"/>
<soapcm:soapEndpointExtension/>
! </endpointComponent><endpointComponent xml:id="c20">
<name>AutoQueryParamsEndpoint</name>
<binding ref="c8"/>
<address>http://example.org/</address>
! <base:parent ref="c18"/>
<soapcm:soapEndpointExtension/>
! </endpointComponent><endpointComponent xml:id="c21">
<name>AutoRemainderEndpoint</name>
<binding ref="c10"/>
<address>http://example.org/</address>
! <base:parent ref="c18"/>
<soapcm:soapEndpointExtension/>
! </endpointComponent><endpointComponent xml:id="c22">
! <name>IgnoreUncidedEndpoint</name>
<binding ref="c12"/>
<address>http://example.org/</address>
! <base:parent ref="c18"/>
<soapcm:soapEndpointExtension/>
! </endpointComponent><endpointComponent xml:id="c23">
! <name>MixedPathsQueryParamsEndpoint</name>
<binding ref="c14"/>
<address>http://example.org/</address>
! <base:parent ref="c18"/>
<soapcm:soapEndpointExtension/>
! </endpointComponent><endpointComponent xml:id="c24">
! <name>PathsEndpoint</name>
<binding ref="c16"/>
<address>http://example.org/</address>
! <base:parent ref="c18"/>
<soapcm:soapEndpointExtension/>
</endpointComponent></endpoints>
</serviceComponent></services>
! <elementDeclarations><elementDeclarationComponent xml:id="c25">
<name>
<base:namespaceName>http://example.org/date-space/xsd</base:namespaceName>
--- 178,226 ----
</name>
<interface ref="c2"/>
! <endpoints><endpointComponent xml:id="c21">
<name>AdditionalQueryParamsEndpoint</name>
<binding ref="c6"/>
<address>http://example.org/</address>
! <base:parent ref="c20"/>
<soapcm:soapEndpointExtension/>
! </endpointComponent><endpointComponent xml:id="c22">
<name>AutoQueryParamsEndpoint</name>
<binding ref="c8"/>
<address>http://example.org/</address>
! <base:parent ref="c20"/>
<soapcm:soapEndpointExtension/>
! </endpointComponent><endpointComponent xml:id="c23">
<name>AutoRemainderEndpoint</name>
<binding ref="c10"/>
<address>http://example.org/</address>
! <base:parent ref="c20"/>
<soapcm:soapEndpointExtension/>
! </endpointComponent><endpointComponent xml:id="c24">
! <name>EscapingEndpoint</name>
<binding ref="c12"/>
<address>http://example.org/</address>
! <base:parent ref="c20"/>
<soapcm:soapEndpointExtension/>
! </endpointComponent><endpointComponent xml:id="c25">
! <name>IgnoreUncidedEndpoint</name>
<binding ref="c14"/>
<address>http://example.org/</address>
! <base:parent ref="c20"/>
<soapcm:soapEndpointExtension/>
! </endpointComponent><endpointComponent xml:id="c26">
! <name>MixedPathsQueryParamsEndpoint</name>
<binding ref="c16"/>
<address>http://example.org/</address>
! <base:parent ref="c20"/>
! <soapcm:soapEndpointExtension/>
! </endpointComponent><endpointComponent xml:id="c27">
! <name>PathsEndpoint</name>
! <binding ref="c18"/>
! <address>http://example.org/</address>
! <base:parent ref="c20"/>
<soapcm:soapEndpointExtension/>
</endpointComponent></endpoints>
</serviceComponent></services>
! <elementDeclarations><elementDeclarationComponent xml:id="c28">
<name>
<base:namespaceName>http://example.org/date-space/xsd</base:namespaceName>
***************
*** 203,207 ****
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
! </elementDeclarationComponent><elementDeclarationComponent xml:id="c26">
<name>
<base:namespaceName>http://example.org/date-space/xsd</base:namespaceName>
--- 228,232 ----
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
! </elementDeclarationComponent><elementDeclarationComponent xml:id="c29">
<name>
<base:namespaceName>http://example.org/date-space/xsd</base:namespaceName>
***************
*** 210,214 ****
<system>http://www.w3.org/2001/XMLSchema</system>
</elementDeclarationComponent></elementDeclarations>
! <typeDefinitions><typeDefinitionComponent xml:id="c27">
<name>
<base:namespaceName>http://example.org/date-space/xsd</base:namespaceName>
--- 235,239 ----
<system>http://www.w3.org/2001/XMLSchema</system>
</elementDeclarationComponent></elementDeclarations>
! <typeDefinitions><typeDefinitionComponent xml:id="c30">
<name>
<base:namespaceName>http://example.org/date-space/xsd</base:namespaceName>
***************
*** 216,220 ****
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c28">
<name>
<base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName>
--- 241,245 ----
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c31">
<name>
<base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName>
***************
*** 222,226 ****
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c29">
<name>
<base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName>
--- 247,251 ----
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c32">
<name>
<base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName>
***************
*** 228,232 ****
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c30">
<name>
<base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName>
--- 253,257 ----
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c33">
<name>
<base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName>
***************
*** 234,238 ****
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c31">
<name>
<base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName>
--- 259,263 ----
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c34">
<name>
<base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName>
***************
*** 240,244 ****
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c32">
<name>
<base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName>
--- 265,269 ----
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c35">
<name>
<base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName>
***************
*** 246,250 ****
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c33">
<name>
<base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName>
--- 271,275 ----
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c36">
<name>
<base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName>
***************
*** 252,256 ****
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c34">
<name>
<base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName>
--- 277,281 ----
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c37">
<name>
<base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName>
***************
*** 258,262 ****
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c35">
<name>
<base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName>
--- 283,287 ----
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c38">
<name>
<base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName>
***************
*** 264,268 ****
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c36">
<name>
<base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName>
--- 289,293 ----
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c39">
<name>
<base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName>
***************
*** 270,274 ****
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c37">
<name>
<base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName>
--- 295,299 ----
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c40">
<name>
<base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName>
***************
*** 276,280 ****
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c38">
<name>
<base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName>
--- 301,305 ----
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c41">
<name>
<base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName>
***************
*** 282,286 ****
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c39">
<name>
<base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName>
--- 307,311 ----
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c42">
<name>
<base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName>
***************
*** 288,292 ****
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c40">
<name>
<base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName>
--- 313,317 ----
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c43">
<name>
<base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName>
***************
*** 294,298 ****
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c41">
<name>
<base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName>
--- 319,323 ----
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c44">
<name>
<base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName>
***************
*** 300,304 ****
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c42">
<name>
<base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName>
--- 325,329 ----
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c45">
<name>
<base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName>
***************
*** 306,310 ****
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c43">
<name>
<base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName>
--- 331,335 ----
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c46">
<name>
<base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName>
***************
*** 312,316 ****
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c44">
<name>
<base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName>
--- 337,341 ----
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c47">
<name>
<base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName>
***************
*** 318,322 ****
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c45">
<name>
<base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName>
--- 343,347 ----
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c48">
<name>
<base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName>
***************
*** 324,328 ****
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c46">
<name>
<base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName>
--- 349,353 ----
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c49">
<name>
<base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName>
***************
*** 330,334 ****
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c47">
<name>
<base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName>
--- 355,359 ----
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c50">
<name>
<base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName>
***************
*** 336,340 ****
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c48">
<name>
<base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName>
--- 361,365 ----
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c51">
<name>
<base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName>
***************
*** 342,346 ****
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c49">
<name>
<base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName>
--- 367,371 ----
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c52">
<name>
<base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName>
***************
*** 348,352 ****
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c50">
<name>
<base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName>
--- 373,377 ----
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c53">
<name>
<base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName>
***************
*** 354,358 ****
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c51">
<name>
<base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName>
--- 379,383 ----
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c54">
<name>
<base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName>
***************
*** 360,364 ****
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c52">
<name>
<base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName>
--- 385,389 ----
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c55">
<name>
<base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName>
***************
*** 366,370 ****
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c53">
<name>
<base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName>
--- 391,395 ----
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c56">
<name>
<base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName>
***************
*** 372,376 ****
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c54">
<name>
<base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName>
--- 397,401 ----
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c57">
<name>
<base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName>
***************
*** 378,382 ****
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c55">
<name>
<base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName>
--- 403,407 ----
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c58">
<name>
<base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName>
***************
*** 384,388 ****
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c56">
<name>
<base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName>
--- 409,413 ----
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c59">
<name>
<base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName>
***************
*** 390,394 ****
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c57">
<name>
<base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName>
--- 415,419 ----
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c60">
<name>
<base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName>
***************
*** 396,400 ****
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c58">
<name>
<base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName>
--- 421,425 ----
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c61">
<name>
<base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName>
***************
*** 402,406 ****
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c59">
<name>
<base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName>
--- 427,431 ----
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c62">
<name>
<base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName>
***************
*** 408,412 ****
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c60">
<name>
<base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName>
--- 433,437 ----
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c63">
<name>
<base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName>
***************
*** 414,418 ****
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c61">
<name>
<base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName>
--- 439,443 ----
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c64">
<name>
<base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName>
***************
*** 420,424 ****
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c62">
<name>
<base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName>
--- 445,449 ----
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c65">
<name>
<base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName>
***************
*** 426,430 ****
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c63">
<name>
<base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName>
--- 451,455 ----
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c66">
<name>
<base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName>
***************
*** 432,436 ****
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c64">
<name>
<base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName>
--- 457,461 ----
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c67">
<name>
<base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName>
***************
*** 438,442 ****
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c65">
<name>
<base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName>
--- 463,467 ----
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c68">
<name>
<base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName>
***************
*** 444,448 ****
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c66">
<name>
<base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName>
--- 469,473 ----
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c69">
<name>
<base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName>
***************
*** 450,454 ****
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c67">
<name>
<base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName>
--- 475,479 ----
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c70">
<name>
<base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName>
***************
*** 456,460 ****
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c68">
<name>
<base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName>
--- 481,485 ----
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c71">
<name>
<base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName>
***************
*** 462,466 ****
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c69">
<name>
<base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName>
--- 487,491 ----
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c72">
<name>
<base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName>
***************
*** 468,472 ****
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c70">
<name>
<base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName>
--- 493,497 ----
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c73">
<name>
<base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName>
***************
*** 474,478 ****
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c71">
<name>
<base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName>
--- 499,503 ----
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
! </typeDefinitionComponent><typeDefinitionComponent xml:id="c74">
<name>
<base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName>
Received on Tuesday, 21 November 2006 15:02:30 UTC