WWW/2002/ws/ra/edcopies wsenum.html,1.136,1.137 wsenum.xml,1.127,1.128 wseventing.html,1.196,1.197 wseventing.xml,1.189,1.190 wsfrag.html,1.69,1.70 wsfrag.xml,1.67,1.68

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

Modified Files:
	wsenum.html wsenum.xml wseventing.html wseventing.xml 
	wsfrag.html wsfrag.xml 
Log Message:
9717


Index: wseventing.html
===================================================================
RCS file: /w3ccvs/WWW/2002/ws/ra/edcopies/wseventing.html,v
retrieving revision 1.196
retrieving revision 1.197
diff -u -d -r1.196 -r1.197
--- wseventing.html	12 May 2010 19:55:26 -0000	1.196
+++ wseventing.html	12 May 2010 22:16:30 -0000	1.197
@@ -72,26 +72,26 @@
 &nbsp;&nbsp;&nbsp;6.10 <a href="#UnknownSubscription">UnknownSubscription</a><br/>
 &nbsp;&nbsp;&nbsp;6.11 <a href="#EndToNotSupported">EndToNotSupported</a><br/>
 7 <a href="#Security">Security Considerations</a><br/>
-&nbsp;&nbsp;&nbsp;7.1 <a href="#iddiv2_1_2099">Notifications</a><br/>
-&nbsp;&nbsp;&nbsp;7.2 <a href="#iddiv2_1_2108">Subscriptions</a><br/>
-&nbsp;&nbsp;&nbsp;7.3 <a href="#iddiv2_1_2113">Endpoint Verification</a><br/>
+&nbsp;&nbsp;&nbsp;7.1 <a href="#iddiv2_1_2119">Notifications</a><br/>
+&nbsp;&nbsp;&nbsp;7.2 <a href="#iddiv2_1_2128">Subscriptions</a><br/>
+&nbsp;&nbsp;&nbsp;7.3 <a href="#iddiv2_1_2133">Endpoint Verification</a><br/>
 8 <a href="#ImplConsideration">Implementation Considerations</a><br/>
 9 <a href="#metadata">WS-Eventing Metadata</a><br/>
-&nbsp;&nbsp;&nbsp;9.1 <a href="#iddiv2_1_2139">EventSource Assertion</a><br/>
-&nbsp;&nbsp;&nbsp;9.2 <a href="#iddiv2_1_2260">SubscriptionManager Assertion</a><br/>
+&nbsp;&nbsp;&nbsp;9.1 <a href="#iddiv2_1_2159">EventSource Assertion</a><br/>
+&nbsp;&nbsp;&nbsp;9.2 <a href="#iddiv2_1_2280">SubscriptionManager Assertion</a><br/>
 10 <a href="#acks">Acknowledgements</a><br/>
 11 <a href="#refs">References</a><br/>
-&nbsp;&nbsp;&nbsp;11.1 <a href="#iddiv2_1_2320">Normative References</a><br/>
-&nbsp;&nbsp;&nbsp;11.2 <a href="#iddiv2_1_2467">Informative References</a><br/>
+&nbsp;&nbsp;&nbsp;11.1 <a href="#iddiv2_1_2340">Normative References</a><br/>
+&nbsp;&nbsp;&nbsp;11.2 <a href="#iddiv2_1_2487">Informative References</a><br/>
 </p>
 <h3><a name="appendices" id="appendices"/>Appendices</h3><p class="toc">A <a href="#Advertising">Advertising Event Information</a><br/>
 &nbsp;&nbsp;&nbsp;A.1 <a href="#ETypes">Event Types &amp; Event Descriptions</a><br/>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;A.1.1 <a href="#iddiv3_1_2656">Retrieving Event Descriptions</a><br/>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;A.1.2 <a href="#iddiv3_1_2693">Bindings for Event Descriptions</a><br/>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;A.1.2.1 <a href="#iddiv4_1_2698">Binding for Unwrapped Notifications</a><br/>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;A.1.2.2 <a href="#iddiv4_1_2719">Binding for Wrapped Notifications</a><br/>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;A.1.1 <a href="#iddiv3_1_2689">Retrieving Event Descriptions</a><br/>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;A.1.2 <a href="#iddiv3_1_2726">Bindings for Event Descriptions</a><br/>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;A.1.2.1 <a href="#iddiv4_1_2731">Binding for Unwrapped Notifications</a><br/>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;A.1.2.2 <a href="#iddiv4_1_2752">Binding for Wrapped Notifications</a><br/>
 &nbsp;&nbsp;&nbsp;A.2 <a href="#NWSDL">Notification WSDLs</a><br/>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;A.2.1 <a href="#iddiv3_1_2746">Retrieving Notification WSDLs</a><br/>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;A.2.1 <a href="#iddiv3_1_2779">Retrieving Notification WSDLs</a><br/>
 B <a href="#Schema">XML Schema</a><br/>
 C <a href="#WSDL">WSDL</a><br/>
 D <a href="#wrappedWSDL">WSDL for Standard Wrapped Delivery</a><br/>
@@ -678,6 +678,13 @@
         construct expressions in a manner that avoids the use of namespace
         prefixes. For example, use an expression such as
         "/a[namespace-uri()='http://www.example.com']" not "/ns1:a".
+       </p></dd><dt class="label"><b>[Body]</b>/wse:Subscribe/wse:Filter/@Dialect="<a href="http://www.w3.org/2002/ws/ra/edcopies/ws-evt/Dialects/XPath20">
+        http://www.w3.org/2002/ws/ra/edcopies/ws-evt/Dialects/XPath20
+       </a>"
+      </dt><dd><p>
+        This filter dialect is the same as the XPath 1.0 filter dialect 
+        except that it uses <a href="#XPath2">[XPath2.0]</a> instead of XPath 1.0
+        as the expression language.
        </p></dd></dl><p>
      Other components of the outline above are not further
      constrained by this specification.
@@ -1423,7 +1430,7 @@
     urged to perform a security analysis to determine their particular 
     threat profile and the appropriate responses to those threats.
    </p><div class="div2">
-<h3><a name="iddiv2_1_2099" id="iddiv2_1_2099"/>7.1 Notifications</h3><p>
+<h3><a name="iddiv2_1_2119" id="iddiv2_1_2119"/>7.1 Notifications</h3><p>
      The information contained in Notifications might be sensitive. In 
      such cases it is advisable to authenticate and authorize subscribers 
      as part of the processing of the Subscribe request. Note that an 
@@ -1444,7 +1451,7 @@
      and trace the origin of such attempts. Additionally, the 
      authorization of Subscribers reduces the pool of potential attackers.
     </p></div><div class="div2">
-<h3><a name="iddiv2_1_2108" id="iddiv2_1_2108"/>7.2 Subscriptions</h3><p>
+<h3><a name="iddiv2_1_2128" id="iddiv2_1_2128"/>7.2 Subscriptions</h3><p>
      Once created, subscriptions ought to be treated as protected 
      resources. Renew, GetStatus, and Unsubscribe requests ought to be 
      authenticated and authorized (for example, the identity of the 
@@ -1459,7 +1466,7 @@
      the identities of these entities are discovered and verified) 
      are particular to individual deployments.
     </p></div><div class="div2">
-<h3><a name="iddiv2_1_2113" id="iddiv2_1_2113"/>7.3 Endpoint Verification</h3><p>
+<h3><a name="iddiv2_1_2133" id="iddiv2_1_2133"/>7.3 Endpoint Verification</h3><p>
      Implementations that perform validity checks on the EPRs used in 
      WS-Eventing (wse:NotifyTo, wse:EndTo) are advised that such checks 
      can be misused to obtain information about a target network. For 
@@ -1510,7 +1517,7 @@
     that indicate a particular security mechanism used to protect
     the WS-Eventing operations supported by this endpoint.
    </p><div class="div2">
-<h3><a name="iddiv2_1_2139" id="iddiv2_1_2139"/>9.1 EventSource Assertion</h3><p>
+<h3><a name="iddiv2_1_2159" id="iddiv2_1_2159"/>9.1 EventSource Assertion</h3><p>
      Services indicate support for the WS-Eventing's definition 
      of an event source through the use of the Web Services
      Policy - Framework <a href="#wspolicy">[WS-Policy]</a> and Web Services Policy -
@@ -1620,7 +1627,7 @@
      (10) - (12) contains the EventDescription data that describes the 
      syntax of the events that this event source might send.
     </p></div><div class="div2">
-<h3><a name="iddiv2_1_2260" id="iddiv2_1_2260"/>9.2 SubscriptionManager Assertion</h3><p>
+<h3><a name="iddiv2_1_2280" id="iddiv2_1_2280"/>9.2 SubscriptionManager Assertion</h3><p>
      Services indicate support for the
      WS-Eventing's definition of a subscription manager 
      through the use of the Web Services
@@ -1689,7 +1696,7 @@
      Yves Lafon (W3C/ERCIM).
    </p></div><div class="div1">
 <h2><a name="refs" id="refs"/>11 References</h2><div class="div2">
-<h3><a name="iddiv2_1_2320" id="iddiv2_1_2320"/>11.1 Normative References</h3><dl><dt class="label"><a name="RFC2119" id="RFC2119"/>RFC 2119</dt><dd><a href="http://www.ietf.org/rfc/rfc2119.txt"><cite>
+<h3><a name="iddiv2_1_2340" id="iddiv2_1_2340"/>11.1 Normative References</h3><dl><dt class="label"><a name="RFC2119" id="RFC2119"/>RFC 2119</dt><dd><a href="http://www.ietf.org/rfc/rfc2119.txt"><cite>
         Key words for use in RFCs to Indicate Requirement Levels
        </cite></a>
        , S. Bradner, Author.
@@ -1746,7 +1753,7 @@
        , E. Christensen, et al., Editors.
        World Wide Web Consortium (W3C), 15 March 2001
       Available at <a href="http://www.w3.org/TR/2001/NOTE-wsdl-20010315">http://www.w3.org/TR/2001/NOTE-wsdl-20010315</a>.</dd></dl></div><div class="div2">
-<h3><a name="iddiv2_1_2467" id="iddiv2_1_2467"/>11.2 Informative References</h3><dl><dt class="label"><a name="WSMC" id="WSMC"/>WS-MakeConnection</dt><dd><a href="http://docs.oasis-open.org/ws-rx/wsmc/v1.1/wsmc.doc"><cite>
+<h3><a name="iddiv2_1_2487" id="iddiv2_1_2487"/>11.2 Informative References</h3><dl><dt class="label"><a name="WSMC" id="WSMC"/>WS-MakeConnection</dt><dd><a href="http://docs.oasis-open.org/ws-rx/wsmc/v1.1/wsmc.doc"><cite>
         OASIS Standard, "Web Services Make Connection (WS-MakeConnection) 1.1"
         Web Services Make Connection (WS-MakeConnection)
        </cite></a>
@@ -1812,7 +1819,12 @@
        </cite></a>
        , J. Clark, S. DeRose, Editors.
        World Wide Web Consortium (W3C), 16 November 1999.
-      Available at <a href="http://www.w3.org/TR/xpath">http://www.w3.org/TR/xpath</a>.</dd></dl></div></div></div><div class="back"><div class="div1">
+      Available at <a href="http://www.w3.org/TR/xpath">http://www.w3.org/TR/xpath</a>.</dd><dt class="label"><a name="XPath2" id="XPath2"/>XPath2.0</dt><dd><a href="http://www.w3.org/TR/xpath20/"><cite>
+        W3C Recommendation, "XML Path Language (XPath) 2.0"
+       </cite></a>
+       , A. Berglund, et al., Editors.
+       World Wide Web Consortium (W3C), 23 January 2007.
+      Available at <a href="http://www.w3.org/TR/xpath20/">http://www.w3.org/TR/xpath20/</a>.</dd></dl></div></div></div><div class="back"><div class="div1">
 <h2><a name="Advertising" id="Advertising"/>A Advertising Event Information</h2><p>
     There are many use cases for WS-Eventing in which it is necessary for the 
     subscriber and the event sink to know the structure and contents of the 
@@ -1845,7 +1857,7 @@
      serve as a description of the Event Type used in 
      <a href="#Table1">Example 2-1</a>.
     </p><div class="exampleOuter">
-<div class="exampleHeader"><a name="idexample_1_2646" id="idexample_1_2646"/>Example A-1: EventDescriptions</div><div class="exampleInner"><pre>(01) &lt;wsevd:EventDescriptions 
+<div class="exampleHeader"><a name="idexample_1_2679" id="idexample_1_2679"/>Example A-1: EventDescriptions</div><div class="exampleInner"><pre>(01) &lt;wsevd:EventDescriptions 
 (02)        targetNamespace="http://www.example.org/oceanwatch/notifications"
 (03)        xmlns:wsevd="http://www.w3.org/2002/ws/ra/edcopies/ws-evt"
 (04)        xmlns:ow="http://www.example.org/oceanwatch"&gt;
@@ -1865,7 +1877,7 @@
      GED for this Event Type is defined on line (08) as being of type 
      "{http://www.example.org/oceanwatch}:WindReportType". 
     </p><div class="div3">
-<h4><a name="iddiv3_1_2656" id="iddiv3_1_2656"/>A.1.1 Retrieving Event Descriptions</h4><p>
+<h4><a name="iddiv3_1_2689" id="iddiv3_1_2689"/>A.1.1 Retrieving Event Descriptions</h4><p>
       Although there are many ways in which an event source can make its 
       EventDescriptions available, this specification RECOMMENDS the use of 
       the mechanisms described in WS-MetadataExchange <a href="#MEX">[WS-MetadataExchange]</a>.
@@ -1903,7 +1915,7 @@
       representation is the Event Description metadata. The data can be
       retrieved via an HTTP GET to the specified URL.
      </p></div><div class="div3">
-<h4><a name="iddiv3_1_2693" id="iddiv3_1_2693"/>A.1.2 Bindings for Event Descriptions</h4><p>
+<h4><a name="iddiv3_1_2726" id="iddiv3_1_2726"/>A.1.2 Bindings for Event Descriptions</h4><p>
       For any Notification Format it MUST be possible to determine how a 
       given wsevd:eventType will appear on the wire as a notification in a 
       subscription created with that format. The following sections define 
@@ -1915,7 +1927,7 @@
       Format, implementations MAY provide a Notification WSDL (see below) 
       that explicitly describes the notification operations. 
      </p><div class="div4">
-<h5><a name="iddiv4_1_2698" id="iddiv4_1_2698"/>A.1.2.1 Binding for Unwrapped Notifications</h5><p>
+<h5><a name="iddiv4_1_2731" id="iddiv4_1_2731"/>A.1.2.1 Binding for Unwrapped Notifications</h5><p>
        The information about an Event Type contained in the wsevd:eventType 
        element binds to a Unwrapped Notification for that type as follows:
       </p><ul><li><p>
@@ -1930,7 +1942,7 @@
          event being transmitted. If the @element attribute is absent then
          the <b>[Body]</b> property has no children.
         </p></li></ul></div><div class="div4">
-<h5><a name="iddiv4_1_2719" id="iddiv4_1_2719"/>A.1.2.2 Binding for Wrapped Notifications</h5><p>
+<h5><a name="iddiv4_1_2752" id="iddiv4_1_2752"/>A.1.2.2 Binding for Wrapped Notifications</h5><p>
        The information about an Event Type contained in the eventType element 
        binds to a Wrapped Notification for that type as follows: 
       </p><ul><li><p>
@@ -1956,7 +1968,7 @@
      successful Subscribe request that used a particular Format IRI. The 
      following is an example of a Notification WSDL: 
     </p><div class="exampleOuter">
-<div class="exampleHeader"><a name="idexample_1_2740" id="idexample_1_2740"/>Example A-4: Notification WSDL</div><div class="exampleInner"><pre>(01) &lt;wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+<div class="exampleHeader"><a name="idexample_1_2773" id="idexample_1_2773"/>Example A-4: Notification WSDL</div><div class="exampleInner"><pre>(01) &lt;wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
 (02)                   targetNamespace="http://www.example.org/oceanwatch/notifications"
 (03)                   xmlns:xs="http://www.w3.org/2001/XMLSchema"
 (04)                   xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
@@ -1991,7 +2003,7 @@
 (33)     &lt;/wsdl:operation&gt;
 (34)   &lt;/wsdl:binding&gt;
 (35) &lt;/wsdl:definitions&gt;</pre></div></div><div class="div3">
-<h4><a name="iddiv3_1_2746" id="iddiv3_1_2746"/>A.2.1 Retrieving Notification WSDLs</h4><p>
+<h4><a name="iddiv3_1_2779" id="iddiv3_1_2779"/>A.2.1 Retrieving Notification WSDLs</h4><p>
       Although there are many ways in which an event source can make 
       Notification WSDLs available, this specification RECOMMENDS the use of 
       the mechanisms described in WS-MetadataExchange <a href="#MEX">[WS-MetadataExchange]</a>.
@@ -2687,4 +2699,5 @@
        <a href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=9676">9676</a></td></tr><tr><td> 2010/05/12 </td><td> DD </td><td> Added resolution of issue
        <a href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=9712">9712</a></td></tr><tr><td> 2010/05/12 </td><td> DD </td><td> Added resolution of issue
        <a href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=9713">9713</a></td></tr><tr><td> 2010/05/12 </td><td> DD </td><td> Added resolution of issue
-       <a href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=9675">9675</a></td></tr></tbody></table></div></div></body></html>
\ No newline at end of file
+       <a href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=9675">9675</a></td></tr><tr><td> 2010/05/12 </td><td> DD </td><td> Added resolution of issue
+       <a href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=9717">9717</a></td></tr></tbody></table></div></div></body></html>
\ No newline at end of file

Index: wsfrag.xml
===================================================================
RCS file: /w3ccvs/WWW/2002/ws/ra/edcopies/wsfrag.xml,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -d -r1.67 -r1.68
--- wsfrag.xml	12 May 2010 04:51:47 -0000	1.67
+++ wsfrag.xml	12 May 2010 22:16:30 -0000	1.68
@@ -1506,7 +1506,7 @@
    
    <p>The XPath 1.0 language MUST be indicated by using the IRI:</p>
    <example>
-     <eg><loc href="http://www.w3.org/&wsfra.nsprefix;/ws-fra/XPath">http://www.w3.org/&wsfra.nsprefix;/ws-fra/XPath</loc></eg>
+     <eg><loc href="http://www.w3.org/&wsfra.nsprefix;/ws-fra/XPath10">http://www.w3.org/&wsfra.nsprefix;/ws-fra/XPath10</loc></eg>
    </example>
     
    <p>
@@ -1614,6 +1614,22 @@
 
   </div1>
 
+  <div1 id="XPath20">
+   <head>XPath 2.0 Expression Language</head>
+
+   <p>
+    The XPath 2.0 expression language is the same as the XPath 1.0
+    expression language except it uses <bibref ref="XPath2"/>
+    as the expression language.
+   </p>
+
+   <p>The XPath 2.0 language MUST be indicated by using the IRI:</p>
+   <example>
+     <eg><loc href="http://www.w3.org/&wsfra.nsprefix;/ws-fra/XPath20">http://www.w3.org/&wsfra.nsprefix;/ws-fra/XPath20</loc></eg>
+   </example>
+    
+  </div1>
+
   <div1 id="Faults">
    <head>Faults</head>
    <p>
@@ -2068,6 +2084,15 @@
        World Wide Web Consortium (W3C), 16 November 1999.
      </bibl>
 
+     <bibl key="XPath2.0" id="XPath2"
+      href="http://www.w3.org/TR/xpath20/">
+       <titleref>
+        W3C Recommendation, "XML Path Language (XPath) 2.0"
+       </titleref>
+       , A. Berglund, et al., Editors.
+       World Wide Web Consortium (W3C), 23 January 2007.
+     </bibl>
+
     </blist>
    </div2>
 
@@ -2413,6 +2438,13 @@
        <loc href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=9558">9558</loc>
       </td>
      </tr>
+     <tr>
+      <td> 2010/05/12 </td>
+      <td> DD </td>
+      <td> Added resolution of issue 
+       <loc href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=9717">9717</loc>
+      </td>
+     </tr>
     </tbody>
    </table>
   </div1>

Index: wsfrag.html
===================================================================
RCS file: /w3ccvs/WWW/2002/ws/ra/edcopies/wsfrag.html,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -d -r1.69 -r1.70
--- wsfrag.html	12 May 2010 04:51:47 -0000	1.69
+++ wsfrag.html	12 May 2010 22:16:30 -0000	1.70
@@ -60,15 +60,16 @@
 &nbsp;&nbsp;&nbsp;5.1 <a href="#iddiv2_1_1424">Examples</a><br/>
 6 <a href="#QName">QName Expression Language</a><br/>
 7 <a href="#XPath10">XPath 1.0 Expression Language</a><br/>
-8 <a href="#Faults">Faults</a><br/>
-&nbsp;&nbsp;&nbsp;8.1 <a href="#UnsupportedLanguage">UnsupportedLanguage</a><br/>
-&nbsp;&nbsp;&nbsp;8.2 <a href="#InvalidExpression">InvalidExpression</a><br/>
-&nbsp;&nbsp;&nbsp;8.3 <a href="#UnsupportedMode">UnsupportedMode</a><br/>
-9 <a href="#metadata">WS-Fragment Metadata</a><br/>
-&nbsp;&nbsp;&nbsp;9.1 <a href="#iddiv2_1_1867">Fragment Assertion</a><br/>
-10 <a href="#acks">Acknowledgements</a><br/>
-11 <a href="#refs">References</a><br/>
-&nbsp;&nbsp;&nbsp;11.1 <a href="#iddiv2_1_1930">Normative References</a><br/>
+8 <a href="#XPath20">XPath 2.0 Expression Language</a><br/>
+9 <a href="#Faults">Faults</a><br/>
+&nbsp;&nbsp;&nbsp;9.1 <a href="#UnsupportedLanguage">UnsupportedLanguage</a><br/>
+&nbsp;&nbsp;&nbsp;9.2 <a href="#InvalidExpression">InvalidExpression</a><br/>
+&nbsp;&nbsp;&nbsp;9.3 <a href="#UnsupportedMode">UnsupportedMode</a><br/>
+10 <a href="#metadata">WS-Fragment Metadata</a><br/>
+&nbsp;&nbsp;&nbsp;10.1 <a href="#iddiv2_1_1889">Fragment Assertion</a><br/>
+11 <a href="#acks">Acknowledgements</a><br/>
+12 <a href="#refs">References</a><br/>
+&nbsp;&nbsp;&nbsp;12.1 <a href="#iddiv2_1_1952">Normative References</a><br/>
 </p>
 <h3><a name="appendices" id="appendices"/>Appendices</h3><p class="toc">A <a href="#Appendix_I__E2_80_93_XSD">XML Schema</a><br/>
 B <a href="#changelog">Change Log</a><br/>
@@ -718,7 +719,7 @@
     define references to any element, attribute or value in the resource
     representation and can also be used to compute values from the resource
     representation.
-   </p><p>The XPath 1.0 language MUST be indicated by using the IRI:</p><div class="exampleOuter"><div class="exampleInner"><pre><a href="http://www.w3.org/2002/ws/ra/edcopies/ws-fra/XPath">http://www.w3.org/2002/ws/ra/edcopies/ws-fra/XPath</a></pre></div></div><p>
+   </p><p>The XPath 1.0 language MUST be indicated by using the IRI:</p><div class="exampleOuter"><div class="exampleInner"><pre><a href="http://www.w3.org/2002/ws/ra/edcopies/ws-fra/XPath10">http://www.w3.org/2002/ws/ra/edcopies/ws-fra/XPath10</a></pre></div></div><p>
     Most of the examples assume the following XML sample acting
     as a "resource" document:
    </p><div class="exampleOuter"><div class="exampleInner"><pre>(01) &lt;a&gt;
@@ -768,7 +769,12 @@
     returns a
     node-set containing a single element node which serializes directly:
    </p><div class="exampleOuter"><div class="exampleInner"><pre>(01) &lt;b&gt; &lt;c d="30"&gt; 20 &lt;/c&gt; &lt;/b&gt;</pre></div></div></div><div class="div1">
-<h2><a name="Faults" id="Faults"/>8 Faults</h2><p>
+<h2><a name="XPath20" id="XPath20"/>8 XPath 2.0 Expression Language</h2><p>
+    The XPath 2.0 expression language is the same as the XPath 1.0
+    expression language except it uses <a href="#XPath2">[XPath2.0]</a>
+    as the expression language.
+   </p><p>The XPath 2.0 language MUST be indicated by using the IRI:</p><div class="exampleOuter"><div class="exampleInner"><pre><a href="http://www.w3.org/2002/ws/ra/edcopies/ws-fra/XPath20">http://www.w3.org/2002/ws/ra/edcopies/ws-fra/XPath20</a></pre></div></div></div><div class="div1">
+<h2><a name="Faults" id="Faults"/>9 Faults</h2><p>
     All fault messages defined in this specification MUST be sent
     according to the rules and usage described in
     <a href="#WSABinding">[WS-Addressing 1.0 SOAP Binding]</a>
@@ -816,14 +822,14 @@
     &lt;/s11:Fault&gt;
   &lt;/s11:Body&gt;
 &lt;/s11:Envelope&gt;</pre></div></div><div class="div2">
-<h3><a name="UnsupportedLanguage" id="UnsupportedLanguage"/>8.1 UnsupportedLanguage</h3><p>
+<h3><a name="UnsupportedLanguage" id="UnsupportedLanguage"/>9.1 UnsupportedLanguage</h3><p>
      This fault MUST be generated when a service detects an unknown or
      unsupported Language 
      IRI in a request message. 
     </p><a name="Table3" id="Table3"/><table border="1" cellpadding="5"><tbody><tr><th align="left"><b>[Code]</b></th><td>s:Sender</td></tr><tr><th align="left"><b>[Subcode]</b></th><td>wst:UnsupportedLanguage</td></tr><tr><th align="left"><b>[Reason]</b></th><td>
         The specified Language IRI is not supported.
        </td></tr><tr><th align="left"><b>[Detail]</b></th><td><em>The unsupported Language IRI.</em></td></tr></tbody></table></div><div class="div2">
-<h3><a name="InvalidExpression" id="InvalidExpression"/>8.2 InvalidExpression</h3><p>
+<h3><a name="InvalidExpression" id="InvalidExpression"/>9.2 InvalidExpression</h3><p>
      This fault MUST be generated when a service determines that the Language
      expression specified in a request does not conform to the syntax
      of the language specified in the Language attribute or is semantically
@@ -831,20 +837,20 @@
     </p><a name="Table5" id="Table5"/><table border="1" cellpadding="5"><tbody><tr><th align="left"><b>[Code]</b></th><td>s:Sender</td></tr><tr><th align="left"><b>[Subcode]</b></th><td>wst:InvalidExpression</td></tr><tr><th align="left"><b>[Reason]</b></th><td>
         The specified Language expression is invalid.
        </td></tr><tr><th align="left"><b>[Detail]</b></th><td><em>The invalid language expression.</em></td></tr></tbody></table></div><div class="div2">
-<h3><a name="UnsupportedMode" id="UnsupportedMode"/>8.3 UnsupportedMode</h3><p>
+<h3><a name="UnsupportedMode" id="UnsupportedMode"/>9.3 UnsupportedMode</h3><p>
      This fault MUST be generated when a service detects a Mode in a Put
      request that is not supported.
     </p><a name="Table6" id="Table6"/><table border="1" cellpadding="5"><tbody><tr><th align="left"><b>[Code]</b></th><td>s:Sender</td></tr><tr><th align="left"><b>[Subcode]</b></th><td>wst:UnsupportedMode</td></tr><tr><th align="left"><b>[Reason]</b></th><td>
         The specified mode is not supported.
        </td></tr><tr><th align="left"><b>[Detail]</b></th><td><em>The unsupported Mode.</em></td></tr></tbody></table></div></div><div class="div1">
-<h2><a name="metadata" id="metadata"/>9 WS-Fragment Metadata</h2><p>
+<h2><a name="metadata" id="metadata"/>10 WS-Fragment Metadata</h2><p>
     An endpoint MAY indicate its support of WS-Fragment, or its features,
     by including the WS-Fragment FragmentAssertion Policy assertion within its 
     WSDL. By
     doing so the endpoint is indicating that the corresponding WS-Fragment
     features are supported by that endpoint.
    </p><div class="div2">
-<h3><a name="iddiv2_1_1867" id="iddiv2_1_1867"/>9.1 Fragment Assertion</h3><p>
+<h3><a name="iddiv2_1_1889" id="iddiv2_1_1889"/>10.1 Fragment Assertion</h3><p>
      Services indicate their support for the WS-Fragment specification through 
      the use of the Web Services
      Policy - Framework <a href="#wspolicy">[WS-Policy]</a> and Web Services Policy -
@@ -877,7 +883,7 @@
          Any metadata that appears is scoped to the operations and features 
          of the WS-Fragment specification.
         </p></dd></dl></div></div><div class="div1">
-<h2><a name="acks" id="acks"/>10 Acknowledgements</h2><p>
+<h2><a name="acks" id="acks"/>11 Acknowledgements</h2><p>
     This specification has been developed as a result of joint
     work with many individuals and teams, including: 
      Alessio Soldano (Red Hat),
@@ -907,8 +913,8 @@
      Wu Chou (Avaya Communications),
      Yves Lafon (W3C/ERCIM).
    </p></div><div class="div1">
-<h2><a name="refs" id="refs"/>11 References</h2><div class="div2">
-<h3><a name="iddiv2_1_1930" id="iddiv2_1_1930"/>11.1 Normative References</h3><dl><dt class="label"><a name="RFC2119" id="RFC2119"/>RFC 2119</dt><dd><a href="http://www.ietf.org/rfc/rfc2119.txt"><cite>
+<h2><a name="refs" id="refs"/>12 References</h2><div class="div2">
+<h3><a name="iddiv2_1_1952" id="iddiv2_1_1952"/>12.1 Normative References</h3><dl><dt class="label"><a name="RFC2119" id="RFC2119"/>RFC 2119</dt><dd><a href="http://www.ietf.org/rfc/rfc2119.txt"><cite>
         Key words for use in RFCs to Indicate Requirement Levels
        </cite></a>
        , S. Bradner, Author.
@@ -984,7 +990,12 @@
        </cite></a>
        , J. Clark, S. DeRose, Editors.
        World Wide Web Consortium (W3C), 16 November 1999.
-      Available at <a href="http://www.w3.org/TR/xpath">http://www.w3.org/TR/xpath</a>.</dd></dl></div></div></div><div class="back"><div class="div1">
+      Available at <a href="http://www.w3.org/TR/xpath">http://www.w3.org/TR/xpath</a>.</dd><dt class="label"><a name="XPath2" id="XPath2"/>XPath2.0</dt><dd><a href="http://www.w3.org/TR/xpath20/"><cite>
+        W3C Recommendation, "XML Path Language (XPath) 2.0"
+       </cite></a>
+       , A. Berglund, et al., Editors.
+       World Wide Web Consortium (W3C), 23 January 2007.
+      Available at <a href="http://www.w3.org/TR/xpath20/">http://www.w3.org/TR/xpath20/</a>.</dd></dl></div></div></div><div class="back"><div class="div1">
 <h2><a name="Appendix_I__E2_80_93_XSD" id="Appendix_I__E2_80_93_XSD"/>A XML Schema</h2><p>
     A normative copy of the XML Schema <a href="#XMLSchema1">[XMLSchema - Part 1]</a>,
     <a href="#XMLSchema2">[XMLSchema - Part 2]</a> description for this specification can be
@@ -1095,4 +1106,5 @@
        <a href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=9588">9588</a></td></tr><tr><td> 2010/05/04 </td><td> DD </td><td> Added resolution of issue 
        <a href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=9087">9087</a></td></tr><tr><td> 2010/05/11 </td><td> DD </td><td> Added resolution of issue 
        <a href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=9699">9699</a></td></tr><tr><td> 2010/05/11 </td><td> DD </td><td> Added resolution of issue 
-       <a href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=9558">9558</a></td></tr></tbody></table></div></div></body></html>
\ No newline at end of file
+       <a href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=9558">9558</a></td></tr><tr><td> 2010/05/12 </td><td> DD </td><td> Added resolution of issue 
+       <a href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=9717">9717</a></td></tr></tbody></table></div></div></body></html>
\ No newline at end of file

Index: wsenum.html
===================================================================
RCS file: /w3ccvs/WWW/2002/ws/ra/edcopies/wsenum.html,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -d -r1.136 -r1.137
--- wsenum.html	12 May 2010 16:05:59 -0000	1.136
+++ wsenum.html	12 May 2010 22:16:30 -0000	1.137
@@ -69,15 +69,15 @@
 &nbsp;&nbsp;&nbsp;5.10 <a href="#EndToNotSupported">EndToNotSupported</a><br/>
 &nbsp;&nbsp;&nbsp;5.11 <a href="#EmptyFilter">EmptyFilter</a><br/>
 6 <a href="#Security">Security Considerations</a><br/>
-&nbsp;&nbsp;&nbsp;6.1 <a href="#iddiv2_1_1957">Creating Enumeration Contexts</a><br/>
-&nbsp;&nbsp;&nbsp;6.2 <a href="#iddiv2_1_1962">Protecting Enumeration Contexts</a><br/>
-&nbsp;&nbsp;&nbsp;6.3 <a href="#iddiv2_1_1969">Endpoint Verification</a><br/>
+&nbsp;&nbsp;&nbsp;6.1 <a href="#iddiv2_1_1976">Creating Enumeration Contexts</a><br/>
+&nbsp;&nbsp;&nbsp;6.2 <a href="#iddiv2_1_1981">Protecting Enumeration Contexts</a><br/>
+&nbsp;&nbsp;&nbsp;6.3 <a href="#iddiv2_1_1988">Endpoint Verification</a><br/>
 7 <a href="#metadata">WS-Enumeration Metadata</a><br/>
-&nbsp;&nbsp;&nbsp;7.1 <a href="#iddiv2_1_1989">Enumeration Assertion</a><br/>
+&nbsp;&nbsp;&nbsp;7.1 <a href="#iddiv2_1_2008">Enumeration Assertion</a><br/>
 8 <a href="#acks">Acknowledgements</a><br/>
 9 <a href="#refs">References</a><br/>
-&nbsp;&nbsp;&nbsp;9.1 <a href="#iddiv2_1_2094">Normative References</a><br/>
-&nbsp;&nbsp;&nbsp;9.2 <a href="#iddiv2_1_2280">Informative References</a><br/>
+&nbsp;&nbsp;&nbsp;9.1 <a href="#iddiv2_1_2113">Normative References</a><br/>
+&nbsp;&nbsp;&nbsp;9.2 <a href="#iddiv2_1_2312">Informative References</a><br/>
 </p>
 <h3><a name="appendices" id="appendices"/>Appendices</h3><p class="toc">A <a href="#schema">XML Schema</a><br/>
 B <a href="#WSDL">WSDL</a><br/>
@@ -551,6 +551,12 @@
         construct expressions in a manner that avoids the use of namespace
         prefixes. For example, use an expression such as
         "/a[namespace-uri()='http://www.example.com']" not "/ns1:a".
+       </p></dd><dt class="label"><b>[Body]</b>/wsen:Enumerate/wsen:Filter/@Dialect="<a href="http://www.w3.org/2002/ws/ra/edcopies/ws-enu/Dialects/XPath20">
+        http://www.w3.org/2002/ws/ra/edcopies/ws-enu/Dialects/XPath20
+       </a></dt><dd><p>
+        This filter dialect is the same as the XPath 1.0 filter dialect
+        except that it uses <a href="#XPath2">[XPath2.0]</a> instead of XPath 1.0
+        as the expression language.
        </p></dd></dl><p>
      Other components of the outline above are not
      further constrained by this specification.
@@ -1235,7 +1241,7 @@
     a security analysis to determine their particular threat profile and 
     the appropriate responses to those threats.
    </p><div class="div2">
-<h3><a name="iddiv2_1_1957" id="iddiv2_1_1957"/>6.1 Creating Enumeration Contexts</h3><p>
+<h3><a name="iddiv2_1_1976" id="iddiv2_1_1976"/>6.1 Creating Enumeration Contexts</h3><p>
      An enumeration represents a logical cursor through a sequence of 
      data items. If the information in these items is sensitive, it is 
      advisable to for Data Sources to authenticate and authorize Consumers 
@@ -1246,7 +1252,7 @@
      the time the Enumerate request is processed or varies during the 
      lifetime of the enumeration.
     </p></div><div class="div2">
-<h3><a name="iddiv2_1_1962" id="iddiv2_1_1962"/>6.2 Protecting Enumeration Contexts</h3><p>
+<h3><a name="iddiv2_1_1981" id="iddiv2_1_1981"/>6.2 Protecting Enumeration Contexts</h3><p>
      Once created, it is advisable to treat Enumeration Contexts as 
      protected resources. Renew, GetStatus, and Release requests ought to 
      be authenticated and authorized (for example, the identity of the 
@@ -1268,7 +1274,7 @@
      Data Sources are advised to authenticate and authorize clients 
      sending Pull requests.
     </p></div><div class="div2">
-<h3><a name="iddiv2_1_1969" id="iddiv2_1_1969"/>6.3 Endpoint Verification</h3><p>
+<h3><a name="iddiv2_1_1988" id="iddiv2_1_1988"/>6.3 Endpoint Verification</h3><p>
      Data Source implementations that perform validity checks on the 
      EndTo EPR used in the Enumerate request are advised that such checks 
      can be misused to obtain information about a target network. For 
@@ -1310,7 +1316,7 @@
     that indicate a particular security mechanism used to protect 
     the WS-Enumeration operations supported by this endpoint. 
    </p><div class="div2">
-<h3><a name="iddiv2_1_1989" id="iddiv2_1_1989"/>7.1 Enumeration Assertion</h3><p>
+<h3><a name="iddiv2_1_2008" id="iddiv2_1_2008"/>7.1 Enumeration Assertion</h3><p>
      Services indicate support for the WS-Enumeration's definition of a 
      data source through the use of the Web Services 
      Policy - Framework <a href="#wspolicy">[WS-Policy]</a> and Web Services Policy - 
@@ -1410,7 +1416,7 @@
      Yves Lafon (W3C/ERCIM).
    </p></div><div class="div1">
 <h2><a name="refs" id="refs"/>9 References</h2><div class="div2">
-<h3><a name="iddiv2_1_2094" id="iddiv2_1_2094"/>9.1 Normative References</h3><dl><dt class="label"><a name="RFC2119" id="RFC2119"/>RFC 2119</dt><dd><a href="http://www.ietf.org/rfc/rfc2119.txt"><cite>
+<h3><a name="iddiv2_1_2113" id="iddiv2_1_2113"/>9.1 Normative References</h3><dl><dt class="label"><a name="RFC2119" id="RFC2119"/>RFC 2119</dt><dd><a href="http://www.ietf.org/rfc/rfc2119.txt"><cite>
         Key words for use in RFCs to Indicate Requirement Levels
        </cite></a>
        , S. Bradner, Author. 
@@ -1481,8 +1487,13 @@
        </cite></a>
        , J. Clark, S. DeRose, Editors.
        World Wide Web Consortium (W3C), 16 November 1999. 
-      Available at <a href="http://www.w3.org/TR/xpath">http://www.w3.org/TR/xpath</a>.</dd></dl></div><div class="div2">
-<h3><a name="iddiv2_1_2280" id="iddiv2_1_2280"/>9.2 Informative References</h3><dl><dt class="label"><a name="MEX" id="MEX"/>WS-MetadataExchange</dt><dd><a href="http://www.w3.org/TR/ws-metadata-exchange"><cite>
+      Available at <a href="http://www.w3.org/TR/xpath">http://www.w3.org/TR/xpath</a>.</dd><dt class="label"><a name="XPath2" id="XPath2"/>XPath2.0</dt><dd><a href="http://www.w3.org/TR/xpath20/"><cite>
+        W3C Recommendation, "XML Path Language (XPath) 2.0"
+       </cite></a>
+       , A. Berglund, et al., Editors.
+       World Wide Web Consortium (W3C), 23 January 2007. 
+      Available at <a href="http://www.w3.org/TR/xpath20/">http://www.w3.org/TR/xpath20/</a>.</dd></dl></div><div class="div2">
+<h3><a name="iddiv2_1_2312" id="iddiv2_1_2312"/>9.2 Informative References</h3><dl><dt class="label"><a name="MEX" id="MEX"/>WS-MetadataExchange</dt><dd><a href="http://www.w3.org/TR/ws-metadata-exchange"><cite>
         W3C Working Group Draft, "Web Services Metadata Exchange
           (WS-MetadataExchange) 1.1"
        </cite></a>
@@ -2111,4 +2122,5 @@
        <a href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=9588">9588</a></td></tr><tr><td> 2010/05/04 </td><td> DD </td><td> Added resolution of issue 
        <a href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=9087">9087</a></td></tr><tr><td> 2010/05/11 </td><td> DD </td><td> Added resolution of issue 
        <a href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=9568">9568</a></td></tr><tr><td> 2010/05/11 </td><td> DD </td><td> Added resolution of issue 
-       <a href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=9699">9699</a></td></tr></tbody></table></div></div></body></html>
\ No newline at end of file
+       <a href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=9699">9699</a></td></tr><tr><td> 2010/05/12 </td><td> DD </td><td> Added resolution of issue 
+       <a href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=9717">9717</a></td></tr></tbody></table></div></div></body></html>
\ No newline at end of file

Index: wsenum.xml
===================================================================
RCS file: /w3ccvs/WWW/2002/ws/ra/edcopies/wsenum.xml,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -d -r1.127 -r1.128
--- wsenum.xml	12 May 2010 16:05:59 -0000	1.127
+++ wsenum.xml	12 May 2010 22:16:30 -0000	1.128
@@ -941,6 +941,23 @@
        </p>
       </def>
      </gitem>
+
+     <gitem>
+      <label><kw>[Body]</kw>/wsen:Enumerate/wsen:Filter/@Dialect="<loc
+       href="http://www.w3.org/&wsenu.nsprefix;/ws-enu/Dialects/XPath20">
+        http://www.w3.org/&wsenu.nsprefix;/ws-enu/Dialects/XPath20
+       </loc>
+      </label>
+
+      <def>
+       <p>
+        This filter dialect is the same as the XPath 1.0 filter dialect
+        except that it uses <bibref ref="XPath2"/> instead of XPath 1.0
+        as the expression language.
+       </p>
+      </def>
+     </gitem>
+
     </glist>
 
     <p>
@@ -2730,6 +2747,15 @@
        World Wide Web Consortium (W3C), 16 November 1999. 
      </bibl>
  
+     <bibl key="XPath2.0" id="XPath2"
+      href="http://www.w3.org/TR/xpath20/">
+       <titleref>
+        W3C Recommendation, "XML Path Language (XPath) 2.0"
+       </titleref>
+       , A. Berglund, et al., Editors.
+       World Wide Web Consortium (W3C), 23 January 2007. 
+     </bibl>
+ 
     </blist>
    </div2>
 
@@ -3995,6 +4021,13 @@
        <loc href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=9699">9699</loc>
       </td>
      </tr>
+     <tr>
+      <td> 2010/05/12 </td>
+      <td> DD </td>
+      <td> Added resolution of issue 
+       <loc href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=9717">9717</loc>
+      </td>
+     </tr>
     </tbody>
    </table>
   </div1>

Index: wseventing.xml
===================================================================
RCS file: /w3ccvs/WWW/2002/ws/ra/edcopies/wseventing.xml,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -d -r1.189 -r1.190
--- wseventing.xml	12 May 2010 19:55:26 -0000	1.189
+++ wseventing.xml	12 May 2010 22:16:30 -0000	1.190
@@ -1181,6 +1181,22 @@
        </p>
       </def>
      </gitem>
+
+     <gitem>
+      <label> <kw>[Body]</kw>/wse:Subscribe/wse:Filter/@Dialect="<loc
+       href="http://www.w3.org/&wsevt.nsprefix;/ws-evt/Dialects/XPath20">
+        http://www.w3.org/&wsevt.nsprefix;/ws-evt/Dialects/XPath20
+       </loc>"
+      </label>
+      <def>
+       <p>
+        This filter dialect is the same as the XPath 1.0 filter dialect 
+        except that it uses <bibref ref="XPath2"/> instead of XPath 1.0
+        as the expression language.
+       </p>
+      </def>
+     </gitem>
+
     </glist>
 
     <p>
@@ -3215,6 +3231,15 @@
        World Wide Web Consortium (W3C), 16 November 1999.
      </bibl>
 
+     <bibl key="XPath2.0" id="XPath2"
+      href="http://www.w3.org/TR/xpath20/">
+       <titleref>
+        W3C Recommendation, "XML Path Language (XPath) 2.0"
+       </titleref>
+       , A. Berglund, et al., Editors.
+       World Wide Web Consortium (W3C), 23 January 2007.
+     </bibl>
+
     </blist>
    </div2>
 
@@ -5039,6 +5064,13 @@
        <loc href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=9675">9675</loc>
       </td>
      </tr>
+     <tr>
+      <td> 2010/05/12 </td>
+      <td> DD </td>
+      <td> Added resolution of issue
+       <loc href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=9717">9717</loc>
+      </td>
+     </tr>
     </tbody>
    </table>
   </div1>

Received on Wednesday, 12 May 2010 22:16:34 UTC