2002/ws/desc/wsdl20 wsdl20-adjuncts.xml,1.235,1.236

Update of /sources/public/2002/ws/desc/wsdl20
In directory hutz:/tmp/cvs-serv20090

Modified Files:
	wsdl20-adjuncts.xml 
Log Message:
Did the proper merge this time


Index: wsdl20-adjuncts.xml
===================================================================
RCS file: /sources/public/2002/ws/desc/wsdl20/wsdl20-adjuncts.xml,v
retrieving revision 1.235
retrieving revision 1.236
diff -C 2 -d -r1.235 -r1.236
*** wsdl20-adjuncts.xml	15 Feb 2007 18:22:01 -0000	1.235
--- wsdl20-adjuncts.xml	15 Feb 2007 18:28:19 -0000	1.236
***************
*** 2634,2645 ****
  	  exchange patterns defined in section <specref ref='meps'/>.</p>
  
-           <p>When the SOAP Message Exchange Pattern is the SOAP 1.2 Response
-           MEP and the underlying protocol is HTTP, the <comp>Binding Operation</comp> may use the
-           <prop comp="Binding Operation">http location</prop> property
-           defined in section <specref ref="http-operation-decl"/>.  When this
- 	  property is present on the <comp>Binding Operation</comp> component, the <comp>Endpoint</comp> component also follows the
-           rules for constructing the address from the <prop comp="Endpoint">address</prop>
-           property and the <prop comp="Binding Operation">http location</prop> property values.</p>
-           <p></p>  
          </div3>
          
--- 2634,2637 ----
***************
*** 2662,2669 ****
            ref="SOAP12-PART2"/>) has NO value. Otherwise, its value is
            the value of the SOAP Action Feature for the initial message
!           of the message exchange pattern. <prop>soap action</prop> has NO effect
! 	  when binding to the SOAP-Response MEP.</p></item>
!           of the message exchange pattern. <prop>soap action</prop> has NO effect
!           when binding to the SOAP-Response MEP.</p></item>
  
            <item><p><emph>SOAP MEP Selection.</emph>
--- 2654,2659 ----
            ref="SOAP12-PART2"/>) has NO value. Otherwise, its value is
            the value of the SOAP Action Feature for the initial message
!           of the message exchange pattern. <prop comp="Binding Operation">soap action</prop> has NO effect
!  	           when binding to the SOAP-Response MEP.</p></item>
  
            <item><p><emph>SOAP MEP Selection.</emph>
***************
*** 2718,2738 ****
            <attval>GET</attval>.</assert></p></item>
  
-           <item><p><emph>HTTP IRI Generation.</emph> This default
-           binding rule is applicable when the value of the
-           <prop comp="Binding">soap underlying protocol</prop>
-           property of the <comp>Binding</comp> component is
-           <attval>&soap12-http-uri;</attval>. <assert class="component" id="SOAPHTTPGeneration-5055">If
-           the SOAP MEP selected is
-           <attval>&soap12-soap-response-mep-uri;</attval>
-           then the value of the SOAP
- 	  <attval>&soap12-mep;ImmediateDestination</attval> property MUST be
-           generated using the HTTP binding extension's rules for generating an
-           IRI for HTTP GET (see <specref ref="_http_location_template"/>).</assert> The
-           input serialization format of
-           <code>application/x-www-form-urlencoded</code> is the only supported
-           serialization format for HTTP GET in the SOAP Response
-           Message Exchange Pattern.</p>
- 	  </item>
- 
          </ulist>
  
--- 2708,2711 ----
***************
*** 2762,2769 ****
  
  	    <p>The SOAP <attval>&soap12-mep;ImmediateDestination</attval>
! 	    property takes the value of the WSDL <prop
! 	    comp="Endpoint">address</prop> property, modified
! 	    by the <prop comp="Binding Operation">http location</prop>
! 	    property following the rules described in section <specref ref="_http_location_template"/>.</p>
  
  	    <p>The WSDL <attval>In</attval> message is mapped to the SOAP
--- 2735,2740 ----
  
  	    <p>The SOAP <attval>&soap12-mep;ImmediateDestination</attval>
! 	    property takes the value of the HTTP Request IRI, as defined in <specref ref='_http_request_iri_'/>, and modified
! 	    as described in section <specref ref="_http_location_template"/>.</p>
  
  	    <p>The WSDL <attval>In</attval> message is mapped to the SOAP
***************
*** 2807,2814 ****
  
  	    <p>The SOAP <attval>&soap12-mep;ImmediateDestination</attval>
! 	    property takes the value of the WSDL <prop
! 	    comp="Endpoint">address</prop> property, modified
! 	    by the <prop comp="Binding Operation">http location</prop>
! 	    property following the rules described in section <specref ref="_http_location_template"/>.</p>
  
  	    <p>The WSDL <attval>In</attval> message is mapped to the destination URI, as per the
--- 2778,2783 ----
  
  	    <p>The SOAP <attval>&soap12-mep;ImmediateDestination</attval>
! 	    property takes the value of the HTTP Request IRI, as defined in <specref ref='_http_request_iri_'/>, and modified
! 	    as described in section <specref ref="_http_location_template"/>.</p>
  
  	    <p>The WSDL <attval>In</attval> message is mapped to the destination URI, as per the
***************
*** 2862,2869 ****
  
  	    <p>The SOAP <attval>&soap12-mep;ImmediateDestination</attval>
! 	    property takes the value of the WSDL <prop
! 	    comp="Endpoint">address</prop> property, modified
! 	    by the <prop comp="Binding Operation">http location</prop>
! 	    property following the rules described in section <specref ref="_http_location_template"/>.</p>
  
  	    <p>The WSDL <attval>In</attval> message is mapped to the SOAP
--- 2831,2836 ----
  
  	    <p>The SOAP <attval>&soap12-mep;ImmediateDestination</attval>
! 	    property takes the value of the HTTP Request IRI, as defined in <specref ref='_http_request_iri_'/>, and modified
! 	    as described in section <specref ref="_http_location_template"/>.</p>
  
  	    <p>The WSDL <attval>In</attval> message is mapped to the SOAP
***************
*** 2906,2914 ****
  	    takes the value <attval>RequestingSOAPNode</attval>.</p>
  
! 	    <p>The SOAP <attval>&soap12-mep;ImmediateDestination</attval>
! 	    property takes the value of the WSDL <prop
! 	    comp="Endpoint">address</prop> property, modified
! 	    by the <prop comp="Binding Operation">http location</prop>
! 	    property following the rules described in section <specref ref="_http_location_template"/>.</p>
  
  	    <p>The WSDL <attval>In</attval> message is mapped to the SOAP
--- 2873,2882 ----
  	    takes the value <attval>RequestingSOAPNode</attval>.</p>
  
! 	    <p>The SOAP
! 	    <attval>&soap12-mep;ImmediateDestination</attval> property
! 	    takes the value of the HTTP Request IRI, as defined in
! 	    <specref ref='_http_request_iri_'/>, and modified as
! 	    described in section <specref
! 	    ref="_http_location_template"/>.</p>
  
  	    <p>The WSDL <attval>In</attval> message is mapped to the SOAP
***************
*** 3423,3426 ****
--- 3391,3435 ----
  
  	</div3>
+ 
+ 	<div3 id='_http_request_iri_'>
+ 	  <head>HTTP Request IRI</head>
+ 	  <p>
+ 	    <assert class="component" id="HTTPBindingOperation-2605002">
+ 
+               When formulating the HTTP Request, the HTTP Request IRI
+               is an absolute IRI reference and is the value of the
+               <prop comp="Binding Operation">http location</prop>
+               property of the <comp>Binding Operation</comp>
+               component, resolved using the value of the <prop
+               comp="Endpoint">address</prop> property of the
+               <comp>Endpoint</comp> component (see section 5 of
+               <bibref ref="RFC3986"/>).</assert> If the <prop
+               comp="Binding Operation">http location</prop> property
+               is bsent, the HTTP Request IRI is the value of the <prop
+               comp="Endpoint">address</prop> property of the
+               <comp>Endpoint</comp> component.
+               
+               Input serializations may define additional processing
+               rules to be applied to the value of <prop comp="Binding
+               Operation">http location</prop> before applying the
+               process of reference resolution, ie before combining it
+               with the <prop comp="Endpoint">address</prop> property
+               of the endpoint element to form the HTTP Request
+               IRI. For example, the three serialization formats
+               defined in section <specref ref='_http_serialization'/>
+               define a syntax to use the <prop comp="Binding
+               Operation">http location</prop> as a template using
+               elements of the instance data.
+ 	      </p>
+ 	      <p>If the resulting IRI uses the <code>https</code>
+ 	      scheme, then HTTP over TLS <bibref ref="RFC2818"/> is
+ 	      used to send the HTTP request.</p>
+ 	      <p>
+ 		The HTTP Request IRI identifies the resource upon
+ 		which to apply the request and is transmitted using
+ 		the Request-URI, and optionally the Host header field,
+ 		as defined in <bibref ref="RFC2616"/>.
+ 	      </p>
+ 	</div3>
        </div2>
  
***************
*** 3478,3508 ****
              <item>
                <p><propdef comp="Binding Operation">http location</propdef> OPTIONAL. An <emph>xs:anyURI</emph>,
! 	      to the <comp>Binding Operation</comp> component.
!               
                <assert class="component" id="HTTPBindingOperation-5066">
                It MUST contain an IRI reference and MUST NOT include
!               a fragment identifier component.</assert>
!               <assert class="component" id="HTTPBindingOperation-2605002">
!               If this IRI is a relative reference, the value of the
!               <prop comp="Endpoint">address</prop> property of the <comp>Endpoint</comp>
!               component is used as a base URI to resolve it, as defined
!               in section 5 of <bibref ref="RFC3986"/>.</assert>
!               As a consequence, if this IRI is an absolute IRI,
!               the <prop comp="Endpoint">address</prop> property of the <comp>Endpoint</comp>
!               component is ignored.
!               
!               Input serializations may define additional
!               processing rules to be applied to the value of
!               <prop comp="Binding Operation">http location</prop> before combining it with the
!               <prop comp="Endpoint">address</prop> property of the endpoint element to
!               form the HTTP request IRI. For example, the three
!               serialization formats defined
!               in section <specref ref='_http_serialization'/>
!               define a syntax to use the <prop comp="Binding Operation">http location</prop> as a
!               template using elements of the instance data.
! 	      </p>
! 	      <p>If the resulting IRI uses the <code>https</code>
! 	      scheme, then HTTP over TLS <bibref ref="RFC2818"/> is
! 	      used to send the HTTP request.</p>
              </item>
              <item>
--- 3487,3494 ----
              <item>
                <p><propdef comp="Binding Operation">http location</propdef> OPTIONAL. An <emph>xs:anyURI</emph>,
! 	      to the <comp>Binding Operation</comp> component.              
                <assert class="component" id="HTTPBindingOperation-5066">
                It MUST contain an IRI reference and MUST NOT include
!               a fragment identifier component.</assert></p>
              </item>
              <item>
***************
*** 4781,4785 ****
              <eg xml:space="preserve">&lt;operation ref='t:data'
      whttp:inputSerialization='application/x-www-form-urlencoded'
!     whttp:location='temperature/{town}'
      whttp:method='POST' /&gt;</eg>
              <p>
--- 4767,4771 ----
              <eg xml:space="preserve">&lt;operation ref='t:data'
      whttp:inputSerialization='application/x-www-form-urlencoded'
!     whttp:location='temperature/{town/}'
      whttp:method='POST' /&gt;</eg>
              <p>
***************
*** 4980,4984 ****
  	  <comp>Binding Fault</comp>
  	  component MAY indicate which
! 	  transfer codings, as defined in section 3.6 of <bibref
  	  ref="RFC2616"/>, are available for this particular
  	  message.</p>
--- 4966,4970 ----
  	  <comp>Binding Fault</comp>
  	  component MAY indicate which
! 	  content codings, as defined in section 3.5 of <bibref
  	  ref="RFC2616"/>, are available for this particular
  	  message.</p>
***************
*** 5021,5025 ****
  	      content codings available for this <comp>Binding Message Reference</comp> component.
  	      If this property does not have a value, the value of the
! 	      <prop comp="Binding Operation">http transfer coding default</prop> property of the parent
  	      <comp>Binding Operation</comp> component is used instead. If that itself has no value,
  	      the value from the <comp>Binding Operation</comp> component's parent <comp>Binding</comp>
--- 5007,5011 ----
  	      content codings available for this <comp>Binding Message Reference</comp> component.
  	      If this property does not have a value, the value of the
! 	      <prop comp="Binding Operation">http content coding default</prop> property of the parent
  	      <comp>Binding Operation</comp> component is used instead. If that itself has no value,
  	      the value from the <comp>Binding Operation</comp> component's parent <comp>Binding</comp>
***************
*** 5666,5671 ****
  	    	<td>20070215</td>
  	    	<td>JJM</td>
! 	      <td><loc
!               href="http://www.w3.org/2002/ws/desc/5/cr-issues/issues.html#CR148">CR148</loc>:
   	               SOAP Action has no effect with SOAP-Response.
   	               </td>
--- 5652,5657 ----
  	    	<td>20070215</td>
  	    	<td>JJM</td>
! 		<td><loc
!                href="http://www.w3.org/2002/ws/desc/5/cr-issues/issues.html#CR148">CR148</loc>:
   	               SOAP Action has no effect with SOAP-Response.
   	               </td>
***************
*** 5674,5681 ****
   	             <tr>
   	                     <td>20070215</td>
!  	                     <td>PLH</td>
   	               <td><loc
!  	               href="http://www.w3.org/2002/ws/desc/5/cr-issues/issues.html#CR112">CR112</loc>:
!  	               HTTP Location property definition
   	               </td>
   	             </tr>
--- 5660,5667 ----
   	             <tr>
   	                     <td>20070215</td>
!  	                     <td>JJM</td>
   	               <td><loc
!  	               href="http://www.w3.org/2002/ws/desc/5/cr-issues/issues.html#CR142">CR142</loc>:
!  	               Remove trailing slash.
   	               </td>
   	             </tr>
***************
*** 5683,5690 ****
   	             <tr>
   	                     <td>20070215</td>
!  	                     <td>JJM</td>
   	               <td><loc
!  	               href="http://www.w3.org/2002/ws/desc/5/cr-issues/issues.html#CR142">CR142</loc>:
!  	               Remove trailing slash.
   	               </td>
   	             </tr>
--- 5669,5676 ----
   	             <tr>
   	                     <td>20070215</td>
!  	                     <td>PLH</td>
   	               <td><loc
!  	               href="http://www.w3.org/2002/ws/desc/5/cr-issues/issues.html#CR112">CR112</loc>:
!  	               HTTP Location property definition.
   	               </td>
   	             </tr>

Received on Thursday, 15 February 2007 18:28:26 UTC