2004/ws/addressing ws-addr-core.xml,1.74,1.75

Update of /sources/public/2004/ws/addressing
In directory hutz:/tmp/cvs-serv1722

Modified Files:
	ws-addr-core.xml 
Log Message:
Added lc42 resolution - reordered infoset representation to match order of abstract properties

Index: ws-addr-core.xml
===================================================================
RCS file: /sources/public/2004/ws/addressing/ws-addr-core.xml,v
retrieving revision 1.74
retrieving revision 1.75
diff -C2 -d -r1.74 -r1.75
*** ws-addr-core.xml	18 May 2005 18:03:07 -0000	1.74
--- ws-addr-core.xml	18 May 2005 18:12:39 -0000	1.75
***************
*** 546,556 ****
                      properties:</p>
                  <eg xml:space="preserve">
- &lt;wsa:MessageID&gt;xs:anyURI &lt;/wsa:MessageID&gt;
- &lt;wsa:RelatesTo RelationshipType="xs:anyURI"?&gt;xs:anyURI&lt;/wsa:RelatesTo&gt;
  &lt;wsa:To&gt;xs:anyURI&lt;/wsa:To&gt;
- &lt;wsa:Action&gt;xs:anyURI&lt;/wsa:Action&gt;
  &lt;wsa:From&gt;endpoint-reference&lt;/wsa:From&gt;
  &lt;wsa:ReplyTo&gt;endpoint-reference&lt;/wsa:ReplyTo&gt;
  &lt;wsa:FaultTo&gt;endpoint-reference&lt;/wsa:FaultTo&gt;
  &lt;wsa:ReferenceParameters&gt;xs:any*&lt;/wsa:ReferenceParameters&gt;
                      </eg>
--- 546,556 ----
                      properties:</p>
                  <eg xml:space="preserve">
  &lt;wsa:To&gt;xs:anyURI&lt;/wsa:To&gt;
  &lt;wsa:From&gt;endpoint-reference&lt;/wsa:From&gt;
  &lt;wsa:ReplyTo&gt;endpoint-reference&lt;/wsa:ReplyTo&gt;
  &lt;wsa:FaultTo&gt;endpoint-reference&lt;/wsa:FaultTo&gt;
+ &lt;wsa:Action&gt;xs:anyURI&lt;/wsa:Action&gt;
+ &lt;wsa:MessageID&gt;xs:anyURI &lt;/wsa:MessageID&gt;
+ &lt;wsa:RelatesTo RelationshipType="xs:anyURI"?&gt;xs:anyURI&lt;/wsa:RelatesTo&gt;
  &lt;wsa:ReferenceParameters&gt;xs:any*&lt;/wsa:ReferenceParameters&gt;
                      </eg>
***************
*** 559,593 ****
                  <glist>
                      <gitem>
!                         <label> /wsa:MessageID</label>
!                         <def>
!                             <p>This OPTIONAL element (of type xs:anyURI) conveys the [message id]
!                                 property. This element MUST be present if wsa:ReplyTo or wsa:FaultTo
!                                 is present.</p>
!                         </def>
!                     </gitem>
!                 </glist>
!                 <glist>
!                     <gitem>
!                         <label> /wsa:RelatesTo</label>
                          <def>
!                             <p>This OPTIONAL (repeating) element information item contributes one
!                                 abstract [relationship] property value, in the form of a (IRI, IRI)
!                                 pair. The [children] property of this element (which is of type
!                                 xs:anyURI) conveys the [message id] of the related message. This
!                                 element MUST be present if the message is a reply.</p>
                          </def>
                      </gitem>
-                 </glist>
-                 <glist>
                      <gitem>
!                         <label> /wsa:RelatesTo/@RelationshipType</label>
                          <def>
!                             <p>This OPTIONAL attribute (of type xs:anyURI) conveys the relationship
!                                 type as an IRI. When absent, the implied value of this attribute is
!                                     <attval>&nsuri;/reply</attval>.</p>
                          </def>
                      </gitem>
-                 </glist>
-                 <glist>
                      <gitem>
                          <label> /wsa:ReplyTo</label>
--- 559,577 ----
                  <glist>
                      <gitem>
!                         <label> /wsa:To</label>
                          <def>
!                             <p>This OPTIONAL element (of type xs:anyURI) provides the value for the
!                                 [destination] property. If this element is NOT present then the
!                                 value of the [destination] property is
!                                 <attval>&nsuri;/address/anonymous</attval>.</p>
                          </def>
                      </gitem>
                      <gitem>
!                         <label> /wsa:From</label>
                          <def>
!                             <p>This OPTIONAL element (of type wsa:EndpointReferenceType) provides
!                                 the value for the [source endpoint] property.</p>
                          </def>
                      </gitem>
                      <gitem>
                          <label> /wsa:ReplyTo</label>
***************
*** 599,642 ****
                          </def>
                      </gitem>
-                 </glist>
-                 <glist>
                      <gitem>
!                         <label> /wsa:From</label>
                          <def>
                              <p>This OPTIONAL element (of type wsa:EndpointReferenceType) provides
!                                 the value for the [source endpoint] property.</p>
                          </def>
                      </gitem>
-                 </glist>
-                 <glist>
                      <gitem>
!                         <label> /wsa:FaultTo</label>
                          <def>
!                             <p>This OPTIONAL element (of type wsa:EndpointReferenceType) provides
!                                 the value for the [fault endpoint] property. If this element is
!                                 present, wsa:MessageID MUST be present.</p>
                          </def>
                      </gitem>
-                 </glist>
-                 <glist>
                      <gitem>
!                         <label> /wsa:To</label>
                          <def>
!                             <p>This OPTIONAL element (of type xs:anyURI) provides the value for the
!                                 [destination] property. If this element is NOT present then the
!                                 value of the [destination] property is
!                                     <attval>&nsuri;/address/anonymous</attval>.</p>
                          </def>
                      </gitem>
-                 </glist>
-                 <glist>
                      <gitem>
!                         <label> /wsa:Action</label>
                          <def>
!                             <p>This REQUIRED element of type xs:anyURI conveys the value of the
!                                 [action] property.</p>
                          </def>
                      </gitem>
                      <gitem>
                          <label> /[reference parameters]*</label>
                          <def>
--- 583,628 ----
                          </def>
                      </gitem>
                      <gitem>
!                         <label> /wsa:FaultTo</label>
                          <def>
                              <p>This OPTIONAL element (of type wsa:EndpointReferenceType) provides
!                                 the value for the [fault endpoint] property. If this element is
!                                 present, wsa:MessageID MUST be present.</p>
                          </def>
                      </gitem>
                      <gitem>
!                         <label> /wsa:Action</label>
                          <def>
!                             <p>This REQUIRED element of type xs:anyURI conveys the value of the
!                                 [action] property.</p>
                          </def>
                      </gitem>
                      <gitem>
!                         <label> /wsa:MessageID</label>
                          <def>
!                             <p>This OPTIONAL element (of type xs:anyURI) conveys the [message id]
!                                 property. This element MUST be present if wsa:ReplyTo or wsa:FaultTo
!                                 is present.</p>
                          </def>
                      </gitem>
                      <gitem>
!                         <label> /wsa:RelatesTo</label>
                          <def>
!                             <p>This OPTIONAL (repeating) element information item contributes one
!                                 abstract [relationship] property value, in the form of a (IRI, IRI)
!                                 pair. The [children] property of this element (which is of type
!                                 xs:anyURI) conveys the [message id] of the related message. This
!                                 element MUST be present if the message is a reply.</p>
                          </def>
                      </gitem>
                      <gitem>
+                         <label> /wsa:RelatesTo/@RelationshipType</label>
+                         <def>
+                             <p>This OPTIONAL attribute (of type xs:anyURI) conveys the relationship
+                                 type as an IRI. When absent, the implied value of this attribute is
+                                     <attval>&nsuri;/reply</attval>.</p>
+                         </def>
+                     </gitem>
+                      <gitem>
                          <label> /[reference parameters]*</label>
                          <def>

Received on Wednesday, 18 May 2005 18:15:44 UTC