2002/ws/desc/wsdl20 wsdl20-primer.xml,1.109,1.110 wsdl20-primer.html,1.81,1.82

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

Modified Files:
	wsdl20-primer.xml wsdl20-primer.html 
Log Message:
fixed versioning examples following instructions from DaveO

Index: wsdl20-primer.xml
===================================================================
RCS file: /sources/public/2002/ws/desc/wsdl20/wsdl20-primer.xml,v
retrieving revision 1.109
retrieving revision 1.110
diff -C2 -d -r1.109 -r1.110
*** wsdl20-primer.xml	30 Jun 2005 20:32:15 -0000	1.109
--- wsdl20-primer.xml	30 Jun 2005 20:43:08 -0000	1.110
***************
*** 2695,2699 ****
  	<head>Additional Optional Elements Added in Content</head>
  	<p> The following example demonstrates how content may be extended with
! 	    additional content. The reservation service can accept an optional
  	    number of guests parameter. The service provider wants existing clients
  	    to continue to be able to use the service. The author adds the element
--- 2695,2699 ----
  	<head>Additional Optional Elements Added in Content</head>
  	<p> The following example demonstrates how content may be extended with
! 	    additional content. The reservation service is changed to a newer version that can accept an optional
  	    number of guests parameter. The service provider wants existing clients
  	    to continue to be able to use the service. The author adds the element
***************
*** 2762,2766 ****
  	    element.</p>
  	<example id="example-versioning-additional-mandatory-elements">
! 	    <head>Additional Mandadtory Elements in Content</head>
                              <eg><![CDATA[
  <xs:complexType name="tCheckAvailabilityV2">     
--- 2762,2766 ----
  	    element.</p>
  	<example id="example-versioning-additional-mandatory-elements">
! 	    <head>Additional Mandatory Elements in Content</head>
                              <eg><![CDATA[
  <xs:complexType name="tCheckAvailabilityV2">     
***************
*** 2803,2819 ****
  <interface name="reservationWithConfirmation" extends="cc:creditCardFaults">
      ... 
!     <operation name="makeReservation"
!     <input messageLabel="In" element="ghns:makeReservation" />
!     <output messageLabel="Out" element="ghns:makeReservationResponse" />
!     <outfault ref="invalidDataFault" messageLabel="Out" />
!     <outfault ref="cc:cancelledCreditCard" messageLabel="Out" />
!     <outfault ref="cc:expiredCreditCard" messageLabel="Out" />
!     <outfault ref="cc:invalidCreditCardNumber" messageLabel="Out" />
!     <outfault ref="cc:invalidExpirationDate" messageLabel="Out" />
      </operation>
!     <operation name="confirmReservation"
!     <input messageLabel="In" element="ghns:makeReservationResponse" />
!     <output messageLabel="Out" element="ghns:confirmReservationResponse" />
!     <outfault ref="expiredReservation" messageLabel="Out" />
      </operation>
  </interface>
--- 2803,2819 ----
  <interface name="reservationWithConfirmation" extends="cc:creditCardFaults">
      ... 
!     <operation name="makeReservation">
! 	<input messageLabel="In" element="ghns:makeReservation" />
! 	<output messageLabel="Out" element="ghns:makeReservationResponse" />
! 	<outfault ref="invalidDataFault" messageLabel="Out" />
! 	<outfault ref="cc:cancelledCreditCard" messageLabel="Out" />
! 	<outfault ref="cc:expiredCreditCard" messageLabel="Out" />
! 	<outfault ref="cc:invalidCreditCardNumber" messageLabel="Out" />
! 	<outfault ref="cc:invalidExpirationDate" messageLabel="Out" />
      </operation>
!     <operation name="confirmReservation">
! 	<input messageLabel="In" element="ghns:makeReservationResponse" />
! 	<output messageLabel="Out" element="ghns:confirmReservationResponse" />
! 	<outfault ref="expiredReservation" messageLabel="Out" />
      </operation>
  </interface>
***************
*** 2848,2852 ****
          wsoap:protocol="http://www.w3.org/2003/05/soap/bindings/HTTP">
      <operation ref="tns:makeReservation"
! wsoap:action="tns:makeReservationV2"/>
      . . .
  	    ]]></eg>
--- 2848,2852 ----
          wsoap:protocol="http://www.w3.org/2003/05/soap/bindings/HTTP">
      <operation ref="tns:makeReservation"
! 	wsoap:action="tns:makeReservationV2"/>
      . . .
  	    ]]></eg>
***************
*** 2865,2873 ****
  	    <head>Indicating incompatibility by changing the element content</head>
  	    <eg><![CDATA[
! <interface>
!     <xs:element name="ghns2:makeReservation" type="ghns:tmakeReservation"/>
  <interface . . .>
! . . .
! <input messageLabel="In" element="ghns2:makeReservation" />
      ]]></eg>
  	</example>
--- 2865,2877 ----
  	    <head>Indicating incompatibility by changing the element content</head>
  	    <eg><![CDATA[
! <xs:element name="ghns2:makeReservation" type="ghns:tmakeReservation"/>
! 
  <interface . . .>
! 
!    <operation name="makeReservation">
! 
!        <input messageLabel="In" element="ghns2:makeReservation" />
! 
! </interface>
      ]]></eg>
  	</example>

Index: wsdl20-primer.html
===================================================================
RCS file: /sources/public/2002/ws/desc/wsdl20/wsdl20-primer.html,v
retrieving revision 1.81
retrieving revision 1.82
diff -C2 -d -r1.81 -r1.82
*** wsdl20-primer.html	30 Jun 2005 20:32:15 -0000	1.81
--- wsdl20-primer.html	30 Jun 2005 20:43:08 -0000	1.82
***************
*** 315,334 ****
  Header</a><br />
  &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;5.2.5.3
! <a href="#id367340">Additional Mandatory Elements in
  Content</a><br />
  &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;5.2.5.4
! <a href="#id367391">Additional Optional Operation Added to
  Interface</a><br />
  &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;5.2.5.5
! <a href="#id367410">Additional Mandatory Operation Added to
  Interface</a><br />
  &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;5.2.5.6
! <a href="#id367458">Indicating Incompatibility by Changing the
  Endpoint URI</a><br />
  &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;5.2.5.7
! <a href="#id367471">Indicating Incompatibility by Changing the SOAP
  Action</a><br />
  &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;5.2.5.8
! <a href="#id367513">Indicating Incompatibility by Changing the
  Element Content</a><br />
  &nbsp;&nbsp;&nbsp;&nbsp;5.3 <a href=
--- 315,334 ----
  Header</a><br />
  &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;5.2.5.3
! <a href="#id367341">Additional Mandatory Elements in
  Content</a><br />
  &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;5.2.5.4
! <a href="#id367392">Additional Optional Operation Added to
  Interface</a><br />
  &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;5.2.5.5
! <a href="#id367405">Additional Mandatory Operation Added to
  Interface</a><br />
  &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;5.2.5.6
! <a href="#id367453">Indicating Incompatibility by Changing the
  Endpoint URI</a><br />
  &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;5.2.5.7
! <a href="#id367466">Indicating Incompatibility by Changing the SOAP
  Action</a><br />
  &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;5.2.5.8
! <a href="#id367509">Indicating Incompatibility by Changing the
  Element Content</a><br />
  &nbsp;&nbsp;&nbsp;&nbsp;5.3 <a href=
***************
*** 4455,4462 ****
  Optional Elements Added in Content</h5>
  <p>The following example demonstrates how content may be extended
! with additional content. The reservation service can accept an
! optional number of guests parameter. The service provider wants
! existing clients to continue to be able to use the service. The
! author adds the element into the schema as an optional element.</p>
  <div class="exampleOuter">
  <p style="text-align: left" class="exampleHead"><a name=
--- 4455,4463 ----
  Optional Elements Added in Content</h5>
  <p>The following example demonstrates how content may be extended
! with additional content. The reservation service is changed to a
! newer version that can accept an optional number of guests
! parameter. The service provider wants existing clients to continue
! to be able to use the service. The author adds the element into the
! schema as an optional element.</p>
  <div class="exampleOuter">
  <p style="text-align: left" class="exampleHead"><a name=
***************
*** 4527,4531 ****
  </div>
  <div class="div4">
! <h5><a name="id367340" id="id367340"></a>5.2.5.3 Additional
  Mandatory Elements in Content</h5>
  <p>This following example demonstrates an extention with additional
--- 4528,4532 ----
  </div>
  <div class="div4">
! <h5><a name="id367341" id="id367341"></a>5.2.5.3 Additional
  Mandatory Elements in Content</h5>
  <p>This following example demonstrates an extention with additional
***************
*** 4538,4542 ****
  "example-versioning-additional-mandatory-elements" id=
  "example-versioning-additional-mandatory-elements"></a><i><span>Example
! 5-3.</span> Additional Mandadtory Elements in Content</i></p>
  <div class="exampleInner">
  <pre>
--- 4539,4543 ----
  "example-versioning-additional-mandatory-elements" id=
  "example-versioning-additional-mandatory-elements"></a><i><span>Example
! 5-3.</span> Additional Mandatory Elements in Content</i></p>
  <div class="exampleInner">
  <pre>
***************
*** 4561,4565 ****
  </div>
  <div class="div4">
! <h5><a name="id367391" id="id367391"></a>5.2.5.4 Additional
  Optional Operation Added to Interface</h5>
  <p>Section <a href="#more-interfaces-inheritance"><b>2.4.2
--- 4562,4566 ----
  </div>
  <div class="div4">
! <h5><a name="id367392" id="id367392"></a>5.2.5.4 Additional
  Optional Operation Added to Interface</h5>
  <p>Section <a href="#more-interfaces-inheritance"><b>2.4.2
***************
*** 4572,4576 ****
  </div>
  <div class="div4">
! <h5><a name="id367410" id="id367410"></a>5.2.5.5 Additional
  Mandatory Operation Added to Interface</h5>
  <p>Often mandatory operations are added to an interface. The Hotel
--- 4573,4577 ----
  </div>
  <div class="div4">
! <h5><a name="id367405" id="id367405"></a>5.2.5.5 Additional
  Mandatory Operation Added to Interface</h5>
  <p>Often mandatory operations are added to an interface. The Hotel
***************
*** 4592,4608 ****
  &lt;interface name="reservationWithConfirmation" extends="cc:creditCardFaults"&gt;
      ... 
!     &lt;operation name="makeReservation"
!     &lt;input messageLabel="In" element="ghns:makeReservation" /&gt;
!     &lt;output messageLabel="Out" element="ghns:makeReservationResponse" /&gt;
!     &lt;outfault ref="invalidDataFault" messageLabel="Out" /&gt;
!     &lt;outfault ref="cc:cancelledCreditCard" messageLabel="Out" /&gt;
!     &lt;outfault ref="cc:expiredCreditCard" messageLabel="Out" /&gt;
!     &lt;outfault ref="cc:invalidCreditCardNumber" messageLabel="Out" /&gt;
!     &lt;outfault ref="cc:invalidExpirationDate" messageLabel="Out" /&gt;
      &lt;/operation&gt;
!     &lt;operation name="confirmReservation"
!     &lt;input messageLabel="In" element="ghns:makeReservationResponse" /&gt;
!     &lt;output messageLabel="Out" element="ghns:confirmReservationResponse" /&gt;
!     &lt;outfault ref="expiredReservation" messageLabel="Out" /&gt;
      &lt;/operation&gt;
  &lt;/interface&gt;
--- 4593,4609 ----
  &lt;interface name="reservationWithConfirmation" extends="cc:creditCardFaults"&gt;
      ... 
!     &lt;operation name="makeReservation"&gt;
!         &lt;input messageLabel="In" element="ghns:makeReservation" /&gt;
!         &lt;output messageLabel="Out" element="ghns:makeReservationResponse" /&gt;
!         &lt;outfault ref="invalidDataFault" messageLabel="Out" /&gt;
!         &lt;outfault ref="cc:cancelledCreditCard" messageLabel="Out" /&gt;
!         &lt;outfault ref="cc:expiredCreditCard" messageLabel="Out" /&gt;
!         &lt;outfault ref="cc:invalidCreditCardNumber" messageLabel="Out" /&gt;
!         &lt;outfault ref="cc:invalidExpirationDate" messageLabel="Out" /&gt;
      &lt;/operation&gt;
!     &lt;operation name="confirmReservation"&gt;
!         &lt;input messageLabel="In" element="ghns:makeReservationResponse" /&gt;
!         &lt;output messageLabel="Out" element="ghns:confirmReservationResponse" /&gt;
!         &lt;outfault ref="expiredReservation" messageLabel="Out" /&gt;
      &lt;/operation&gt;
  &lt;/interface&gt;
***************
*** 4622,4626 ****
  </div>
  <div class="div4">
! <h5><a name="id367458" id="id367458"></a>5.2.5.6 Indicating
  Incompatibility by Changing the Endpoint URI</h5>
  <p>To indicate incompatibility, the URI of the Hotel Endpoint can
--- 4623,4627 ----
  </div>
  <div class="div4">
! <h5><a name="id367453" id="id367453"></a>5.2.5.6 Indicating
  Incompatibility by Changing the Endpoint URI</h5>
  <p>To indicate incompatibility, the URI of the Hotel Endpoint can
***************
*** 4629,4633 ****
  </div>
  <div class="div4">
! <h5><a name="id367471" id="id367471"></a>5.2.5.7 Indicating
  Incompatibility by Changing the SOAP Action</h5>
  <p>The SOAP Action can be set for the makeReservation request, and
--- 4630,4634 ----
  </div>
  <div class="div4">
! <h5><a name="id367466" id="id367466"></a>5.2.5.7 Indicating
  Incompatibility by Changing the SOAP Action</h5>
  <p>The SOAP Action can be set for the makeReservation request, and
***************
*** 4646,4650 ****
          wsoap:protocol="http://www.w3.org/2003/05/soap/bindings/HTTP"&gt;
      &lt;operation ref="tns:makeReservation"
! wsoap:action="tns:makeReservationV2"/&gt;
      . . .
              
--- 4647,4651 ----
          wsoap:protocol="http://www.w3.org/2003/05/soap/bindings/HTTP"&gt;
      &lt;operation ref="tns:makeReservation"
!         wsoap:action="tns:makeReservationV2"/&gt;
      . . .
              
***************
*** 4656,4660 ****
  </div>
  <div class="div4">
! <h5><a name="id367513" id="id367513"></a>5.2.5.8 Indicating
  Incompatibility by Changing the Element Content</h5>
  <p>The namespace or name of the makeReservation element can be
--- 4657,4661 ----
  </div>
  <div class="div4">
! <h5><a name="id367509" id="id367509"></a>5.2.5.8 Indicating
  Incompatibility by Changing the Element Content</h5>
  <p>The namespace or name of the makeReservation element can be
***************
*** 4671,4679 ****
  <div class="exampleInner">
  <pre>
! &lt;interface&gt;
!     &lt;xs:element name="ghns2:makeReservation" type="ghns:tmakeReservation"/&gt;
  &lt;interface . . .&gt;
! . . .
! &lt;input messageLabel="In" element="ghns2:makeReservation" /&gt;
      
  </pre></div>
--- 4672,4684 ----
  <div class="exampleInner">
  <pre>
! &lt;xs:element name="ghns2:makeReservation" type="ghns:tmakeReservation"/&gt;
! 
  &lt;interface . . .&gt;
! 
!    &lt;operation name="makeReservation"&gt;
! 
!        &lt;input messageLabel="In" element="ghns2:makeReservation" /&gt;
! 
! &lt;/interface&gt;
      
  </pre></div>

Received on Thursday, 30 June 2005 20:43:13 UTC