- From: Marc Hadley via cvs-syncmail <cvsmail@w3.org>
- Date: Wed, 26 Apr 2006 15:28:32 +0000
- To: public-ws-addressing-eds@w3.org
Update of /sources/public/2004/ws/addressing
In directory hutz:/tmp/cvs-serv23341
Modified Files:
ws-addr-wsdl.xml
Log Message:
Added resolution of issue lc123 - changed all the examples to be based on the one used in the WSDL 2.0 primer
Index: ws-addr-wsdl.xml
===================================================================
RCS file: /sources/public/2004/ws/addressing/ws-addr-wsdl.xml,v
retrieving revision 1.91
retrieving revision 1.92
diff -C2 -d -r1.91 -r1.92
*** ws-addr-wsdl.xml 17 Apr 2006 10:27:23 -0000 1.91
--- ws-addr-wsdl.xml 26 Apr 2006 15:28:30 -0000 1.92
***************
*** 200,205 ****
<p>The element information items defined above are used in an EPR's metadata section.
The following shows an example endpoint reference. This references the interface
! named "fabrikam:Inventory" at the endpoint IRI
! "http://example.com/fabrikam/acct". Note the use of the WSDL[<bibref
ref="WSDL20"/>] wsdlLocation attribute.</p>
<example>
--- 200,205 ----
<p>The element information items defined above are used in an EPR's metadata section.
The following shows an example endpoint reference. This references the interface
! named "ghns:reservationInterface" at the endpoint IRI
! "http://greath.example.com/2004/reservation". Note the use of the WSDL[<bibref
ref="WSDL20"/>] wsdlLocation attribute.</p>
<example>
***************
*** 208,217 ****
<wsa:EndpointReference
xmlns:wsa="&nsuri;"
! xmlns:fabrikam="http://example.com/fabrikam">
! <wsa:Address>http://example.com/fabrikam/acct</wsa:Address>
<wsa:Metadata
xmlns:wsdli="&wsdl20nsuri;-instance"
! wsdli:wsdlLocation="http://example.com/fabrikam http://example.com/fabrikam.wsdl">
! <wsaw:InterfaceName>fabrikam:Inventory</wsaw:InterfaceName>
</wsa:Metadata>
</wsa:EndpointReference></eg>
--- 208,217 ----
<wsa:EndpointReference
xmlns:wsa="&nsuri;"
! xmlns:ghns="http://greath.example.com/2004/wsdl/resSvc">
! <wsa:Address>http://greath.example.com/2004/reservation</wsa:Address>
<wsa:Metadata
xmlns:wsdli="&wsdl20nsuri;-instance"
! wsdli:wsdlLocation="http://greath.example.com/2004/wsdl/resSvc http://greath.example.com/2004/reservation.wsdl">
! <wsaw:InterfaceName>ghns:reservationInterface</wsaw:InterfaceName>
</wsa:Metadata>
</wsa:EndpointReference></eg>
***************
*** 247,272 ****
xmlns:wsa="&nsuri;">
! <wsa:Address>http://example.com/fabrikam/acct</wsa:Address>
<wsa:Metadata
xmlns:wsdli="&wsdl20nsuri;-instance"
! wsdli:wsdlLocation="http://example.com/fabrikam http://example.com/fabrikam.wsdl">
<wsdl20:description
! targetNamespace="http://example.com/fabrikam"
! xmlns:fabrikam="http://example.com/fabrikam"
! xmlns:abc="http://www.abccorp.com/"
xmlns:wsdl20="&wsdl20nsuri;">
! <wsdl20:import namespace="http://example.com/fabrikam/"
! location="http://example.com/fabrikam/fabrikam.wsdl/"/>
! <wsdl20:import namespace="http://www.abccorp.com/"
! location="http://www.abccorp.com/abc.wsdl"/>
! <wsdl20:service name="InventoryService"
! interface="fabrikam:Inventory">
! <wsdl20:endpoint name="ep1" binding="abc:soap-http-binding"
! address="http://example.com/fabrikam/acct"/>
! <wsdl20:endpoint name="ep2" binding="abc:iiop"
! address="..."/>
! <wsdl20:endpoint name="ep3"
! binding="abc:soap-http-binding"
! address="http://alt.example.com/fabrikam/acct"/>
</wsdl20:service>
</wsdl20:description>
--- 247,266 ----
xmlns:wsa="&nsuri;">
! <wsa:Address>http://greath.example.com/2004/reservation</wsa:Address>
<wsa:Metadata
xmlns:wsdli="&wsdl20nsuri;-instance"
! wsdli:wsdlLocation="http://greath.example.com/2004/wsdl/resSvc http://greath.example.com/2004/reservation.wsdl">
<wsdl20:description
! targetNamespace="http://greath.example.com/2004/wsdl/resSvc"
! xmlns:tns="http://greath.example.com/2004/wsdl/resSvc"
! xmlns:ghns="http://greath.example.com/2004/wsdl/resSvc"
xmlns:wsdl20="&wsdl20nsuri;">
! <wsdl20:import namespace="http://greath.example.com/2004/wsdl/resSvc"
! location="http://greath.example.com/2004/reservation.wsdl"/>
! <wsdl20:service name="reservationService"
! interface="tns:reservationInterface">
! <wsdl20:endpoint name="reservationEndpoint"
! binding="tns:reservationSOAPBinding"
! address ="http://greath.example.com/2004/reservation"/>
</wsdl20:service>
</wsdl20:description>
***************
*** 280,301 ****
<wsa:EndpointReference
xmlns:wsa="&nsuri;">
! <wsa:Address>http://example.com/fabrikam/acct</wsa:Address>
<wsa:Metadata>
! <wsdl11:definitions targetNamespace="http://example.com/fabrikam"
! xmlns:fabrikam="http://example.com/fabrikam"
! xmlns:abc="http://www.abccorp.com/"
xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:iiop="http://www.iiop.org/"
xmlns:wsdl11="http://schemas.xmlsoap.org/wsdl/">
! <wsdl11:import namespace="http://example.com/fabrikam"
! location="http://example.com/fabrikam/fabrikam.wsdl"/>
! <wsdl11:import namespace="http://www.abccorp.com/"
! location="http://www.abccorp.com/abc.wsdl"/>
! <wsdl11:service name="InventoryService">
! <wsdl11:port name="ep1" binding="abc:soap-http-binding">
! <soap:address location="http://example.com/fabrikam/acct"/>
! </wsdl11:port>
! <wsdl11:port name="ep2" binding="abc:iiop">
! <iiop:address location="..."/>
</wsdl11:port>
</wsdl11:service>
--- 274,288 ----
<wsa:EndpointReference
xmlns:wsa="&nsuri;">
! <wsa:Address>http://greath.example.com/2004/reservation</wsa:Address>
<wsa:Metadata>
! <wsdl11:definitions targetNamespace="http://greath.example.com/2004/wsdl/resSvc"
! xmlns:ghns="http://greath.example.com/2004/wsdl/resSvc"
xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
xmlns:wsdl11="http://schemas.xmlsoap.org/wsdl/">
! <wsdl11:import namespace="http://greath.example.com/2004/wsdl/resSvc"
! location="http://greath.example.com/2004/reservation.wsdl"/>
! <wsdl11:service name="reservationService">
! <wsdl11:port name="ep1" binding="ghns:reservationSOAPBinding">
! <soap:address location="http://greath.example.com/2004/reservation"/>
</wsdl11:port>
</wsdl11:service>
***************
*** 405,413 ****
<example>
<head>Indicating use of WS-Addressing using wsaw:UsingAddressing in WSDL 1.1</head>
! <eg xml:space="preserve"><binding name="StockQuoteSoapBinding" type="tns:StockQuotePortType">
<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
<wsaw:UsingAddressing wsdl:required="true" />
! <operation name="GetLastTradePrice">
! <soap:operation soapaction="http://example.com/GetLastTradePrice" />
<input>
<soap:body use="literal" />
--- 392,401 ----
<example>
<head>Indicating use of WS-Addressing using wsaw:UsingAddressing in WSDL 1.1</head>
! <eg xml:space="preserve"><binding name="reservationSOAPBinding"
! type="tns:reservationInterface">
<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
<wsaw:UsingAddressing wsdl:required="true" />
! <operation name="opCheckAvailability">
! <soap:operation soapaction="http://greath.example.com/2004/wsdl/resSvc/opCheckAvailability" />
<input>
<soap:body use="literal" />
***************
*** 555,563 ****
<example>
<head> Indicating use of anonymous addresses using wsaw:Anonymous. </head>
! <eg xml:space="preserve"><binding name="StockQuoteSoapBinding" type="tns:StockQuotePortType">
<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
<wsaw:UsingAddressing wsdl:required="true" />
! <operation name="GetLastTradePrice">
! <soap:operation soapaction="http://example.com/GetLastTradePrice" />
<input>
<soap:body use="literal" />
--- 543,551 ----
<example>
<head> Indicating use of anonymous addresses using wsaw:Anonymous. </head>
! <eg xml:space="preserve"><binding name="reservationSOAPBinding" type="tns:reservationInterface">
<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
<wsaw:UsingAddressing wsdl:required="true" />
! <operation name="opCheckAvailability">
! <soap:operation soapaction="http://greath.example.com/2004/wsdl/resSvc/opCheckAvailability" />
<input>
<soap:body use="literal" />
***************
*** 568,572 ****
<wsaw:Anonymous>required</wsaw:Anonymous>
</operation>
- <operation name="someOther">...</operation>
</binding>
</eg>
--- 556,559 ----
***************
*** 690,701 ****
<head>Explicit specification of wsa:Action value in a WSDL 2.0 description.</head>
<eg xml:space="preserve">
! <description targetNamespace="http://example.com/stockquote" ...>
...
! <interface name="StockQuoteInterface">
! <operation name="GetLastTradePrice" pattern="&wsdl20nsuri;/in-out">
! <input element="tns:GetTradePricesInput" messageLabel="In"
! wsaw:Action="http://example.com/GetQuote"/>
! <output element="tns:GetTradePricesOutput" messageLabel="Out"
! wsaw:Action="http://example.com/Quote"/>
</operation>
</interface>
--- 677,688 ----
<head>Explicit specification of wsa:Action value in a WSDL 2.0 description.</head>
<eg xml:space="preserve">
! <description targetNamespace="http://greath.example.com/2004/schemas/resSvc" ...>
...
! <interface name="reservationInterface">
! <operation name="opCheckAvailability" pattern="&wsdl20nsuri;/in-out">
! <input element="tns:checkAvailability" messageLabel="In"
! wsaw:Action="http://greath.example.com/2004/wsdl/resSvc/opCheckAvailability"/>
! <output element="tns:checkAvailabilityResponse" messageLabel="Out"
! wsaw:Action="http://greath.example.com/2004/wsdl/resSvc/opCheckAvailabilityResponse"/>
</operation>
</interface>
***************
*** 703,721 ****
</description></eg>
</example>
! <p>The action for the input of the GetLastTradePrice operation within the
! StockQuoteInterface is explicitly defined to be http://example.com/GetQuote.
The action for the output of this same operation is
! http://example.com/Quote.</p>
<example>
<head>Explicit specification of wsa:Action value in a WSDL 1.1 description.</head>
<eg xml:space="preserve">
! <definitions targetNamespace="http://example.com/stockquote" ...>
...
! <portType name="StockQuotePortType">
! <operation name="GetLastTradePrice">
! <input message="tns:GetTradePricesInput"
! wsaw:Action="http://example.com/GetQuote"/>
! <output message="tns:GetTradePricesOutput"
! wsaw:Action="http://example.com/Quote"/>
</operation>
</portType>
--- 690,708 ----
</description></eg>
</example>
! <p>The action for the input of the opCheckAvailability operation within the
! SreservationInterface is explicitly defined to be http://greath.example.com/2004/wsdl/resSvc/opCheckAvailability.
The action for the output of this same operation is
! http://greath.example.com/2004/wsdl/resSvc/opCheckAvailabilityResponse.</p>
<example>
<head>Explicit specification of wsa:Action value in a WSDL 1.1 description.</head>
<eg xml:space="preserve">
! <definitions targetNamespace="http://greath.example.com/2004/schemas/resSvc" ...>
...
! <portType name="reservationInterface">
! <operation name="opCheckAvailability">
! <input message="tns:checkAvailability"
! wsaw:Action="http://greath.example.com/2004/wsdl/resSvc/opCheckAvailability"/>
! <output message="tns:checkAvailabilityResponse"
! wsaw:Action="http://greath.example.com/2004/wsdl/resSvc/opCheckAvailabilityResponse"/>
</operation>
</portType>
***************
*** 724,731 ****
</eg>
</example>
! <p>The action for the input of the GetLastTradePrice operation within the
! StockQuotePortType is explicitly defined to be http://example.com/GetQuote.
The action for the output of this same operation is
! http://example.com/Quote.</p>
</div3>
<div3 id="defactionwsdl20">
--- 711,718 ----
</eg>
</example>
! <p>The action for the input of the opCheckAvailability operation within the
! reservationInterface port type is explicitly defined to be http://greath.example.com/2004/wsdl/resSvc/opCheckAvailability.
The action for the output of this same operation is
! http://greath.example.com/2004/wsdl/resSvc/opCheckAvailabilityResponse.</p>
</div3>
<div3 id="defactionwsdl20">
***************
*** 834,858 ****
names.</head>
<eg xml:space="preserve">
! <definitions targetNamespace="http://example.com/stockquote" ...>
...
! <interface name="StockQuoteInterface">
! <operation name="GetLastTradePrice" pattern="&wsdl20nsuri;/in-out">
! <input element="tns:GetTradePricesInput" messageLabel="in" name="GetQuote"/>
! <output element="tns:GetTradePricesOutput" messageLabel="out" name="Quote"/>
</operation>
! </portType>
...
</definitions>
</eg>
! <p> [targetNamespace] = http://example.com/stockquote</p>
! <p> [interface name] = StockQuoteInterface</p>
! <p> [operation name] = GetLastTradePrice</p>
<p> [direction token] for input is Request </p>
<p> [direction token] for output is Response</p>
<p>Applying the pattern above with these values we have:</p>
<p>input action =
! http://example.com/stockquote/StockQuoteInterface/GetLastTradePriceRequest</p>
<p>output action =
! http://example.com/stockquote/StockQuoteInterface/GetLastTradePriceResponse</p>
</example>
</div3>
--- 821,845 ----
names.</head>
<eg xml:space="preserve">
! <definitions targetNamespace="http://greath.example.com/2004/wsdl/resSvc" ...>
...
! <interface name="reservationInterface">
! <operation name="opCheckAvailability" pattern="&wsdl20nsuri;/in-out">
! <input element="tns:checkAvailability" messageLabel="in" name="CheckAvailability"/>
! <output element="tns:checkAvailabilityResponse" messageLabel="out" name="Availability"/>
</operation>
! </interface>
...
</definitions>
</eg>
! <p> [targetNamespace] = http://greath.example.com/2004/wsdl/resSvc</p>
! <p> [interface name] = reservationInterface</p>
! <p> [operation name] = opCheckAvailability</p>
<p> [direction token] for input is Request </p>
<p> [direction token] for output is Response</p>
<p>Applying the pattern above with these values we have:</p>
<p>input action =
! http://greath.example.com/2004/wsdl/resSvc/reservationInterface/opCheckAvailabilityRequest</p>
<p>output action =
! http://greath.example.com/2004/wsdl/resSvc/reservationInterface/opCheckAvailabilityResponse</p>
</example>
</div3>
***************
*** 945,955 ****
names.</head>
<eg xml:space="preserve">
! <definitions targetNamespace="http://example.com/stockquote" ...>
...
! <portType name="StockQuotePortType">
! <operation name="GetLastTradePrice">
! <input message="tns:GetTradePricesInput" name="GetQuote"/>
! <output message="tns:GetTradePricesOutput" name="Quote"/>
! <fault message="tns:ErrorMessage" name="Error"/>
</operation>
</portType>
--- 932,942 ----
names.</head>
<eg xml:space="preserve">
! <definitions targetNamespace="http://greath.example.com/2004/wsdl/resSvc" ...>
...
! <portType name="reservationInterface">
! <operation name="opCheckAvailability">
! <input message="tns:checkAvailability" name="CheckAvailability"/>
! <output message="tns:checkAvailabilityResponse" name="Availability"/>
! <fault message="tns:InvalidDate" name="InvalidDate"/>
</operation>
</portType>
***************
*** 957,970 ****
</definitions>
</eg>
! <p> [targetNamespace] = http://example.com/stockquote</p>
! <p> [port type name] = StockQuotePortType</p>
! <p> [input name] = GetQuote</p>
! <p> [output name] = Quote</p>
! <p> [fault name] = Error</p>
<p>Applying the pattern above with these values we have:</p>
! <p>input action = http://example.com/stockquote/StockQuotePortType/GetQuote</p>
! <p>output action = http://example.com/stockquote/StockQuotePortType/Quote</p>
<p>fault action =
! http://example.com/stockquote/StockQuotePortType/GetLastTradePrice/Fault/Error</p>
</example>
<p>WSDL defines rules for a default input or output name if the name attribute
--- 944,957 ----
</definitions>
</eg>
! <p> [targetNamespace] = http://greath.example.com/2004/wsdl/resSvc</p>
! <p> [port type name] = reservationInterface</p>
! <p> [input name] = CheckAvailability</p>
! <p> [output name] = CheckAvailabilityResponse</p>
! <p> [fault name] = InvalidDate</p>
<p>Applying the pattern above with these values we have:</p>
! <p>input action = http://greath.example.com/2004/wsdl/resSvc/reservationInterface/CheckAvailability</p>
! <p>output action = http://greath.example.com/2004/wsdl/resSvc/reservationInterface/Availability</p>
<p>fault action =
! http://greath.example.com/2004/wsdl/resSvc/reservationInterface/opCheckAvailability/Fault/InvalidDate</p>
</example>
<p>WSDL defines rules for a default input or output name if the name attribute
***************
*** 974,983 ****
names.</head>
<eg xml:space="preserve">
! <definitions targetNamespace="http://example.com/stockquote" ...>
...
! <portType name="StockQuotePortType">
! <operation name="GetLastTradePrice">
! <input message="tns:GetTradePricesInput"/>
! <output message="tns:GetTradePricesOutput"/>
</operation>
</portType>
--- 961,970 ----
names.</head>
<eg xml:space="preserve">
! <definitions targetNamespace="http://greath.example.com/2004/wsdl/resSvc" ...>
...
! <portType name="reservationInterface">
! <operation name="opCheckAvailability">
! <input message="tns:checkAvailability"/>
! <output message="tns:checkAvailabilityResponse"/>
</operation>
</portType>
***************
*** 985,990 ****
</definitions>
</eg>
! <p> [targetNamespace] = http://example.com/stockquote</p>
! <p> [port type name] = StockQuotePortType</p>
<p>According to the rules defined in <xspecref
href="http://www.w3.org/TR/wsdl#_names">Section 2.4.5</xspecref> of
--- 972,977 ----
</definitions>
</eg>
! <p> [targetNamespace] = http://greath.example.com/2004/wsdl/resSvc</p>
! <p> [port type name] = reservationInterface</p>
<p>According to the rules defined in <xspecref
href="http://www.w3.org/TR/wsdl#_names">Section 2.4.5</xspecref> of
***************
*** 992,1004 ****
response operation the default value is the name of the operation with
"Request" appended.</p>
! <p> [input name] = GetLastTradePriceRequest</p>
<p>Likewise, the output defaults to the operation name with "Response"
appended.</p>
! <p> [output name] = GetLastTradePriceResponse</p>
<p>Applying the pattern above with these values we have:</p>
<p>input action =
! http://example.com/stockquote/StockQuotePortType/GetLastTradePriceRequest</p>
<p>output action =
! http://example.com/stockquote/StockQuotePortType/GetLastTradePriceResponse</p>
</example>
</div3>
--- 979,991 ----
response operation the default value is the name of the operation with
"Request" appended.</p>
! <p> [input name] = opCheckAvailabilityRequest</p>
<p>Likewise, the output defaults to the operation name with "Response"
appended.</p>
! <p> [output name] = opCheckAvailabilityResponse</p>
<p>Applying the pattern above with these values we have:</p>
<p>input action =
! http://greath.example.com/2004/wsdl/resSvc/reservationInterface/opCheckAvailabilityRequest</p>
<p>output action =
! http://greath.example.com/2004/wsdl/resSvc/reservationInterface/opCheckAvailabilityResponse</p>
</example>
</div3>
Received on Wednesday, 26 April 2006 15:28:51 UTC