- From: Hugo Haas via cvs-syncmail <cvsmail@w3.org>
- Date: Tue, 09 Aug 2005 10:03:47 +0000
- To: public-ws-addressing-eds@w3.org
Update of /sources/public/2004/ws/addressing
In directory homer:/tmp/cvs-serv8319
Modified Files:
ws-addr-wsdl.xml
Log Message:
Added &wsa-wsdl-nsuri; for WSDL binding namespace URI
Using wsdl20nsuri for WSDL 2.0 namespace
Updated WSDL 2.0 reference
Index: ws-addr-wsdl.xml
===================================================================
RCS file: /sources/public/2004/ws/addressing/ws-addr-wsdl.xml,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -d -r1.47 -r1.48
*** ws-addr-wsdl.xml 2 Aug 2005 07:12:27 -0000 1.47
--- ws-addr-wsdl.xml 9 Aug 2005 10:03:44 -0000 1.48
***************
*** 8,12 ****
<!ENTITY document.status "Editors' copy $Date$">
<!ENTITY wsa-title "&wsa-wsdl.title;">
! <!ENTITY wsdl20nsuri "http://www.w3.org/2004/08/wsdl" >
<!ENTITY prevloc "http://www.w3.org/TR/2005/WD-ws-addr-wsdl-20050215">
]>
--- 8,12 ----
<!ENTITY document.status "Editors' copy $Date$">
<!ENTITY wsa-title "&wsa-wsdl.title;">
! <!ENTITY wsdl20nsuri "http://www.w3.org/2005/08/wsdl" >
<!ENTITY prevloc "http://www.w3.org/TR/2005/WD-ws-addr-wsdl-20050215">
]>
***************
*** 106,110 ****
<tr>
<td>wsaw</td>
! <td> &nsuri;/wsdl </td>
</tr>
<tr>
--- 106,110 ----
<tr>
<td>wsaw</td>
! <td> &wsa-wsdl-nsuri; </td>
</tr>
<tr>
***************
*** 114,123 ****
<tr>
<td>wsdl</td>
! <td>Either http://www.w3.org/2004/08/wsdl or
http://schemas.xmlsoap.org/wsdl/ depending on context</td>
</tr>
<tr>
<td>wsdl20</td>
! <td>http://www.w3.org/2004/08/wsdl</td>
</tr>
<tr>
--- 114,123 ----
<tr>
<td>wsdl</td>
! <td>Either &wsdl20nsuri; or
http://schemas.xmlsoap.org/wsdl/ depending on context</td>
</tr>
<tr>
<td>wsdl20</td>
! <td>&wsdl20nsuri;</td>
</tr>
<tr>
***************
*** 133,137 ****
[<bibref ref="XML10"/>] representation but this is not a requirement.</p>
<p>All information items defined by this specification are identified by the XML
! namespace URI [<bibref ref="XMLNS"/>] "&nsuri;/wsdl". A normative XML Schema
[<bibref ref="XMLSchemaP1"/>, <bibref ref="XMLSchemaP2"/>] document can be
obtained by dereferencing the XML namespace URI.</p>
--- 133,137 ----
[<bibref ref="XML10"/>] representation but this is not a requirement.</p>
<p>All information items defined by this specification are identified by the XML
! namespace URI [<bibref ref="XMLNS"/>] "&wsa-wsdl-nsuri;". A normative XML Schema
[<bibref ref="XMLSchemaP1"/>, <bibref ref="XMLSchemaP2"/>] document can be
obtained by dereferencing the XML namespace URI.</p>
***************
*** 187,191 ****
<wsa:Address>http://example.com/fabrikam/acct</wsa:Address>
<wsa:Metadata
! xmlns:wsdli="http://www.w3.org/2004/08/wsdl-instance"
wsdli:wsdlLocation="http://example.com/fabrikam http://example.com/fabrikam.wsdl">
<wsaw:InterfaceName>fabrikam:Inventory</wsaw:InterfaceName>
--- 187,191 ----
<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>
***************
*** 226,230 ****
<wsa:Address>http://example.com/fabrikam/acct</wsa:Address>
<wsa:Metadata
! xmlns:wsdli="http://www.w3.org/2004/08/wsdl-instance"
wsdli:wsdlLocation="http://example.com/fabrikam http://example.com/fabrikam.wsdl">
<wsdl20:description
--- 226,230 ----
<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
***************
*** 232,236 ****
xmlns:fabrikam="http://example.com/fabrikam"
xmlns:abc="http://www.abccorp.com/"
! xmlns:wsdl20="http://www.w3.org/2004/08/wsdl">
<wsdl20:import namespace="http://example.com/fabrikam/"
location="http://example.com/fabrikam/fabrikam.wsdl/"/>
--- 232,236 ----
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/"/>
***************
*** 330,334 ****
><binding name="reservationSOAPBinding"
interface="tns:reservationInterface"
! type="http://www.w3.org/2004/08/wsdl/soap12"
wsoap:protocol="http://www.w3.org/2003/05/soap/bindings/HTTP">
<wsaw:UsingAddressing wsdl:required="true" />
--- 330,334 ----
><binding name="reservationSOAPBinding"
interface="tns:reservationInterface"
! type="&wsdl20nsuri;/soap12"
wsoap:protocol="http://www.w3.org/2003/05/soap/bindings/HTTP">
<wsaw:UsingAddressing wsdl:required="true" />
***************
*** 371,375 ****
<eg xml:space="preserve"><binding name="reservationSOAPBinding"
interface="tns:reservationInterface"
! type="http://www.w3.org/2004/08/wsdl/soap12"
wsoap:protocol="http://www.w3.org/2003/05/soap/bindings/HTTP">
<wsoap:module uri="&nsuri;/module" required="true" />
--- 371,375 ----
<eg xml:space="preserve"><binding name="reservationSOAPBinding"
interface="tns:reservationInterface"
! type="&wsdl20nsuri;/soap12"
wsoap:protocol="http://www.w3.org/2003/05/soap/bindings/HTTP">
<wsoap:module uri="&nsuri;/module" required="true" />
***************
*** 1229,1239 ****
href="&w3c-designation-wsa-soap;">
<titleref>&wsa-soap.title;</titleref>, M. Gudgin, M. Hadley, Editors.</bibl>
! <bibl key="WSDL 2.0" id="WSDL20" href="http://www.w3.org/TR/2004/WD-wsdl20-20040803">
! <titleref>Web Services Description Language 2.0</titleref>, R. Chinnici, M.
! Gudgin, J. J. Moreau, J. Schlimmer, S. Weerawarana, Editors. World Wide Web
! Consortium, 3 August 2004. This version of the WSDL 2.0 specification is
! http://www.w3.org/TR/2005/WD-wsdl20-20050510. The <loc
! href="http://www.w3.org/TR/wsdl20">latest version of WSDL 2.0</loc> is
! available at http://www.w3.org/TR/wsdl20.</bibl>
<bibl key="IETF RFC 2119" href="http://www.ietf.org/rfc/rfc2119.txt" id="RFC2119">
<titleref>Key words for use in RFCs to Indicate Requirement Levels</titleref>,
--- 1229,1240 ----
href="&w3c-designation-wsa-soap;">
<titleref>&wsa-soap.title;</titleref>, M. Gudgin, M. Hadley, Editors.</bibl>
! <bibl key="WSDL 2.0" id="WSDL20" href="http://www.w3.org/TR/2005/WD-wsdl20-20050510">
! <titleref>Web Services Description Language (WSDL)
! Version 2.0 Part 1: Core Language</titleref>,
! R. Chinnici, J. J. Moreau, A. Ryman, S. Weerawarana, Editors. World Wide Web
! Consortium, 10 May 2005. This version of the WSDL 2.0 specification is
! http://www.w3.org/TR/2005/WD-wsdl20-20050510. The <loc
! href="http://www.w3.org/TR/wsdl20">latest version of WSDL 2.0</loc> is
! available at http://www.w3.org/TR/wsdl20.</bibl>
<bibl key="IETF RFC 2119" href="http://www.ietf.org/rfc/rfc2119.txt" id="RFC2119">
<titleref>Key words for use in RFCs to Indicate Requirement Levels</titleref>,
Received on Tuesday, 9 August 2005 10:03:56 UTC