WWW/2002/ws/ra/edcopies wsmex.html,1.143,1.144 wsmex.xml,1.133,1.134

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

Modified Files:
	wsmex.html wsmex.xml 
Log Message:
11189


Index: wsmex.xml
===================================================================
RCS file: /w3ccvs/WWW/2002/ws/ra/edcopies/wsmex.xml,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -d -r1.133 -r1.134
--- wsmex.xml	29 Nov 2010 18:28:58 -0000	1.133
+++ wsmex.xml	15 Dec 2010 00:26:45 -0000	1.134
@@ -1257,7 +1257,7 @@
   http://www.w3.org/&wsmex.nsprefix;/ws-mex/GetMetadata
 
 <kw>[Body]</kw>
-  &lt;mex:GetMetadata ...>
+  &lt;mex:GetMetadata Content='<emph>xs:any</emph>' ? ...>
     &lt;mex:Dialect Type='<emph>xs:QName</emph>'
                  Identifier='<emph>xs:anyURI</emph>' ?
                  Content='<emph>xs:anyURI</emph>' ? .../> *
@@ -1272,6 +1272,67 @@
 
     <glist>
      <gitem>
+      <label> <kw>[Body]</kw>/mex:GetMetadata@Content </label>
+      <def>
+       <p>
+        This OPTIONAL attribute, when present, specifies the default 
+        content form IRI for this request.   When this attribute is 
+        not present, the default content form IRI is 
+        'http://www.w3.org/&wsmex.nsprefix;/ws-mex/Content/Any'.
+       </p>
+
+       <p>
+        If no dialect elements are present in the request, the response
+        MUST only include MetadataSections of the content form specified
+        by this attribute.
+       </p>
+
+       <p>
+        If the specified content form is not available, or not known, 
+        then the response MUST include zero MetadataSections of the 
+        specified form. 
+       </p>
+
+       <p>
+        This specification defines the following content form IRIs:
+       </p>
+       <table border='1'>
+        <tbody>
+         <tr>
+          <th align="left"> Content Form IRI </th>
+          <th align="left"> Form </th>
+         </tr>
+         <tr>
+          <td> http://www.w3.org/&wsmex.nsprefix;/ws-mex/Content/EPR </td> 
+          <td> A MetadataReference element is returned </td> 
+         </tr>
+         <tr>
+          <td> http://www.w3.org/&wsmex.nsprefix;/ws-mex/Content/URI </td> 
+          <td> A MetadataLocation element is returned </td> 
+         </tr>
+         <tr>
+          <td> http://www.w3.org/&wsmex.nsprefix;/ws-mex/Content/Metadata </td> 
+          <td> The metadata is embedded </td> 
+         </tr>
+         <tr>
+          <td> http://www.w3.org/&wsmex.nsprefix;/ws-mex/Content/Any </td> 
+          <td> The service is free to choose any content form </td> 
+         </tr>
+         <tr>
+          <td> http://www.w3.org/&wsmex.nsprefix;/ws-mex/Content/All </td> 
+          <td> The service MUST return all available content forms </td> 
+         </tr>
+        </tbody>
+       </table>
+       <p>
+        When not present the default value is 
+        "http://www.w3.org/&wsmex.nsprefix;/ws-mex/Content/Any".
+       </p>
+      </def>
+     </gitem>
+
+
+     <gitem>
       <label> <kw>[Body]</kw>/mex:GetMetadata/mex:Dialect </label>
       <def>
        <p>
@@ -1323,44 +1384,19 @@
       <label> <kw>[Body]</kw>/mex:GetMetadata/mex:Dialect@Content </label>
       <def>
        <p>
-        When this OPTIONAL attribute is present, the response MUST include only
-        MetadataSections of this specified content form. If the specified
-        content form is not available, or not known,
-        then the response MUST include zero
-        MetadataSections of the specified form for this QName/Identifier pair.
-        This specification defines the following content form IRIs:
+        For the dialect indicated, the response MUST include only 
+        MetadataSections of the content form specified by this attribute.
        </p>
-       <table border='1'>
-        <tbody>
-         <tr>
-          <th align="left"> Content Form IRI </th>
-          <th align="left"> Form </th>
-         </tr>
-         <tr>
-          <td> http://www.w3.org/&wsmex.nsprefix;/ws-mex/Content/EPR </td> 
-          <td> A MetadataReference element is returned </td> 
-         </tr>
-         <tr>
-          <td> http://www.w3.org/&wsmex.nsprefix;/ws-mex/Content/URI </td> 
-          <td> A MetadataLocation element is returned </td> 
-         </tr>
-         <tr>
-          <td> http://www.w3.org/&wsmex.nsprefix;/ws-mex/Content/Metadata </td> 
-          <td> The metadata is embedded </td> 
-         </tr>
-         <tr>
-          <td> http://www.w3.org/&wsmex.nsprefix;/ws-mex/Content/Any </td> 
-          <td> The service is free to choose any content form </td> 
-         </tr>
-         <tr>
-          <td> http://www.w3.org/&wsmex.nsprefix;/ws-mex/Content/All </td> 
-          <td> The service MUST return all available content forms </td> 
-         </tr>
-        </tbody>
-       </table>
+
        <p>
-        When not present the default value is 
-        "http://www.w3.org/&wsmex.nsprefix;/ws-mex/Content/Any".
+        When this OPTIONAL attribute is not present, it defaults to the 
+        value of the [Body]/mex:GetMetadata@Content attribute.  
+       </p>
+
+       <p>
+        If the specified content form is not available, or not known,
+        then the response MUST include zero
+        MetadataSections of the specified form for this QName/Identifier pair.
        </p>
       </def>
      </gitem>
@@ -2878,7 +2914,8 @@
        <def>
         <p>
          When present, this OPTIONAL parameter indicates support for the 
-         specified MetadataExchange content IRI by the GetMetadata operation.
+         specified MetadataExchange content IRI by the GetMetadata 
+         operation for the dialect indicated.
         </p>
        </def>
      </gitem>
@@ -2944,7 +2981,8 @@
        <def>
         <p>
          When present, this OPTIONAL parameter indicates support for the 
-         specified MetadataExchange content IRI by the PutMetadata operation. 
+         specified MetadataExchange content IRI by the PutMetadata 
+         operation for the dialect indicated. 
         </p>
        </def>
      </gitem>
@@ -3011,7 +3049,8 @@
        <def>
         <p>
          When present, this OPTIONAL parameter indicates support for the 
-         specified MetadataExchange content IRI by the DeleteMetadata operation.
+         specified MetadataExchange content IRI by the DeleteMetadata 
+         operation for the dialect indicated.
         </p>
        </def>
      </gitem>
@@ -3413,6 +3452,7 @@
         &lt;xs:any namespace='##other' processContents='lax' minOccurs='0'
                 maxOccurs='unbounded'/>
       &lt;/xs:sequence>
+      &lt;xs:attribute name='Content' type='xs:anyURI'/>
       &lt;xs:anyAttribute namespace='##other' processContents='lax'/>
     &lt;/xs:complexType>
   &lt;/xs:element>
@@ -4284,6 +4324,13 @@
        <loc href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=8284">8284</loc>
       </td>
      </tr>
+     <tr>
+      <td> 2010/12/14 </td>
+      <td> DD </td>
+      <td> Added resolution of issue 
+       <loc href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=11189">11189</loc>
+      </td>
+     </tr>
     </tbody>
    </table>
   </div1>

Index: wsmex.html
===================================================================
RCS file: /w3ccvs/WWW/2002/ws/ra/edcopies/wsmex.html,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -d -r1.143 -r1.144
--- wsmex.html	29 Nov 2010 18:28:58 -0000	1.143
+++ wsmex.html	15 Dec 2010 00:26:45 -0000	1.144
@@ -64,7 +64,7 @@
 7 <a href="#MetadataReferences">Metadata References</a><br/>
 &nbsp;&nbsp;&nbsp;7.1 <a href="#mexLocation">mex:Location</a><br/>
 &nbsp;&nbsp;&nbsp;7.2 <a href="#mexReference">mex:Reference</a><br/>
-&nbsp;&nbsp;&nbsp;7.3 <a href="#iddiv2x1x1479">Examples</a><br/>
+&nbsp;&nbsp;&nbsp;7.3 <a href="#iddiv2x1x1502">Examples</a><br/>
 8 <a href="#Metadata-in-Endpoint-References">Metadata in Endpoint References</a><br/>
 &nbsp;&nbsp;&nbsp;8.1 <a href="#EPRwithMEX">Endpoint References Containing Metadata</a><br/>
 &nbsp;&nbsp;&nbsp;8.2 <a href="#WSPAEPR">Associating Policies with Endpoint References</a><br/>
@@ -73,13 +73,13 @@
 &nbsp;&nbsp;&nbsp;10.1 <a href="#UnsupportedMetadata">UnsupportedMetadata</a><br/>
 &nbsp;&nbsp;&nbsp;10.2 <a href="#InvalidMetadata">UnknownDialect</a><br/>
 11 <a href="#Security">Security Considerations</a><br/>
-&nbsp;&nbsp;&nbsp;11.1 <a href="#iddiv2x1x2029">Metadata and Security Bootstrapping</a><br/>
+&nbsp;&nbsp;&nbsp;11.1 <a href="#iddiv2x1x2052">Metadata and Security Bootstrapping</a><br/>
 12 <a href="#metadata">WS-MetadataExchange Metadata</a><br/>
-&nbsp;&nbsp;&nbsp;12.1 <a href="#iddiv2x1x2050">MetadataExchange Assertion</a><br/>
+&nbsp;&nbsp;&nbsp;12.1 <a href="#iddiv2x1x2073">MetadataExchange Assertion</a><br/>
 13 <a href="#bootstrapping">Bootstrapping Metadata Retrieval</a><br/>
 14 <a href="#acks">Acknowledgements</a><br/>
 15 <a href="#References">References</a><br/>
-&nbsp;&nbsp;&nbsp;15.1 <a href="#iddiv2x1x2306">Normative References</a><br/>
+&nbsp;&nbsp;&nbsp;15.1 <a href="#iddiv2x1x2329">Normative References</a><br/>
 </p>
 <h3><a name="appendices" id="appendices"/>Appendices</h3><p class="toc">A <a href="#Appendix-A">XML Schema</a><br/>
 B <a href="#Appendix-B">WSDL</a><br/>
@@ -757,7 +757,7 @@
   http://www.w3.org/2002/ws/ra/edcopies/ws-mex/GetMetadata
 
 <b>[Body]</b>
-  &lt;mex:GetMetadata ...&gt;
+  &lt;mex:GetMetadata Content='<em>xs:any</em>' ? ...&gt;
     &lt;mex:Dialect Type='<em>xs:QName</em>'
                  Identifier='<em>xs:anyURI</em>' ?
                  Content='<em>xs:anyURI</em>' ? .../&gt; *
@@ -765,7 +765,25 @@
   &lt;/mex:GetMetadata&gt; </pre></div></div><p>
      The following describes additional, normative constraints on the 
      outline listed above:
-    </p><dl><dt class="label"><b>[Body]</b>/mex:GetMetadata/mex:Dialect </dt><dd><p>
+    </p><dl><dt class="label"><b>[Body]</b>/mex:GetMetadata@Content </dt><dd><p>
+        This OPTIONAL attribute, when present, specifies the default 
+        content form IRI for this request.   When this attribute is 
+        not present, the default content form IRI is 
+        'http://www.w3.org/2002/ws/ra/edcopies/ws-mex/Content/Any'.
+       </p><p>
+        If no dialect elements are present in the request, the response
+        MUST only include MetadataSections of the content form specified
+        by this attribute.
+       </p><p>
+        If the specified content form is not available, or not known, 
+        then the response MUST include zero MetadataSections of the 
+        specified form. 
+       </p><p>
+        This specification defines the following content form IRIs:
+       </p><table border="1"><tbody><tr><th align="left"> Content Form IRI </th><th align="left"> Form </th></tr><tr><td> http://www.w3.org/2002/ws/ra/edcopies/ws-mex/Content/EPR </td><td> A MetadataReference element is returned </td></tr><tr><td> http://www.w3.org/2002/ws/ra/edcopies/ws-mex/Content/URI </td><td> A MetadataLocation element is returned </td></tr><tr><td> http://www.w3.org/2002/ws/ra/edcopies/ws-mex/Content/Metadata </td><td> The metadata is embedded </td></tr><tr><td> http://www.w3.org/2002/ws/ra/edcopies/ws-mex/Content/Any </td><td> The service is free to choose any content form </td></tr><tr><td> http://www.w3.org/2002/ws/ra/edcopies/ws-mex/Content/All </td><td> The service MUST return all available content forms </td></tr></tbody></table><p>
+        When not present the default value is 
+        "http://www.w3.org/2002/ws/ra/edcopies/ws-mex/Content/Any".
+       </p></dd><dt class="label"><b>[Body]</b>/mex:GetMetadata/mex:Dialect </dt><dd><p>
         When this repeating OPTIONAL element is present, the response MUST 
         include only MetadataSections corresponding to metadata specified by 
         the combination of the QName, Identifier and Content attributes of 
@@ -792,15 +810,15 @@
         If multiple MetadataSections have the indicated Dialect 
         and Identifier then all of them MUST be returned.
        </p></dd><dt class="label"><b>[Body]</b>/mex:GetMetadata/mex:Dialect@Content </dt><dd><p>
-        When this OPTIONAL attribute is present, the response MUST include only
-        MetadataSections of this specified content form. If the specified
-        content form is not available, or not known,
+        For the dialect indicated, the response MUST include only 
+        MetadataSections of the content form specified by this attribute.
+       </p><p>
+        When this OPTIONAL attribute is not present, it defaults to the 
+        value of the [Body]/mex:GetMetadata@Content attribute.  
+       </p><p>
+        If the specified content form is not available, or not known,
         then the response MUST include zero
         MetadataSections of the specified form for this QName/Identifier pair.
-        This specification defines the following content form IRIs:
-       </p><table border="1"><tbody><tr><th align="left"> Content Form IRI </th><th align="left"> Form </th></tr><tr><td> http://www.w3.org/2002/ws/ra/edcopies/ws-mex/Content/EPR </td><td> A MetadataReference element is returned </td></tr><tr><td> http://www.w3.org/2002/ws/ra/edcopies/ws-mex/Content/URI </td><td> A MetadataLocation element is returned </td></tr><tr><td> http://www.w3.org/2002/ws/ra/edcopies/ws-mex/Content/Metadata </td><td> The metadata is embedded </td></tr><tr><td> http://www.w3.org/2002/ws/ra/edcopies/ws-mex/Content/Any </td><td> The service is free to choose any content form </td></tr><tr><td> http://www.w3.org/2002/ws/ra/edcopies/ws-mex/Content/All </td><td> The service MUST return all available content forms </td></tr></tbody></table><p>
-        When not present the default value is 
-        "http://www.w3.org/2002/ws/ra/edcopies/ws-mex/Content/Any".
        </p></dd></dl><p>
      If an endpoint accepts a GetMetadata request, it MUST reply with 
      a GetMetadataResponse message. The normative outline for a 
@@ -1051,7 +1069,7 @@
         being referenced. Identifier is an absolute IRI. If omitted, there 
         is no implied value.
        </p></dd></dl></div><div class="div2">
-<h3><a name="iddiv2x1x1479" id="iddiv2x1x1479"/>7.3 Examples</h3><p>
+<h3><a name="iddiv2x1x1502" id="iddiv2x1x1502"/>7.3 Examples</h3><p>
      The following examples show how metadata might appear in various 
      locations:
     </p><div class="exampleOuter">
@@ -1082,7 +1100,7 @@
      The following example WSDL shows how support for a particular feature 
      might be indicated:
     </p><div class="exampleOuter">
-<div class="exampleHeader"><a name="idexamplex1x1511" id="idexamplex1x1511"/>Example 7-3: Feature Metadata in a Policy Assertion</div><div class="exampleInner"><pre>(01) &lt;wsdl:definitions&gt;
+<div class="exampleHeader"><a name="idexamplex1x1534" id="idexamplex1x1534"/>Example 7-3: Feature Metadata in a Policy Assertion</div><div class="exampleInner"><pre>(01) &lt;wsdl:definitions&gt;
 (02)   ...
 (03)   &lt;wsdl:service name="stockQuote"&gt;
 (04)     &lt;wsdl:port binding="..." name="..."&gt;
@@ -1494,7 +1512,7 @@
     WS-Eventing WSDL.  As discussed above, this WSDL might be annotated to 
     specify additional constrains on the WS-Eventing message exchanges.
    </p><div class="exampleOuter">
-<div class="exampleHeader"><a name="idexamplex1x1772" id="idexamplex1x1772"/>Example 9-2:  Sample WS-Eventing Policy with Embedded WSDL </div><div class="exampleInner"><pre>(01) &lt;wsp:Policy&gt;
+<div class="exampleHeader"><a name="idexamplex1x1795" id="idexamplex1x1795"/>Example 9-2:  Sample WS-Eventing Policy with Embedded WSDL </div><div class="exampleInner"><pre>(01) &lt;wsp:Policy&gt;
 (02)  &lt;wse:EventSource&gt;
 (03)   &lt;wse:FormatName
 (04)     URI="http://www.w3.org/2002/ws/ra/edcopies/ws-evt/DeliveryFormats/Unwrap"&gt;
@@ -1524,7 +1542,7 @@
     specific endpoint to which those protocol messages are to be sent - if 
     it is different from the address specified on line 02.
    </p><div class="exampleOuter">
-<div class="exampleHeader"><a name="idexamplex1x1782" id="idexamplex1x1782"/>Example 9-3:  Sample EndpointReference with Embedded Policy </div><div class="exampleInner"><pre>(01) &lt;wse:NotifyTo&gt;
+<div class="exampleHeader"><a name="idexamplex1x1805" id="idexamplex1x1805"/>Example 9-3:  Sample EndpointReference with Embedded Policy </div><div class="exampleInner"><pre>(01) &lt;wse:NotifyTo&gt;
 (02)   &lt;wsa:Address&gt; http://example.com &lt;/wsa:Address&gt;
 (03)   &lt;wsa:Metadata&gt;
 (04)     &lt;wsp:Policy&gt;
@@ -1625,7 +1643,7 @@
     security analysis to determine their particular threat profile and the 
     appropriate responses to those threats.
    </p><div class="div2">
-<h3><a name="iddiv2x1x2029" id="iddiv2x1x2029"/>11.1 Metadata and Security Bootstrapping</h3><p>
+<h3><a name="iddiv2x1x2052" id="iddiv2x1x2052"/>11.1 Metadata and Security Bootstrapping</h3><p>
      There are cases in which the metadata used to describe a service might 
      be considered sensitive information. In these cases it is advisable 
      for services to authenticate and authorize consumers as part of the 
@@ -1663,7 +1681,7 @@
     indicate a particular security mechanism used to protect the
     WS-MetadataExchange operations supported by this endpoint.
    </p><div class="div2">
-<h3><a name="iddiv2x1x2050" id="iddiv2x1x2050"/>12.1 MetadataExchange Assertion</h3><p>
+<h3><a name="iddiv2x1x2073" id="iddiv2x1x2073"/>12.1 MetadataExchange Assertion</h3><p>
      Services indicate support for the WS-MetadataExchange specification 
      through the use of the Web Services
      Policy - Framework <a href="#wspolicy">[WS-Policy]</a> and Web Services Policy -
@@ -1716,7 +1734,8 @@
          specified MetadataExchange Dialect QName by the GetMetadata operation.
         </p></dd><dt class="label"> /mex:MetadataExchange/mex:GetMetadataSupported/mex:MetadataExchangeDialect/mex:MetadataContent </dt><dd><p>
          When present, this OPTIONAL parameter indicates support for the 
-         specified MetadataExchange content IRI by the GetMetadata operation.
+         specified MetadataExchange content IRI by the GetMetadata 
+         operation for the dialect indicated.
         </p></dd><dt class="label"> /mex:MetadataExchange/mex:GetMetadataSupported/mex:MetadataExchangeDialect/mex:MetadataContent/xs:any </dt><dd><p>
          This extensibility point allows for additional MetadataContent 
          specific metadata to be included within the policy assertion. Any 
@@ -1740,7 +1759,8 @@
          specified MetadataExchange Dialect QName by the PutMetadata operation. 
         </p></dd><dt class="label"> /mex:MetadataExchange/mex:PutMetadataSupported/mex:MetadataExchangeDialect/mex:MetadataContent </dt><dd><p>
          When present, this OPTIONAL parameter indicates support for the 
-         specified MetadataExchange content IRI by the PutMetadata operation. 
+         specified MetadataExchange content IRI by the PutMetadata 
+         operation for the dialect indicated. 
         </p></dd><dt class="label"> /mex:MetadataExchange/mex:PutMetadataSupported/mex:MetadataExchangeDialect/mex:MetadataContent/xs:any </dt><dd><p>
          This extensibility point allows for additional MetadataContent 
          specific metadata to be included within the policy assertion. Any 
@@ -1765,7 +1785,8 @@
          DeleteMetadata operation. 
         </p></dd><dt class="label"> /mex:MetadataExchange/mex:DeleteMetadataSupported/mex:MetadataExchangeDialect/mex:MetadataContent </dt><dd><p>
          When present, this OPTIONAL parameter indicates support for the 
-         specified MetadataExchange content IRI by the DeleteMetadata operation.
+         specified MetadataExchange content IRI by the DeleteMetadata 
+         operation for the dialect indicated.
         </p></dd><dt class="label"> /mex:MetadataExchange/mex:DeleteMetadataSupported/mex:MetadataExchangeDialect/mex:MetadataContent/xs:any </dt><dd><p>
          This extensibility point allows for additional MetadataContent 
          specific metadata to be included within the policy assertion. Any 
@@ -1883,7 +1904,7 @@
      Yves Lafon (W3C/ERCIM).
    </p></div><div class="div1">
 <h2><a name="References" id="References"/>15 References</h2><div class="div2">
-<h3><a name="iddiv2x1x2306" id="iddiv2x1x2306"/>15.1 Normative References</h3><dl><dt class="label"><a name="BP12" id="BP12"/>BP12</dt><dd><a href="http://ws-i.org/profiles/BasicProfile-1.2-2010-11-09.html"><cite>
+<h3><a name="iddiv2x1x2329" id="iddiv2x1x2329"/>15.1 Normative References</h3><dl><dt class="label"><a name="BP12" id="BP12"/>BP12</dt><dd><a href="http://ws-i.org/profiles/BasicProfile-1.2-2010-11-09.html"><cite>
          WS-I Profile, Basic Profile Version 1.2
         </cite></a>
         , R. Chumbley, et al, Editors.
@@ -2013,6 +2034,7 @@
         &lt;xs:any namespace='##other' processContents='lax' minOccurs='0'
                 maxOccurs='unbounded'/&gt;
       &lt;/xs:sequence&gt;
+      &lt;xs:attribute name='Content' type='xs:anyURI'/&gt;
       &lt;xs:anyAttribute namespace='##other' processContents='lax'/&gt;
     &lt;/xs:complexType&gt;
   &lt;/xs:element&gt;
@@ -2431,4 +2453,5 @@
        <a href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=10339">10339</a></td></tr><tr><td> 2010/09/28 </td><td> DD </td><td> Added resolution of issue 
        <a href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=10768">10768</a></td></tr><tr><td> 2010/09/28 </td><td> DD </td><td> Added resolution of issue 
        <a href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=10785">10785</a></td></tr><tr><td> 2010/11/19 </td><td> DD </td><td> Added resolution of issue 
-       <a href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=8284">8284</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=8284">8284</a></td></tr><tr><td> 2010/12/14 </td><td> DD </td><td> Added resolution of issue 
+       <a href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=11189">11189</a></td></tr></tbody></table></div></div></body></html>
\ No newline at end of file

Received on Wednesday, 15 December 2010 00:26:50 UTC