WWW/2002/ws/ra/edcopies wseventing.html,1.50,1.51 wseventing.xml,1.42,1.43

Update of /w3ccvs/WWW/2002/ws/ra/edcopies
In directory hutz:/tmp/cvs-serv16015

Modified Files:
	wseventing.html wseventing.xml 
Log Message:
Fix format - make sure its optional


Index: wseventing.xml
===================================================================
RCS file: /w3ccvs/WWW/2002/ws/ra/edcopies/wseventing.xml,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- wseventing.xml	13 May 2009 13:44:53 -0000	1.42
+++ wseventing.xml	19 May 2009 20:52:37 -0000	1.43
@@ -819,7 +819,7 @@
   <wse:Subscribe ...>
     &lt;wse:EndTo&gt; <emph>endpoint-reference</emph> &lt;/wse:EndTo&gt; ?
     &lt;wse:Delivery Mode="<emph>xs:anyURI</emph>"? ...&gt; <emph>xs:any</emph>* &lt;/wse:Delivery&gt;
-    &lt;wse:Format Name="<emph>xs:anyURI</emph>"? &gt; <emph>xs:any</emph>* &lt;/wse:Format&gt;
+    &lt;wse:Format Name="<emph>xs:anyURI</emph>"? &gt; <emph>xs:any</emph>* &lt;/wse:Format&gt; ?
     &lt;wse:Expires&gt; (<emph>xs:dateTime</emph> | <emph>xs:duration</emph>) &lt;/wse:Expires&gt; ?
     &lt;wse:Filter Dialect="<emph>xs:anyURI</emph>"? ...&gt; <emph>xs:any</emph>* &lt;/wse:Filter&gt; ?
     <emph>xs:any</emph>*
@@ -907,7 +907,8 @@
       <label> <kw>[Body]</kw>/wse:Subscribe/wse:Format </label>
       <def>
        <p>
-        The delivery format to be used for notification messages sent in 
+        This optional element contains
+        the delivery format to be used for notification messages sent in 
         relation to this subscription. Implied value is 
         "http://www.w3.org/2009/02/ws-evt/DeliveryFormats/Unwrap", which 
         indicates that unwraped delivery should be used. See 
@@ -3075,7 +3076,8 @@
         &lt;xs:element name="EndTo" type="wsa:EndpointReferenceType" 
                     minOccurs="0" /&gt;
         &lt;xs:element name="Delivery" type="tns:DeliveryType" /&gt;
-        &lt;xs:element name="Format" type="tns:FormatType" /&gt;
+        &lt;xs:element name="Format" type="tns:FormatType" 
+                    minOccurs="0" /&gt;
         &lt;xs:element name="Expires" type="tns:ExpirationType" 
                     minOccurs="0" /&gt;
         &lt;xs:element name="Filter" type="tns:FilterType" 

Index: wseventing.html
===================================================================
RCS file: /w3ccvs/WWW/2002/ws/ra/edcopies/wseventing.html,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- wseventing.html	13 May 2009 13:44:53 -0000	1.50
+++ wseventing.html	19 May 2009 20:52:37 -0000	1.51
@@ -467,7 +467,7 @@
   &lt;wse:Subscribe ...&gt;
     &lt;wse:EndTo&gt; <em>endpoint-reference</em> &lt;/wse:EndTo&gt; ?
     &lt;wse:Delivery Mode="<em>xs:anyURI</em>"? ...&gt; <em>xs:any</em>* &lt;/wse:Delivery&gt;
-    &lt;wse:Format Name="<em>xs:anyURI</em>"? &gt; <em>xs:any</em>* &lt;/wse:Format&gt;
+    &lt;wse:Format Name="<em>xs:anyURI</em>"? &gt; <em>xs:any</em>* &lt;/wse:Format&gt; ?
     &lt;wse:Expires&gt; (<em>xs:dateTime</em> | <em>xs:duration</em>) &lt;/wse:Expires&gt; ?
     &lt;wse:Filter Dialect="<em>xs:anyURI</em>"? ...&gt; <em>xs:any</em>* &lt;/wse:Filter&gt; ?
     <em>xs:any</em>*
@@ -514,7 +514,8 @@
         to which notification messages should be sent. The value of this
         element is not constrained for other delivery modes.
        </p></dd><dt class="label"><b>[Body]</b>/wse:Subscribe/wse:Format </dt><dd><p>
-        The delivery format to be used for notification messages sent in 
+        This optional element contains
+        the delivery format to be used for notification messages sent in 
         relation to this subscription. Implied value is 
         "http://www.w3.org/2009/02/ws-evt/DeliveryFormats/Unwrap", which 
         indicates that unwraped delivery should be used. See 
@@ -1732,7 +1733,8 @@
         &lt;xs:element name="EndTo" type="wsa:EndpointReferenceType" 
                     minOccurs="0" /&gt;
         &lt;xs:element name="Delivery" type="tns:DeliveryType" /&gt;
-        &lt;xs:element name="Format" type="tns:FormatType" /&gt;
+        &lt;xs:element name="Format" type="tns:FormatType" 
+                    minOccurs="0" /&gt;
         &lt;xs:element name="Expires" type="tns:ExpirationType" 
                     minOccurs="0" /&gt;
         &lt;xs:element name="Filter" type="tns:FilterType"

Received on Tuesday, 19 May 2009 20:52:48 UTC