- From: Jonathan Marsh via cvs-syncmail <cvsmail@w3.org>
- Date: Sat, 07 Jul 2007 01:12:34 +0000
- To: public-ws-desc-eds@w3.org
Update of /sources/public/2002/ws/desc/test-suite/results/wsdl-xslt/WSAddressing-1G In directory hutz:/tmp/cvs-serv2328/test-suite/results/wsdl-xslt/WSAddressing-1G Modified Files: wsaTestService2.canonical.wsdlcm wsaTestService2.wsdlcm Log Message: Updated WSAddressing-1G to 2007/05 WS-A Metadata draft. Updated interchange schemas to support WS-A Metadata. Added interchange schemas to support WS-Policy extensions. Added WS-A Metadata support and minimal WS-Policy support to wsdl-xslt. Updated baseline and regenerated results and zips. Index: wsaTestService2.wsdlcm =================================================================== RCS file: /sources/public/2002/ws/desc/test-suite/results/wsdl-xslt/WSAddressing-1G/wsaTestService2.wsdlcm,v retrieving revision 1.9 retrieving revision 1.10 diff -C 2 -d -r1.9 -r1.10 *** wsaTestService2.wsdlcm 23 Mar 2007 05:51:04 -0000 1.9 --- wsaTestService2.wsdlcm 7 Jul 2007 01:12:32 -0000 1.10 *************** *** 1,5 **** <?xml version="1.0" encoding="UTF-8"?> <!-- Generated by wsdl-component-model.xslt, Jonathan Marsh, WSO2, jonathan@wso2.com --> ! <descriptionComponent xmlns="http://www.w3.org/2002/ws/desc/wsdl/component" xmlns:sawsdl="http://www.w3.org/2007/01/sawsdl#" xmlns:sawsdlcm="http://www.w3.org/2002/ws/desc/wsdl/component-sawsdl" xmlns:wsacm="http://www.w3.org/2002/ws/desc/wsdl/component-ws-addressing" xmlns:soapcm="http://www.w3.org/2002/ws/desc/wsdl/component-soap" xmlns:rpccm="http://www.w3.org/2002/ws/desc/wsdl/component-rpc" xmlns:httpcm="http://www.w3.org/2002/ws/desc/wsdl/component-http" xmlns:base="http://www.w3.org/2002/ws/desc/wsdl/component-base" xmlns:ext="http://www.w3.org/2002/ws/desc/wsdl/component-extensions" xml:id="N10001"> <extensions> <base:uri>http://www.w3.org/ns/wsdl-extensions</base:uri> --- 1,5 ---- <?xml version="1.0" encoding="UTF-8"?> <!-- Generated by wsdl-component-model.xslt, Jonathan Marsh, WSO2, jonathan@wso2.com --> ! <descriptionComponent xmlns="http://www.w3.org/2002/ws/desc/wsdl/component" xmlns:sawsdl="http://www.w3.org/2007/01/sawsdl#" xmlns:sawsdlcm="http://www.w3.org/2002/ws/desc/wsdl/component-sawsdl" xmlns:wspcm="http://www.w3.org/2002/ws/desc/wsdl/component-ws-policy" xmlns:wsp="http://www.w3.org/ns/ws-policy" xmlns:wsacm="http://www.w3.org/2002/ws/desc/wsdl/component-ws-addressing" xmlns:soapcm="http://www.w3.org/2002/ws/desc/wsdl/component-soap" xmlns:rpccm="http://www.w3.org/2002/ws/desc/wsdl/component-rpc" xmlns:httpcm="http://www.w3.org/2002/ws/desc/wsdl/component-http" xmlns:base="http://www.w3.org/2002/ws/desc/wsdl/component-base" xmlns:ext="http://www.w3.org/2002/ws/desc/wsdl/component-extensions" xml:id="N10001"> <extensions> <base:uri>http://www.w3.org/ns/wsdl-extensions</base:uri> *************** *** 7,11 **** <base:uri>http://www.w3.org/ns/wsdl/rpc</base:uri> <base:uri>http://www.w3.org/ns/wsdl/soap</base:uri> ! <base:uri>http://www.w3.org/2006/05/addressing/wsdl</base:uri> </extensions> <interfaces> --- 7,12 ---- <base:uri>http://www.w3.org/ns/wsdl/rpc</base:uri> <base:uri>http://www.w3.org/ns/wsdl/soap</base:uri> ! <base:uri>http://www.w3.org/ns/ws-policy</base:uri> ! <base:uri>http://www.w3.org/2007/05/addressing/metadata</base:uri> </extensions> <interfaces> *************** *** 24,30 **** <elementDeclaration ref="N10027"/> <base:parent ref="N1002D"/> ! <wsacm:wsaInterfaceFaultExtension> ! <wsacm:action>http://example.org/wsaTestService2/wsaTestInterface/echoFaultName</wsacm:action> ! </wsacm:wsaInterfaceFaultExtension> </interfaceFaultComponent> </interfaceFaults> --- 25,29 ---- <elementDeclaration ref="N10027"/> <base:parent ref="N1002D"/> ! <wspcm:wspInterfaceFaultExtension/> </interfaceFaultComponent> </interfaceFaults> *************** *** 43,46 **** --- 42,46 ---- <elementDeclaration ref="N1001F"/> <base:parent ref="N10034"/> + <wspcm:wspInterfaceMessageReferenceExtension/> <wsacm:wsaInterfaceMessageReferenceExtension> <wsacm:action>http://example.org/wsaTestService2/wsaTestInterface/echoRequest</wsacm:action> *************** *** 53,56 **** --- 53,57 ---- <elementDeclaration ref="N10023"/> <base:parent ref="N10034"/> + <wspcm:wspInterfaceMessageReferenceExtension/> <wsacm:wsaInterfaceMessageReferenceExtension> <wsacm:action>http://example.org/wsaTestService2/wsaTestInterface/echoResponse</wsacm:action> *************** *** 64,67 **** --- 65,72 ---- <direction>out</direction> <base:parent ref="N10034"/> + <wspcm:wspInterfaceFaultReferenceExtension/> + <wsacm:wsaInterfaceFaultReferenceExtension> + <wsacm:action>http://example.org/wsaTestService2/wsaTestInterface/echoResponse/echoFaultName</wsacm:action> + </wsacm:wsaInterfaceFaultReferenceExtension> </interfaceFaultReferenceComponent> </interfaceFaultReferences> *************** *** 70,73 **** --- 75,79 ---- <ext:safety>false</ext:safety> </ext:wsdlInterfaceOperationExtension> + <wspcm:wspInterfaceOperationExtension/> </interfaceOperationComponent> <interfaceOperationComponent xml:id="N10042"> *************** *** 84,87 **** --- 90,94 ---- <elementDeclaration ref="N10015"/> <base:parent ref="N10042"/> + <wspcm:wspInterfaceMessageReferenceExtension/> <wsacm:wsaInterfaceMessageReferenceExtension> <wsacm:action>http://example.org/wsaTestService2/wsaTestInterface/notify</wsacm:action> *************** *** 93,98 **** --- 100,107 ---- <ext:safety>false</ext:safety> </ext:wsdlInterfaceOperationExtension> + <wspcm:wspInterfaceOperationExtension/> </interfaceOperationComponent> </interfaceOperations> + <wspcm:wspInterfaceExtension/> </interfaceComponent> <interfaceComponent xml:id="N1004B"> *************** *** 110,120 **** <elementDeclaration ref="N10027"/> <base:parent ref="N1004B"/> ! <wsacm:wsaInterfaceFaultExtension> ! <wsacm:action>http://example.org/action/echoFault</wsacm:action> ! </wsacm:wsaInterfaceFaultExtension> </interfaceFaultComponent> </interfaceFaults> <interfaceOperations> ! <interfaceOperationComponent xml:id="N10053"> <name> <base:namespaceName>http://example.org/wsaTestService2</base:namespaceName> --- 119,127 ---- <elementDeclaration ref="N10027"/> <base:parent ref="N1004B"/> ! <wspcm:wspInterfaceFaultExtension/> </interfaceFaultComponent> </interfaceFaults> <interfaceOperations> ! <interfaceOperationComponent xml:id="N10052"> <name> <base:namespaceName>http://example.org/wsaTestService2</base:namespaceName> *************** *** 123,142 **** <messageExchangePattern>http://www.w3.org/ns/wsdl/in-out</messageExchangePattern> <interfaceMessageReferences> ! <interfaceMessageReferenceComponent xml:id="N10057"> <messageLabel>In</messageLabel> <direction>in</direction> <messageContentModel>#element</messageContentModel> <elementDeclaration ref="N1001F"/> ! <base:parent ref="N10053"/> <wsacm:wsaInterfaceMessageReferenceExtension> <wsacm:action>http://example.org/action/echoIn</wsacm:action> </wsacm:wsaInterfaceMessageReferenceExtension> </interfaceMessageReferenceComponent> ! <interfaceMessageReferenceComponent xml:id="N1005B"> <messageLabel>Out</messageLabel> <direction>out</direction> <messageContentModel>#element</messageContentModel> <elementDeclaration ref="N10023"/> ! <base:parent ref="N10053"/> <wsacm:wsaInterfaceMessageReferenceExtension> <wsacm:action>http://example.org/action/echoOut</wsacm:action> --- 130,151 ---- <messageExchangePattern>http://www.w3.org/ns/wsdl/in-out</messageExchangePattern> <interfaceMessageReferences> ! <interfaceMessageReferenceComponent xml:id="N10056"> <messageLabel>In</messageLabel> <direction>in</direction> <messageContentModel>#element</messageContentModel> <elementDeclaration ref="N1001F"/> ! <base:parent ref="N10052"/> ! <wspcm:wspInterfaceMessageReferenceExtension/> <wsacm:wsaInterfaceMessageReferenceExtension> <wsacm:action>http://example.org/action/echoIn</wsacm:action> </wsacm:wsaInterfaceMessageReferenceExtension> </interfaceMessageReferenceComponent> ! <interfaceMessageReferenceComponent xml:id="N1005A"> <messageLabel>Out</messageLabel> <direction>out</direction> <messageContentModel>#element</messageContentModel> <elementDeclaration ref="N10023"/> ! <base:parent ref="N10052"/> ! <wspcm:wspInterfaceMessageReferenceExtension/> <wsacm:wsaInterfaceMessageReferenceExtension> <wsacm:action>http://example.org/action/echoOut</wsacm:action> *************** *** 145,153 **** </interfaceMessageReferences> <interfaceFaultReferences> ! <interfaceFaultReferenceComponent xml:id="N1005F"> <interfaceFault ref="N1004E"/> <messageLabel>Out</messageLabel> <direction>out</direction> ! <base:parent ref="N10053"/> </interfaceFaultReferenceComponent> </interfaceFaultReferences> --- 154,166 ---- </interfaceMessageReferences> <interfaceFaultReferences> ! <interfaceFaultReferenceComponent xml:id="N1005E"> <interfaceFault ref="N1004E"/> <messageLabel>Out</messageLabel> <direction>out</direction> ! <base:parent ref="N10052"/> ! <wspcm:wspInterfaceFaultReferenceExtension/> ! <wsacm:wsaInterfaceFaultReferenceExtension> ! <wsacm:action>http://example.org/action/echoFault</wsacm:action> ! </wsacm:wsaInterfaceFaultReferenceExtension> </interfaceFaultReferenceComponent> </interfaceFaultReferences> *************** *** 156,159 **** --- 169,173 ---- <ext:safety>false</ext:safety> </ext:wsdlInterfaceOperationExtension> + <wspcm:wspInterfaceOperationExtension/> </interfaceOperationComponent> <interfaceOperationComponent xml:id="N10063"> *************** *** 170,173 **** --- 184,188 ---- <elementDeclaration ref="N10015"/> <base:parent ref="N10063"/> + <wspcm:wspInterfaceMessageReferenceExtension/> <wsacm:wsaInterfaceMessageReferenceExtension> <wsacm:action>http://example.org/action/notify</wsacm:action> *************** *** 179,184 **** --- 194,201 ---- <ext:safety>false</ext:safety> </ext:wsdlInterfaceOperationExtension> + <wspcm:wspInterfaceOperationExtension/> </interfaceOperationComponent> </interfaceOperations> + <wspcm:wspInterfaceExtension/> </interfaceComponent> </interfaces> *************** *** 187,196 **** <name> <base:namespaceName>http://example.org/wsaTestService2</base:namespaceName> ! <base:localName>wsaTestInterfaceBindingAddressingRequired</base:localName> </name> <interface ref="N1002D"/> <type>http://www.w3.org/ns/wsdl/soap</type> <bindingFaults> ! <bindingFaultComponent xml:id="N10075"> <interfaceFault ref="N10030"/> <base:parent ref="N1006D"/> --- 204,213 ---- <name> <base:namespaceName>http://example.org/wsaTestService2</base:namespaceName> ! <base:localName>wsaTestInterfaceBinding</base:localName> </name> <interface ref="N1002D"/> <type>http://www.w3.org/ns/wsdl/soap</type> <bindingFaults> ! <bindingFaultComponent xml:id="N1007D"> <interfaceFault ref="N10030"/> <base:parent ref="N1006D"/> *************** *** 199,337 **** <soapcm:soapFaultSubcodes/> </soapcm:soapBindingFaultExtension> </bindingFaultComponent> </bindingFaults> <bindingOperations> ! <bindingOperationComponent xml:id="N1007B"> <interfaceOperation ref="N10034"/> <base:parent ref="N1006D"/> <soapcm:soapBindingOperationExtension/> ! <wsacm:wsaBindingOperationExtension/> </bindingOperationComponent> ! <bindingOperationComponent xml:id="N1007E"> <interfaceOperation ref="N10042"/> <base:parent ref="N1006D"/> <soapcm:soapBindingOperationExtension/> ! <wsacm:wsaBindingOperationExtension/> ! </bindingOperationComponent> ! </bindingOperations> ! <soapcm:soapBindingExtension> ! <httpcm:httpCookies>false</httpcm:httpCookies> ! <httpcm:httpQueryParameterSeparatorDefault>&</httpcm:httpQueryParameterSeparatorDefault> ! <soapcm:soapUnderlyingProtocol>http://www.w3.org/2006/01/soap11/bindings/HTTP/</soapcm:soapUnderlyingProtocol> ! <soapcm:soapVersion>1.1</soapcm:soapVersion> ! </soapcm:soapBindingExtension> ! <wsacm:wsaBindingExtension> ! <wsacm:addressing>true</wsacm:addressing> ! </wsacm:wsaBindingExtension> ! </bindingComponent> ! <bindingComponent xml:id="N10082"> ! <name> ! <base:namespaceName>http://example.org/wsaTestService2</base:namespaceName> ! <base:localName>wsaTestInterfaceBindingAddressingNotRequired</base:localName> ! </name> ! <interface ref="N1002D"/> ! <type>http://www.w3.org/ns/wsdl/soap</type> ! <bindingFaults> ! <bindingFaultComponent xml:id="N1008A"> ! <interfaceFault ref="N10030"/> ! <base:parent ref="N10082"/> ! <soapcm:soapBindingFaultExtension> ! <soapcm:soapFaultCode/> ! <soapcm:soapFaultSubcodes/> ! </soapcm:soapBindingFaultExtension> ! </bindingFaultComponent> ! </bindingFaults> ! <bindingOperations> ! <bindingOperationComponent xml:id="N10090"> ! <interfaceOperation ref="N10034"/> ! <base:parent ref="N10082"/> ! <soapcm:soapBindingOperationExtension/> ! <wsacm:wsaBindingOperationExtension/> ! </bindingOperationComponent> ! <bindingOperationComponent xml:id="N10093"> ! <interfaceOperation ref="N10042"/> ! <base:parent ref="N10082"/> ! <soapcm:soapBindingOperationExtension/> ! <wsacm:wsaBindingOperationExtension/> ! </bindingOperationComponent> ! </bindingOperations> ! <soapcm:soapBindingExtension> ! <httpcm:httpCookies>false</httpcm:httpCookies> ! <httpcm:httpQueryParameterSeparatorDefault>&</httpcm:httpQueryParameterSeparatorDefault> ! <soapcm:soapUnderlyingProtocol>http://www.w3.org/2006/01/soap11/bindings/HTTP/</soapcm:soapUnderlyingProtocol> ! <soapcm:soapVersion>1.1</soapcm:soapVersion> ! </soapcm:soapBindingExtension> ! <wsacm:wsaBindingExtension> ! <wsacm:addressing>false</wsacm:addressing> ! </wsacm:wsaBindingExtension> ! </bindingComponent> ! <bindingComponent xml:id="N10097"> ! <name> ! <base:namespaceName>http://example.org/wsaTestService2</base:namespaceName> ! <base:localName>wsaTestInterfaceBinding</base:localName> ! </name> ! <interface ref="N1002D"/> ! <type>http://www.w3.org/ns/wsdl/soap</type> ! <bindingFaults> ! <bindingFaultComponent xml:id="N1009F"> ! <interfaceFault ref="N10030"/> ! <base:parent ref="N10097"/> ! <soapcm:soapBindingFaultExtension> ! <soapcm:soapFaultCode/> ! <soapcm:soapFaultSubcodes/> ! </soapcm:soapBindingFaultExtension> ! </bindingFaultComponent> ! </bindingFaults> ! <bindingOperations> ! <bindingOperationComponent xml:id="N100A2"> ! <interfaceOperation ref="N10034"/> ! <base:parent ref="N10097"/> ! <soapcm:soapBindingOperationExtension/> ! <wsacm:wsaBindingOperationExtension/> ! </bindingOperationComponent> ! <bindingOperationComponent xml:id="N100A5"> ! <interfaceOperation ref="N10042"/> ! <base:parent ref="N10097"/> ! <soapcm:soapBindingOperationExtension/> ! <wsacm:wsaBindingOperationExtension/> ! </bindingOperationComponent> ! </bindingOperations> ! <soapcm:soapBindingExtension> ! <httpcm:httpCookies>false</httpcm:httpCookies> ! <httpcm:httpQueryParameterSeparatorDefault>&</httpcm:httpQueryParameterSeparatorDefault> ! <soapcm:soapUnderlyingProtocol>http://www.w3.org/2006/01/soap11/bindings/HTTP/</soapcm:soapUnderlyingProtocol> ! <soapcm:soapVersion>1.1</soapcm:soapVersion> ! </soapcm:soapBindingExtension> ! <wsacm:wsaBindingExtension/> ! </bindingComponent> ! <bindingComponent xml:id="N100A9"> ! <name> ! <base:namespaceName>http://example.org/wsaTestService2</base:namespaceName> ! <base:localName>wsaTestInterfaceBindingSoapAction</base:localName> ! </name> ! <interface ref="N1002D"/> ! <type>http://www.w3.org/ns/wsdl/soap</type> ! <bindingFaults> ! <bindingFaultComponent xml:id="N100B1"> ! <interfaceFault ref="N10030"/> ! <base:parent ref="N100A9"/> ! <soapcm:soapBindingFaultExtension> ! <soapcm:soapFaultCode/> ! <soapcm:soapFaultSubcodes/> ! </soapcm:soapBindingFaultExtension> ! </bindingFaultComponent> ! </bindingFaults> ! <bindingOperations> ! <bindingOperationComponent xml:id="N100B7"> ! <interfaceOperation ref="N10034"/> ! <base:parent ref="N100A9"/> ! <soapcm:soapBindingOperationExtension/> ! <wsacm:wsaBindingOperationExtension/> ! </bindingOperationComponent> ! <bindingOperationComponent xml:id="N100BB"> ! <interfaceOperation ref="N10042"/> ! <base:parent ref="N100A9"/> ! <soapcm:soapBindingOperationExtension/> ! <wsacm:wsaBindingOperationExtension/> </bindingOperationComponent> </bindingOperations> --- 216,234 ---- <soapcm:soapFaultSubcodes/> </soapcm:soapBindingFaultExtension> + <wspcm:wspBindingFaultExtension/> </bindingFaultComponent> </bindingFaults> <bindingOperations> ! <bindingOperationComponent xml:id="N10080"> <interfaceOperation ref="N10034"/> <base:parent ref="N1006D"/> <soapcm:soapBindingOperationExtension/> ! <wspcm:wspBindingOperationExtension/> </bindingOperationComponent> ! <bindingOperationComponent xml:id="N10083"> <interfaceOperation ref="N10042"/> <base:parent ref="N1006D"/> <soapcm:soapBindingOperationExtension/> ! <wspcm:wspBindingOperationExtension/> </bindingOperationComponent> </bindingOperations> *************** *** 342,350 **** <soapcm:soapVersion>1.1</soapcm:soapVersion> </soapcm:soapBindingExtension> ! <wsacm:wsaBindingExtension> ! <wsacm:addressing>true</wsacm:addressing> ! </wsacm:wsaBindingExtension> </bindingComponent> ! <bindingComponent xml:id="N100C0"> <name> <base:namespaceName>http://example.org/wsaTestService2</base:namespaceName> --- 239,253 ---- <soapcm:soapVersion>1.1</soapcm:soapVersion> </soapcm:soapBindingExtension> ! <wspcm:wspBindingExtension> ! <wsacm:policy> ! <wsp:Policy xmlns="http://www.w3.org/ns/wsdl" xmlns:tns="http://example.org/wsaTestService2" xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:s0="http://example.org/notify" xmlns:s1="http://example.org/echo" xmlns:wsoap="http://www.w3.org/ns/wsdl/soap"> ! <wsam:Addressing> ! <wsp:Policy/> ! </wsam:Addressing> ! </wsp:Policy> ! </wsacm:policy> ! </wspcm:wspBindingExtension> </bindingComponent> ! <bindingComponent xml:id="N10087"> <name> <base:namespaceName>http://example.org/wsaTestService2</base:namespaceName> *************** *** 354,513 **** <type>http://www.w3.org/ns/wsdl/soap</type> <bindingFaults> ! <bindingFaultComponent xml:id="N100C8"> <interfaceFault ref="N1004E"/> ! <base:parent ref="N100C0"/> <soapcm:soapBindingFaultExtension> <soapcm:soapFaultCode/> <soapcm:soapFaultSubcodes/> </soapcm:soapBindingFaultExtension> </bindingFaultComponent> </bindingFaults> <bindingOperations> ! <bindingOperationComponent xml:id="N100CE"> ! <interfaceOperation ref="N10053"/> ! <base:parent ref="N100C0"/> <soapcm:soapBindingOperationExtension/> ! <wsacm:wsaBindingOperationExtension/> </bindingOperationComponent> ! <bindingOperationComponent xml:id="N100D1"> <interfaceOperation ref="N10063"/> ! <base:parent ref="N100C0"/> ! <soapcm:soapBindingOperationExtension/> ! <wsacm:wsaBindingOperationExtension/> ! </bindingOperationComponent> ! </bindingOperations> ! <soapcm:soapBindingExtension> ! <httpcm:httpCookies>false</httpcm:httpCookies> ! <httpcm:httpQueryParameterSeparatorDefault>&</httpcm:httpQueryParameterSeparatorDefault> ! <soapcm:soapUnderlyingProtocol>http://www.w3.org/2006/01/soap11/bindings/HTTP/</soapcm:soapUnderlyingProtocol> ! <soapcm:soapVersion>1.1</soapcm:soapVersion> ! </soapcm:soapBindingExtension> ! <wsacm:wsaBindingExtension> ! <wsacm:addressing>true</wsacm:addressing> ! </wsacm:wsaBindingExtension> ! </bindingComponent> ! <bindingComponent xml:id="N100D5"> ! <name> ! <base:namespaceName>http://example.org/wsaTestService2</base:namespaceName> ! <base:localName>wsaTestInterfaceBindingAnonymousRequired</base:localName> ! </name> ! <interface ref="N1002D"/> ! <type>http://www.w3.org/ns/wsdl/soap</type> ! <bindingFaults> ! <bindingFaultComponent xml:id="N100DD"> ! <interfaceFault ref="N10030"/> ! <base:parent ref="N100D5"/> ! <soapcm:soapBindingFaultExtension> ! <soapcm:soapFaultCode/> ! <soapcm:soapFaultSubcodes/> ! </soapcm:soapBindingFaultExtension> ! </bindingFaultComponent> ! </bindingFaults> ! <bindingOperations> ! <bindingOperationComponent xml:id="N100E3"> ! <interfaceOperation ref="N10034"/> ! <base:parent ref="N100D5"/> ! <soapcm:soapBindingOperationExtension/> ! <wsacm:wsaBindingOperationExtension> ! <wsacm:anonymousAddresses>required</wsacm:anonymousAddresses> ! </wsacm:wsaBindingOperationExtension> ! </bindingOperationComponent> ! <bindingOperationComponent xml:id="N100EA"> ! <interfaceOperation ref="N10042"/> ! <base:parent ref="N100D5"/> ! <soapcm:soapBindingOperationExtension/> ! <wsacm:wsaBindingOperationExtension> ! <wsacm:anonymousAddresses>required</wsacm:anonymousAddresses> ! </wsacm:wsaBindingOperationExtension> ! </bindingOperationComponent> ! </bindingOperations> ! <soapcm:soapBindingExtension> ! <httpcm:httpCookies>false</httpcm:httpCookies> ! <httpcm:httpQueryParameterSeparatorDefault>&</httpcm:httpQueryParameterSeparatorDefault> ! <soapcm:soapUnderlyingProtocol>http://www.w3.org/2006/01/soap11/bindings/HTTP/</soapcm:soapUnderlyingProtocol> ! <soapcm:soapVersion>1.1</soapcm:soapVersion> ! </soapcm:soapBindingExtension> ! <wsacm:wsaBindingExtension> ! <wsacm:addressing>true</wsacm:addressing> ! </wsacm:wsaBindingExtension> ! </bindingComponent> ! <bindingComponent xml:id="N100F2"> ! <name> ! <base:namespaceName>http://example.org/wsaTestService2</base:namespaceName> ! <base:localName>wsaTestInterfaceBindingAnonymousProhibited</base:localName> ! </name> ! <interface ref="N1002D"/> ! <type>http://www.w3.org/ns/wsdl/soap</type> ! <bindingFaults> ! <bindingFaultComponent xml:id="N100FA"> ! <interfaceFault ref="N10030"/> ! <base:parent ref="N100F2"/> ! <soapcm:soapBindingFaultExtension> ! <soapcm:soapFaultCode/> ! <soapcm:soapFaultSubcodes/> ! </soapcm:soapBindingFaultExtension> ! </bindingFaultComponent> ! </bindingFaults> ! <bindingOperations> ! <bindingOperationComponent xml:id="N10100"> ! <interfaceOperation ref="N10034"/> ! <base:parent ref="N100F2"/> ! <soapcm:soapBindingOperationExtension/> ! <wsacm:wsaBindingOperationExtension> ! <wsacm:anonymousAddresses>prohibited</wsacm:anonymousAddresses> ! </wsacm:wsaBindingOperationExtension> ! </bindingOperationComponent> ! <bindingOperationComponent xml:id="N10107"> ! <interfaceOperation ref="N10042"/> ! <base:parent ref="N100F2"/> ! <soapcm:soapBindingOperationExtension/> ! <wsacm:wsaBindingOperationExtension> ! <wsacm:anonymousAddresses>prohibited</wsacm:anonymousAddresses> ! </wsacm:wsaBindingOperationExtension> ! </bindingOperationComponent> ! </bindingOperations> ! <soapcm:soapBindingExtension> ! <httpcm:httpCookies>false</httpcm:httpCookies> ! <httpcm:httpQueryParameterSeparatorDefault>&</httpcm:httpQueryParameterSeparatorDefault> ! <soapcm:soapUnderlyingProtocol>http://www.w3.org/2006/01/soap11/bindings/HTTP/</soapcm:soapUnderlyingProtocol> ! <soapcm:soapVersion>1.1</soapcm:soapVersion> ! </soapcm:soapBindingExtension> ! <wsacm:wsaBindingExtension> ! <wsacm:addressing>true</wsacm:addressing> ! </wsacm:wsaBindingExtension> ! </bindingComponent> ! <bindingComponent xml:id="N1010F"> ! <name> ! <base:namespaceName>http://example.org/wsaTestService2</base:namespaceName> ! <base:localName>wsaTestInterfaceBindingAnonymousOptional</base:localName> ! </name> ! <interface ref="N1002D"/> ! <type>http://www.w3.org/ns/wsdl/soap</type> ! <bindingFaults> ! <bindingFaultComponent xml:id="N10117"> ! <interfaceFault ref="N10030"/> ! <base:parent ref="N1010F"/> ! <soapcm:soapBindingFaultExtension> ! <soapcm:soapFaultCode/> ! <soapcm:soapFaultSubcodes/> ! </soapcm:soapBindingFaultExtension> ! </bindingFaultComponent> ! </bindingFaults> ! <bindingOperations> ! <bindingOperationComponent xml:id="N1011D"> ! <interfaceOperation ref="N10034"/> ! <base:parent ref="N1010F"/> ! <soapcm:soapBindingOperationExtension/> ! <wsacm:wsaBindingOperationExtension> ! <wsacm:anonymousAddresses>optional</wsacm:anonymousAddresses> ! </wsacm:wsaBindingOperationExtension> ! </bindingOperationComponent> ! <bindingOperationComponent xml:id="N10124"> ! <interfaceOperation ref="N10042"/> ! <base:parent ref="N1010F"/> <soapcm:soapBindingOperationExtension/> ! <wsacm:wsaBindingOperationExtension> ! <wsacm:anonymousAddresses>optional</wsacm:anonymousAddresses> ! </wsacm:wsaBindingOperationExtension> </bindingOperationComponent> </bindingOperations> --- 257,282 ---- <type>http://www.w3.org/ns/wsdl/soap</type> <bindingFaults> ! <bindingFaultComponent xml:id="N10097"> <interfaceFault ref="N1004E"/> ! <base:parent ref="N10087"/> <soapcm:soapBindingFaultExtension> <soapcm:soapFaultCode/> <soapcm:soapFaultSubcodes/> </soapcm:soapBindingFaultExtension> + <wspcm:wspBindingFaultExtension/> </bindingFaultComponent> </bindingFaults> <bindingOperations> ! <bindingOperationComponent xml:id="N1009A"> ! <interfaceOperation ref="N10052"/> ! <base:parent ref="N10087"/> <soapcm:soapBindingOperationExtension/> ! <wspcm:wspBindingOperationExtension/> </bindingOperationComponent> ! <bindingOperationComponent xml:id="N1009D"> <interfaceOperation ref="N10063"/> ! <base:parent ref="N10087"/> <soapcm:soapBindingOperationExtension/> ! <wspcm:wspBindingOperationExtension/> </bindingOperationComponent> </bindingOperations> *************** *** 518,528 **** <soapcm:soapVersion>1.1</soapcm:soapVersion> </soapcm:soapBindingExtension> ! <wsacm:wsaBindingExtension> ! <wsacm:addressing>true</wsacm:addressing> ! </wsacm:wsaBindingExtension> </bindingComponent> </bindings> <services> ! <serviceComponent xml:id="N1012C"> <name> <base:namespaceName>http://example.org/wsaTestService2</base:namespaceName> --- 287,303 ---- <soapcm:soapVersion>1.1</soapcm:soapVersion> </soapcm:soapBindingExtension> ! <wspcm:wspBindingExtension> ! <wsacm:policy> ! <wsp:Policy xmlns="http://www.w3.org/ns/wsdl" xmlns:tns="http://example.org/wsaTestService2" xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:s0="http://example.org/notify" xmlns:s1="http://example.org/echo" xmlns:wsoap="http://www.w3.org/ns/wsdl/soap"> ! <wsam:Addressing> ! <wsp:Policy/> ! </wsam:Addressing> ! </wsp:Policy> ! </wsacm:policy> ! </wspcm:wspBindingExtension> </bindingComponent> </bindings> <services> ! <serviceComponent xml:id="N100A1"> <name> <base:namespaceName>http://example.org/wsaTestService2</base:namespaceName> *************** *** 531,607 **** <interface ref="N1002D"/> <endpoints> ! <endpointComponent xml:id="N10130"> ! <name>wsaTestInterfaceEndpointAddressingRequired</name> <binding ref="N1006D"/> ! <address>http://example.com/wsaTestInterfaceEndpointAddressingRequired</address> ! <base:parent ref="N1012C"/> ! <soapcm:soapEndpointExtension/> ! <wsacm:wsaEndpointExtension/> ! </endpointComponent> ! <endpointComponent xml:id="N10135"> ! <name>wsaTestInterfaceEndpointAddressingNotRequired</name> ! <binding ref="N10082"/> ! <address>http://example.com/wsaTestInterfaceEndpointAddressingNotRequired</address> ! <base:parent ref="N1012C"/> ! <soapcm:soapEndpointExtension/> ! <wsacm:wsaEndpointExtension/> ! </endpointComponent> ! <endpointComponent xml:id="N1013A"> ! <name>wsaTestInterfaceEndpointAddressingRequiredOnEndpoint</name> ! <binding ref="N10097"/> ! <address>http://example.com/wsaTestInterfaceEndpointAddressingRequiredOnEndpoint</address> ! <base:parent ref="N1012C"/> ! <soapcm:soapEndpointExtension/> ! <wsacm:wsaEndpointExtension/> ! </endpointComponent> ! <endpointComponent xml:id="N1013F"> ! <name>wsaTestInterfaceEndpointAddressingNotRequiredOnEndpoint</name> ! <binding ref="N10097"/> ! <address>http://example.com/wsaTestInterfaceEndpointAddressingRequiredOnEndpoint</address> ! <base:parent ref="N1012C"/> ! <soapcm:soapEndpointExtension/> ! <wsacm:wsaEndpointExtension/> ! </endpointComponent> ! <endpointComponent xml:id="N10144"> ! <name>wsaTestInterfaceEndpointSoapAction</name> ! <binding ref="N100A9"/> ! <address>http://example.com/wsaTestInterfaceEndpointSoapAction</address> ! <base:parent ref="N1012C"/> ! <soapcm:soapEndpointExtension/> ! <wsacm:wsaEndpointExtension/> ! </endpointComponent> ! <endpointComponent xml:id="N10149"> ! <name>wsaTestInterfaceEndpointExplicitAction</name> ! <binding ref="N100C0"/> ! <address>http://example.com/wsaTestInterfaceEndpointExplicitAction</address> ! <base:parent ref="N1012C"/> ! <soapcm:soapEndpointExtension/> ! <wsacm:wsaEndpointExtension/> ! </endpointComponent> ! <endpointComponent xml:id="N1014E"> ! <name>wsaTestInterfaceEndpointAnonymousRequired</name> ! <binding ref="N100D5"/> ! <address>http://example.com/wsaTestInterfaceEndpointAnonymousRequired</address> ! <base:parent ref="N1012C"/> ! <soapcm:soapEndpointExtension/> ! <wsacm:wsaEndpointExtension/> ! </endpointComponent> ! <endpointComponent xml:id="N10153"> ! <name>wsaTestInterfaceEndpointAnonymousProhibited</name> ! <binding ref="N100F2"/> ! <address>http://example.com/wsaTestInterfaceEndpointAnonymousProhibited</address> ! <base:parent ref="N1012C"/> <soapcm:soapEndpointExtension/> <wsacm:wsaEndpointExtension/> </endpointComponent> ! <endpointComponent xml:id="N10158"> ! <name>wsaTestInterfaceEndpointAnonymousOptional</name> ! <binding ref="N1010F"/> ! <address>http://example.com/wsaTestInterfaceEndpointAnonymousOptional</address> ! <base:parent ref="N1012C"/> <soapcm:soapEndpointExtension/> <wsacm:wsaEndpointExtension/> </endpointComponent> </endpoints> </serviceComponent> </services> --- 306,329 ---- <interface ref="N1002D"/> <endpoints> ! <endpointComponent xml:id="N100A5"> ! <name>wsaTestInterfacePortAddressingRequired</name> <binding ref="N1006D"/> ! <address>http://example.com/wsaTestInterfacePortAddressingRequired</address> ! <base:parent ref="N100A1"/> <soapcm:soapEndpointExtension/> + <wspcm:wspEndpointExtension/> <wsacm:wsaEndpointExtension/> </endpointComponent> ! <endpointComponent xml:id="N100AA"> ! <name>wsaTestInterfacePortExplicitActionAddressingRequired</name> ! <binding ref="N10087"/> ! <address>http://example.com/wsaTestInterfacePortExplicitAction</address> ! <base:parent ref="N100A1"/> <soapcm:soapEndpointExtension/> + <wspcm:wspEndpointExtension/> <wsacm:wsaEndpointExtension/> </endpointComponent> </endpoints> + <wspcm:wspServiceExtension/> </serviceComponent> </services> Index: wsaTestService2.canonical.wsdlcm =================================================================== RCS file: /sources/public/2002/ws/desc/test-suite/results/wsdl-xslt/WSAddressing-1G/wsaTestService2.canonical.wsdlcm,v retrieving revision 1.13 retrieving revision 1.14 diff -C 2 -d -r1.13 -r1.14 *** wsaTestService2.canonical.wsdlcm 23 Mar 2007 05:51:03 -0000 1.13 --- wsaTestService2.canonical.wsdlcm 7 Jul 2007 01:12:32 -0000 1.14 *************** *** 1,4 **** <?xml version="1.0" encoding="UTF-8"?> ! <!-- Generated by wsdl-component-model.xslt, Jonathan Marsh, WSO2, jonathan@wso2.com --><descriptionComponent xmlns="http://www.w3.org/2002/ws/desc/wsdl/component" xmlns:sawsdl="http://www.w3.org/2007/01/sawsdl#" xmlns:sawsdlcm="http://www.w3.org/2002/ws/desc/wsdl/component-sawsdl" xmlns:wsacm="http://www.w3.org/2002/ws/desc/wsdl/component-ws-addressing" xmlns:soapcm="http://www.w3.org/2002/ws/desc/wsdl/component-soap" xmlns:rpccm="http://www.w3.org/2002/ws/desc/wsdl/component-rpc" xmlns:httpcm="http://www.w3.org/2002/ws/desc/wsdl/component-http" xmlns:base="http://www.w3.org/2002/ws/desc/wsdl/component-base" xmlns:ext="http://www.w3.org/2002/ws/desc/wsdl/component-extensions" xml:id="c1"> <extensions> <base:uri>http://www.w3.org/ns/wsdl-extensions</base:uri> --- 1,4 ---- <?xml version="1.0" encoding="UTF-8"?> ! <!-- Generated by wsdl-component-model.xslt, Jonathan Marsh, WSO2, jonathan@wso2.com --><descriptionComponent xmlns="http://www.w3.org/2002/ws/desc/wsdl/component" xmlns:sawsdl="http://www.w3.org/2007/01/sawsdl#" xmlns:sawsdlcm="http://www.w3.org/2002/ws/desc/wsdl/component-sawsdl" xmlns:wspcm="http://www.w3.org/2002/ws/desc/wsdl/component-ws-policy" xmlns:wsp="http://www.w3.org/ns/ws-policy" xmlns:wsacm="http://www.w3.org/2002/ws/desc/wsdl/component-ws-addressing" xmlns:soapcm="http://www.w3.org/2002/ws/desc/wsdl/component-soap" xmlns:rpccm="http://www.w3.org/2002/ws/desc/wsdl/component-rpc" xmlns:httpcm="http://www.w3.org/2002/ws/desc/wsdl/component-http" xmlns:base="http://www.w3.org/2002/ws/desc/wsdl/component-base" xmlns:ext="http://www.w3.org/2002/ws/desc/wsdl/component-extensions" xml:id="c1"> <extensions> <base:uri>http://www.w3.org/ns/wsdl-extensions</base:uri> *************** [...1246 lines suppressed...] <base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName> --- 559,563 ---- </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent><typeDefinitionComponent xml:id="c75"> <name> <base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName> *************** *** 800,804 **** </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent><typeDefinitionComponent xml:id="c107"> <name> <base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName> --- 565,569 ---- </name> <system>http://www.w3.org/2001/XMLSchema</system> ! </typeDefinitionComponent><typeDefinitionComponent xml:id="c76"> <name> <base:namespaceName>http://www.w3.org/2001/XMLSchema</base:namespaceName>
Received on Saturday, 7 July 2007 01:13:25 UTC