- 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/documents/good/WSAddressing-1G In directory hutz:/tmp/cvs-serv2328/test-suite/documents/good/WSAddressing-1G Modified Files: TestMetadata.xml wsaTestService2.wsdl 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.wsdl =================================================================== RCS file: /sources/public/2002/ws/desc/test-suite/documents/good/WSAddressing-1G/wsaTestService2.wsdl,v retrieving revision 1.4 retrieving revision 1.5 diff -C 2 -d -r1.4 -r1.5 *** wsaTestService2.wsdl 23 Mar 2007 05:50:31 -0000 1.4 --- wsaTestService2.wsdl 7 Jul 2007 01:12:32 -0000 1.5 *************** *** 1,176 **** ! <description xmlns="http://www.w3.org/ns/wsdl" xmlns:wsdl="http://www.w3.org/ns/wsdl" ! xmlns:tns="http://example.org/wsaTestService2" xmlns:s0="http://example.org/notify" ! xmlns:s1="http://example.org/echo" xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" ! xmlns:xsd="http://www.w3.org/2001/XMLSchema" ! targetNamespace="http://example.org/wsaTestService2"> ! <!-- ! ! Documentation at: ! http://esw.w3.org/topic/WsdlConverter ! To report problems, please refer to: ! http://esw.w3.org/topic/WsdlConverterFeedback ! Generated by the WSDL converter version: ! 2006-02-20 ! Modified by Jonathan Marsh 2006-11-17 ! --> ! <types> ! <xsd:schema targetNamespace="http://example.org/notify" ! elementFormDefault="qualified" attributeFormDefault="unqualified"> ! <xsd:element name="notify" type="xsd:string"/> ! </xsd:schema> ! <xsd:schema targetNamespace="http://example.org/echo" ! elementFormDefault="qualified" attributeFormDefault="unqualified"> ! <xsd:element name="echoIn" type="xsd:string"/> ! <xsd:element name="echoOut" type="xsd:string"/> ! <xsd:element name="echoFault" type="xsd:string"/> ! </xsd:schema> ! </types> ! <interface name="wsaTestInterface"> ! <fault name="echoFaultName" element="s1:echoFault"/> ! <operation name="echo" pattern="http://www.w3.org/ns/wsdl/in-out"> ! <input element="s1:echoIn"/> ! <output element="s1:echoOut"/> ! <outfault ref="tns:echoFaultName"/> ! </operation> ! <operation name="notify" pattern="http://www.w3.org/ns/wsdl/in-only"> ! <input element="s0:notify"/> ! </operation> ! </interface> ! <interface name="wsaTestInterfaceExplicitAction"> ! <fault name="echoFaultName" element="s1:echoFault" ! wsaw:Action="http://example.org/action/echoFault"/> ! <operation name="echo" pattern="http://www.w3.org/ns/wsdl/in-out"> ! <input element="s1:echoIn" ! wsaw:Action="http://example.org/action/echoIn"/> ! <output element="s1:echoOut" ! wsaw:Action="http://example.org/action/echoOut"/> ! <outfault ref="tns:echoFaultName"/> ! </operation> ! <operation name="notify" pattern="http://www.w3.org/ns/wsdl/in-only"> ! <input element="s0:notify" ! wsaw:Action="http://example.org/action/notify"/> ! </operation> ! </interface> ! <binding xmlns:wsoap="http://www.w3.org/ns/wsdl/soap" ! name="wsaTestInterfaceBindingAddressingRequired" ! interface="tns:wsaTestInterface" type="http://www.w3.org/ns/wsdl/soap" ! wsoap:version="1.1" ! wsoap:protocol="http://www.w3.org/2006/01/soap11/bindings/HTTP/"> ! <fault ref="tns:echoFaultName"/> ! <wsaw:UsingAddressing wsdl:required="true"/> ! <operation ref="tns:echo"/> ! <operation ref="tns:notify"/> ! </binding> ! <binding xmlns:wsoap="http://www.w3.org/ns/wsdl/soap" ! name="wsaTestInterfaceBindingAddressingNotRequired" ! interface="tns:wsaTestInterface" type="http://www.w3.org/ns/wsdl/soap" ! wsoap:version="1.1" ! wsoap:protocol="http://www.w3.org/2006/01/soap11/bindings/HTTP/"> ! <fault ref="tns:echoFaultName"/> ! <wsaw:UsingAddressing wsdl:required="false"/> ! <operation ref="tns:echo"/> ! <operation ref="tns:notify"/> ! </binding> ! <binding xmlns:wsoap="http://www.w3.org/ns/wsdl/soap" name="wsaTestInterfaceBinding" ! interface="tns:wsaTestInterface" type="http://www.w3.org/ns/wsdl/soap" ! wsoap:version="1.1" ! wsoap:protocol="http://www.w3.org/2006/01/soap11/bindings/HTTP/"> ! <fault ref="tns:echoFaultName"/> ! <operation ref="tns:echo"/> ! <operation ref="tns:notify"/> ! </binding> ! <binding xmlns:wsoap="http://www.w3.org/ns/wsdl/soap" ! name="wsaTestInterfaceBindingSoapAction" interface="tns:wsaTestInterface" ! type="http://www.w3.org/ns/wsdl/soap" wsoap:version="1.1" ! wsoap:protocol="http://www.w3.org/2006/01/soap11/bindings/HTTP/"> ! <fault ref="tns:echoFaultName"/> ! <wsaw:UsingAddressing wsdl:required="true"/> ! <operation ref="tns:echo" ! wsoap:soapAction="http://example.org/wsaTestService/echo"/> ! <operation ref="tns:notify" ! wsoap:soapAction="http://example.org/wsaTestService/notify"/> ! </binding> ! <binding xmlns:wsoap="http://www.w3.org/ns/wsdl/soap" ! name="wsaTestInterfaceBindingExplicitAction" ! interface="tns:wsaTestInterfaceExplicitAction" ! type="http://www.w3.org/ns/wsdl/soap" wsoap:version="1.1" ! wsoap:protocol="http://www.w3.org/2006/01/soap11/bindings/HTTP/"> ! <fault ref="tns:echoFaultName"/> ! <wsaw:UsingAddressing wsdl:required="true"/> ! <operation ref="tns:echo"/> ! <operation ref="tns:notify"/> ! </binding> ! <binding xmlns:wsoap="http://www.w3.org/ns/wsdl/soap" ! name="wsaTestInterfaceBindingAnonymousRequired" interface="tns:wsaTestInterface" ! type="http://www.w3.org/ns/wsdl/soap" wsoap:version="1.1" ! wsoap:protocol="http://www.w3.org/2006/01/soap11/bindings/HTTP/"> ! <fault ref="tns:echoFaultName"/> ! <wsaw:UsingAddressing wsdl:required="true"/> ! <operation ref="tns:echo"> ! <wsaw:Anonymous>required</wsaw:Anonymous> ! </operation> ! <operation ref="tns:notify"> ! <wsaw:Anonymous>required</wsaw:Anonymous> ! </operation> ! </binding> ! <binding xmlns:wsoap="http://www.w3.org/ns/wsdl/soap" ! name="wsaTestInterfaceBindingAnonymousProhibited" ! interface="tns:wsaTestInterface" type="http://www.w3.org/ns/wsdl/soap" ! wsoap:version="1.1" ! wsoap:protocol="http://www.w3.org/2006/01/soap11/bindings/HTTP/"> ! <fault ref="tns:echoFaultName"/> ! <wsaw:UsingAddressing wsdl:required="true"/> ! <operation ref="tns:echo"> ! <wsaw:Anonymous>prohibited</wsaw:Anonymous> ! </operation> ! <operation ref="tns:notify"> ! <wsaw:Anonymous>prohibited</wsaw:Anonymous> ! </operation> ! </binding> ! <binding xmlns:wsoap="http://www.w3.org/ns/wsdl/soap" ! name="wsaTestInterfaceBindingAnonymousOptional" interface="tns:wsaTestInterface" ! type="http://www.w3.org/ns/wsdl/soap" wsoap:version="1.1" ! wsoap:protocol="http://www.w3.org/2006/01/soap11/bindings/HTTP/"> ! <fault ref="tns:echoFaultName"/> ! <wsaw:UsingAddressing wsdl:required="true"/> ! <operation ref="tns:echo"> ! <wsaw:Anonymous>optional</wsaw:Anonymous> ! </operation> ! <operation ref="tns:notify"> ! <wsaw:Anonymous>optional</wsaw:Anonymous> ! </operation> ! </binding> ! <service name="wsaTestService2" interface="tns:wsaTestInterface"> ! <endpoint name="wsaTestInterfaceEndpointAddressingRequired" ! binding="tns:wsaTestInterfaceBindingAddressingRequired" ! address="http://example.com/wsaTestInterfaceEndpointAddressingRequired"/> ! <endpoint name="wsaTestInterfaceEndpointAddressingNotRequired" ! binding="tns:wsaTestInterfaceBindingAddressingNotRequired" ! address="http://example.com/wsaTestInterfaceEndpointAddressingNotRequired"/> ! <endpoint name="wsaTestInterfaceEndpointAddressingRequiredOnEndpoint" ! binding="tns:wsaTestInterfaceBinding" ! address="http://example.com/wsaTestInterfaceEndpointAddressingRequiredOnEndpoint"/> ! <endpoint name="wsaTestInterfaceEndpointAddressingNotRequiredOnEndpoint" ! binding="tns:wsaTestInterfaceBinding" ! address="http://example.com/wsaTestInterfaceEndpointAddressingRequiredOnEndpoint"/> ! <endpoint name="wsaTestInterfaceEndpointSoapAction" ! binding="tns:wsaTestInterfaceBindingSoapAction" ! address="http://example.com/wsaTestInterfaceEndpointSoapAction"/> ! <endpoint name="wsaTestInterfaceEndpointExplicitAction" ! binding="tns:wsaTestInterfaceBindingExplicitAction" ! address="http://example.com/wsaTestInterfaceEndpointExplicitAction"/> ! <endpoint name="wsaTestInterfaceEndpointAnonymousRequired" ! binding="tns:wsaTestInterfaceBindingAnonymousRequired" ! address="http://example.com/wsaTestInterfaceEndpointAnonymousRequired"/> ! <endpoint name="wsaTestInterfaceEndpointAnonymousProhibited" ! binding="tns:wsaTestInterfaceBindingAnonymousProhibited" ! address="http://example.com/wsaTestInterfaceEndpointAnonymousProhibited"/> ! <endpoint name="wsaTestInterfaceEndpointAnonymousOptional" ! binding="tns:wsaTestInterfaceBindingAnonymousOptional" ! address="http://example.com/wsaTestInterfaceEndpointAnonymousOptional"/> ! </service> </description> --- 1,86 ---- ! <description xmlns="http://www.w3.org/ns/wsdl" xmlns:tns="http://example.org/wsaTestService2" ! xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata" ! xmlns:wsp="http://www.w3.org/ns/ws-policy" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ! xmlns:s0="http://example.org/notify" xmlns:s1="http://example.org/echo" ! targetNamespace="http://example.org/wsaTestService2"> ! <!-- ! Documentation at: ! http://esw.w3.org/topic/WsdlConverter ! To report problems, please refer to: ! http://esw.w3.org/topic/WsdlConverterFeedback ! Generated by the WSDL converter version: ! 2006-02-20 ! ! Manually cleansed by Jonathan Marsh 2007-06-29 ! --> ! <types> ! <xsd:schema targetNamespace="http://example.org/notify" elementFormDefault="qualified" ! attributeFormDefault="unqualified"> ! <xsd:element name="notify" type="xsd:string"/> ! </xsd:schema> ! <xsd:schema targetNamespace="http://example.org/echo" elementFormDefault="qualified" ! attributeFormDefault="unqualified"> ! <xsd:element name="echoIn" type="xsd:string"/> ! <xsd:element name="echoOut" type="xsd:string"/> ! <xsd:element name="echoFault" type="xsd:string"/> ! </xsd:schema> ! </types> ! <interface name="wsaTestInterface"> ! <fault name="echoFaultName" element="s1:echoFault"/> ! <operation name="echo" pattern="http://www.w3.org/ns/wsdl/in-out"> ! <input element="s1:echoIn"/> ! <output element="s1:echoOut"/> ! <outfault ref="tns:echoFaultName"/> ! </operation> ! <operation name="notify" pattern="http://www.w3.org/ns/wsdl/in-only"> ! <input element="s0:notify"/> ! </operation> ! </interface> ! <interface name="wsaTestInterfaceExplicitAction"> ! <fault name="echoFaultName" element="s1:echoFault"/> ! <operation name="echo" pattern="http://www.w3.org/ns/wsdl/in-out"> ! <input element="s1:echoIn" wsam:Action="http://example.org/action/echoIn"/> ! <output element="s1:echoOut" wsam:Action="http://example.org/action/echoOut"/> ! <outfault ref="tns:echoFaultName" wsam:Action="http://example.org/action/echoFault"/> ! </operation> ! <operation name="notify" pattern="http://www.w3.org/ns/wsdl/in-only"> ! <input element="s0:notify" wsam:Action="http://example.org/action/notify"/> ! </operation> ! </interface> ! <binding xmlns:wsoap="http://www.w3.org/ns/wsdl/soap" name="wsaTestInterfaceBinding" ! interface="tns:wsaTestInterface" type="http://www.w3.org/ns/wsdl/soap" wsoap:version="1.1" ! wsoap:protocol="http://www.w3.org/2006/01/soap11/bindings/HTTP/"> ! <wsp:Policy> ! <wsam:Addressing> ! <wsp:Policy/> ! </wsam:Addressing> ! </wsp:Policy> ! <fault ref="tns:echoFaultName"/> ! <operation ref="tns:echo"/> ! <operation ref="tns:notify"/> ! </binding> ! <binding xmlns:wsoap="http://www.w3.org/ns/wsdl/soap" ! name="wsaTestInterfaceBindingExplicitAction" interface="tns:wsaTestInterfaceExplicitAction" ! type="http://www.w3.org/ns/wsdl/soap" wsoap:version="1.1" ! wsoap:protocol="http://www.w3.org/2006/01/soap11/bindings/HTTP/"> ! <wsp:Policy> ! <wsam:Addressing> ! <wsp:Policy/> ! </wsam:Addressing> ! </wsp:Policy> ! <fault ref="tns:echoFaultName"/> ! <operation ref="tns:echo"/> ! <operation ref="tns:notify"/> ! </binding> ! <service name="wsaTestService2" interface="tns:wsaTestInterface"> ! <endpoint name="wsaTestInterfacePortAddressingRequired" binding="tns:wsaTestInterfaceBinding" ! address="http://example.com/wsaTestInterfacePortAddressingRequired"/> ! <endpoint name="wsaTestInterfacePortExplicitActionAddressingRequired" ! binding="tns:wsaTestInterfaceBindingExplicitAction" ! address="http://example.com/wsaTestInterfacePortExplicitAction"/> ! </service> </description> Index: TestMetadata.xml =================================================================== RCS file: /sources/public/2002/ws/desc/test-suite/documents/good/WSAddressing-1G/TestMetadata.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C 2 -d -r1.3 -r1.4 *** TestMetadata.xml 23 Mar 2007 05:50:31 -0000 1.3 --- TestMetadata.xml 7 Jul 2007 01:12:32 -0000 1.4 *************** *** 13,17 **** <Input role="root">wsaTestService2.wsdl</Input> <Input role="required-extension">http://www.w3.org/ns/wsdl/soap</Input> ! <Input role="required-extension">http://www.w3.org/2006/05/addressing/wsdl</Input> </Inputs> <ExpectedResults> --- 13,18 ---- <Input role="root">wsaTestService2.wsdl</Input> <Input role="required-extension">http://www.w3.org/ns/wsdl/soap</Input> ! <Input role="required-extension">http://www.w3.org/2007/05/addressing/metadata</Input> ! <Input role="required-extension">http://www.w3.org/ns/ws-policy</Input> </Inputs> <ExpectedResults>
Received on Saturday, 7 July 2007 01:13:34 UTC