WWW/2002/ws/ra/edcopies wsmex.html,1.24,1.25 wsmex.xml,1.15,1.16

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

Modified Files:
	wsmex.html wsmex.xml 
Log Message:
issues 6604 and 6405


Index: wsmex.xml
===================================================================
RCS file: /w3ccvs/WWW/2002/ws/ra/edcopies/wsmex.xml,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- wsmex.xml	16 Mar 2009 17:01:30 -0000	1.15
+++ wsmex.xml	18 Mar 2009 02:46:44 -0000	1.16
@@ -386,18 +386,16 @@
 (16)    </s11:Header>
 (17)    <s11:Body>
 (18)      <mex:GetMetadata>
-(19)        <mex:Dialect>http://schemas.xmlsoap.org/ws/2004/09/policy</mex:Dialect>
-(20)        <mex:Identifier>
-(21)          http://services.example.org/stockquote/policy
-(22)        </mex:Identifier>
-(23)      </mex:GetMetadata>
-(24)    </s11:Body>
-(25)  &lt;/s11:Envelope&gt;</eg>
+(19)        &lt;mex:Dialect URI="http://schemas.xmlsoap.org/ws/2004/09/policy"
+(20)          Identifier="http://services.example.org/stockquote/policy"/>
+(21)      &lt;/mex:GetMetadata>
+(22)    &lt;/s11:Body>
+(23)  &lt;/s11:Envelope&gt;</eg>
     </example>
 
     <p>
      Lines 7-9 in <specref ref="GetMexReq"/> indicate this is a Get Metadata 
-     request. As lines 18-22 indicate, this request is for the policy of 
+     request. As lines 18-21 indicate, this request is for the policy of 
      the Web service endpoint (line 6).
     </p>
 
@@ -820,10 +818,10 @@
                       (Identifier="xs:anyURI")? ...>
   (
     &lt;mex:MetadataReference ...>
-      endpoint-reference
+      <emph>endpoint-reference-type</emph>
     &lt;/mex:MetadataReference>
     |
-    &lt;mex:Location>xs:anyURI&lt;/mex:Location>
+    &lt;mex:Location> <emph>xs:anyURI</emph> &lt;/mex:Location>
     |
     DialectSpecificElement
   )
@@ -1095,9 +1093,9 @@
 
 <kw>[Body]</kw>
   &lt;mex:GetMetadata ... >
-    (&lt;mex:Dialect>xs:anyURI&lt;/mex:Dialect>
-      (&lt;mex:Identifier>xs:anyURI&lt;/mex:Identifier>)?
-    )?
+    &lt;mex:Dialect URI="<emph>xs:anyURI</emph>" 
+                 Identifier="<emph>xs:anyURI</emph>" ?
+                 Content="<emph>xs:anyURI</emph>" ? .../> *
   &lt;/mex:GetMetadata&gt; </eg>
     </example>
 
@@ -1111,8 +1109,9 @@
       <label> <kw>[Body]</kw>/mex:GetMetadata/mex:Dialect </label>
       <def>
        <p>
-        When this element is present, the response MUST include only 
-        Metadata Sections with the indicated dialect; if the receiver does 
+        When this repeating OPTIONAL element is present,the response
+        MUST include only Metadata Sections corresponding to the
+        dialect specified by the URI attribute; if the receiver does 
         not have any Metadata Sections of the indicated dialect, the 
         response MUST include zero Metadata Sections. When this element 
         is not present, there is no implied value and so the response 
@@ -1122,20 +1121,80 @@
      </gitem>
 
      <gitem>
-      <label> <kw>[Body]</kw>/mex:GetMetadata/mex:Identifier </label>
+      <label> <kw>[Body]</kw>/mex:GetMetadata/mex:Dialect@URI </label>
       <def>
-       <p> 
-        When this element is present, the response MUST include only 
+       <p>
+        This REQUIRED attribute specifies the Metadata dialect.  The
+        response MUST only include Metadata Sections corresponding to
+        the dialect specified by this URI. If the receiver does not
+        have any Metadata Sections of this indicated dialect, the
+        response MUST include zero Metadata Sections for this URI.
+       </p>
+      </def>
+     </gitem>
+
+     <gitem>
+      <label> <kw>[Body]</kw>/mex:GetMetadata/mex:Dialect@Identifier </label>
+      <def>
+       <p>
+        When this OPTIONAL attribute is present, the response MUST include only
         Metadata Sections with the indicated identifier; if the receiver 
         does not have any Metadata Sections of the indicated identifier, 
-        the response MUST include zero Metadata Sections. When this 
-        element is not present, the implied value is any identifier. 
-        This element MUST NOT be present unless ./mex:Dialect is 
-        present. If multiple Metadata Sections have the indicated Dialect 
+        the response MUST include zero Metadata Sections for this
+        URI/Identifier pair.
+        When this attribute is not present, the implied value is any 
+        identifier. 
+        If multiple Metadata Sections have the indicated Dialect 
         and Identifier then all of them MUST be returned.
        </p>
       </def>
      </gitem>
+
+     <gitem>
+      <label> <kw>[Body]</kw>/mex:GetMetadata/mex:Dialect@Content </label>
+      <def>
+       <p>
+        When this OPTIONAL attribute is present, the response MUST include only
+        Metadata Sections of this specified content form. If the specified
+        content form is not available then the response MUST include zero
+        Metadata Sections of the specified form for this URI/Identifier pair.
+        This specification defines the following content form URIs:
+       </p>
+       <table border ='1'>
+        <tbody>
+         <tr>
+          <th align="left"> Content Form URI </th>
+          <th align="left"> Form </th>
+         </tr>
+         <tr>
+          <td> http://www.w3.org/2009/02/ws-mex/Content/EPR </td> 
+          <td> A MetadataReference element is returned </td> 
+         </tr>
+         <tr>
+          <td> http://www.w3.org/2009/02/ws-mex/Content/URI </td> 
+          <td> A Location element is returned </td> 
+         </tr>
+         <tr>
+          <td> http://www.w3.org/2009/02/ws-mex/Content/Metadata </td> 
+          <td> The metadata is inlined </td> 
+         </tr>
+         <tr>
+          <td> http://www.w3.org/2009/02/ws-mex/Content/Any </td> 
+          <td> The service is free to chose any content form </td> 
+         </tr>
+         <tr>
+          <td> http://www.w3.org/2009/02/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/2009/02/ws-mex/Content/Any".
+       </p>
+      </def>
+     </gitem>
+
     </glist>
 
     <p>
@@ -1692,59 +1751,62 @@
     xmlns:wsa='http://www.w3.org/2005/08/addressing'
     xmlns:xs='http://www.w3.org/2001/XMLSchema'
     elementFormDefault='qualified'
-    blockDefault='#all' >
+    blockDefault='#all'>
+
+  &lt;xs:import
+      namespace="http://www.w3.org/2005/08/addressing"
+      schemaLocation="http://www.w3.org/2006/03/addressing/ws-addr.xsd"/>
 
   &lt;!-- Get Metadata request -->
-  &lt;xs:element name='GetMetadata' >
+  &lt;xs:element name='GetMetadata'>
     &lt;xs:complexType>
       &lt;xs:sequence>
-        &lt;xs:element ref='tns:Dialect' minOccurs='0' />
-        &lt;xs:element ref='tns:Identifier' minOccurs='0' />
+        &lt;xs:element ref='tns:Dialect' minOccurs='0' maxOccurs='unbounded'/>
       &lt;/xs:sequence>
-      &lt;xs:anyAttribute namespace='##other' processContents='lax' />
+      &lt;xs:anyAttribute namespace='##other' processContents='lax'/>
     &lt;/xs:complexType>
   &lt;/xs:element>
 
-  &lt;xs:element name='Dialect' type='xs:anyURI' />
-  &lt;xs:element name='Identifier' type='xs:anyURI' />
+  &lt;xs:element name='Dialect'>
+    &lt;xs:complexType>
+      &lt;xs:attribute name='URI' type='xs:anyURI' use='required'/>
+      &lt;xs:attribute name='Identifier' type='xs:anyURI'/>
+      &lt;xs:attribute name='Content' type='xs:anyURI'/>
+      &lt;xs:anyAttribute namespace='##other' processContents='lax'/>
+    &lt;/xs:complexType>
+  &lt;/xs:element>
 
   &lt;!-- Get Metadata response -->
-  &lt;xs:element name='Metadata' >
+  &lt;xs:element name='Metadata'>
     &lt;xs:complexType>
       &lt;xs:sequence>
         &lt;xs:element ref='tns:MetadataSection'
                     minOccurs='0'
-                    maxOccurs='unbounded' />
+                    maxOccurs='unbounded'/>
         &lt;xs:any namespace='##other' processContents='lax'
                 minOccurs='0'
-                maxOccurs='unbounded' />
+                maxOccurs='unbounded'/>
       &lt;/xs:sequence>
-      &lt;xs:anyAttribute namespace='##other' processContents='lax' />
+      &lt;xs:anyAttribute namespace='##other' processContents='lax'/>
     &lt;/xs:complexType>
   &lt;/xs:element>
 
-  &lt;xs:element name='MetadataSection' >
+  &lt;xs:element name='MetadataSection'>
     &lt;xs:complexType>
       &lt;xs:choice>
-        &lt;xs:any namespace='##other' processContents='lax' />
-        &lt;xs:element ref='tns:MetadataReference' />
-        &lt;xs:element ref='tns:Location' />
+        &lt;xs:any namespace='##other' processContents='lax'/>
+        &lt;xs:element ref='tns:MetadataReference'/>
+        &lt;xs:element ref='tns:Location'/>
       &lt;/xs:choice>
-      &lt;xs:attribute name='Dialect' type='xs:anyURI' use='required' />
-      &lt;xs:attribute name='Identifier' type='xs:anyURI' />
-      &lt;xs:anyAttribute namespace='##other' processContents='lax' />
+      &lt;xs:attribute name='Dialect' type='xs:anyURI' use='required'/>
+      &lt;xs:attribute name='Identifier' type='xs:anyURI'/>
+      &lt;xs:anyAttribute namespace='##other' processContents='lax'/>
     &lt;/xs:complexType>
   &lt;/xs:element>
 
-  &lt;xs:element name='MetadataReference'>
-    &lt;xs:complexType>
-      &lt;xs:sequence>
-        &lt;wsa:EndpointReferenceType minOccurs='1' maxOccurs='unbounded'/>
-      &lt;/xs:sequence>
-    &lt;/xs:complexType>
-  &lt;/xs:element>
-  &lt;xs:element name='Location' type='xs:anyURI' />
-&lt;/xs:schema&gt;</eg>
+  &lt;xs:element name='MetadataReference' type='wsa:EndpointReferenceType'/>
+  &lt;xs:element name='Location' type='xs:anyURI'/>
+&lt;/xs:schema></eg>
    </example>
   </div1>
 
@@ -1772,23 +1834,23 @@
     xmlns:wsa='http://www.w3.org/2005/08/addressing'
     xmlns:wsam='http://www.w3.org/2007/05/addressing/metadata'
     xmlns:wsdl='http://schemas.xmlsoap.org/wsdl/'
-    xmlns:xs='http://www.w3.org/2001/XMLSchema' >
+    xmlns:xs='http://www.w3.org/2001/XMLSchema'>
 
   &lt;wsdl:types>
     &lt;xs:schema
-        targetNamespace='http://www.w3.org/2009/02/ws-mex' >
-      &lt;xs:include schemaLocation='metadataexchange.xsd' />
+        targetNamespace='http://www.w3.org/2009/02/ws-mex'>
+      &lt;xs:include schemaLocation='metadataexchange.xsd'/>
     &lt;/xs:schema>
   &lt;/wsdl:types>
 
-  &lt;wsdl:message name='GetMetadataMsg' >
-    &lt;wsdl:part name='body' element='tns:GetMetadata' />
+  &lt;wsdl:message name='GetMetadataMsg'>
+    &lt;wsdl:part name='body' element='tns:GetMetadata'/>
   &lt;/wsdl:message>
-  &lt;wsdl:message name='GetMetadataResponseMsg' >
-    &lt;wsdl:part name='body' element='tns:Metadata' />
+  &lt;wsdl:message name='GetMetadataResponseMsg'>
+    &lt;wsdl:part name='body' element='tns:Metadata'/>
   &lt;/wsdl:message>
-  &lt;wsdl:portType name='MetadataExchange' >
-    &lt;wsdl:operation name='GetMetadata' >
+  &lt;wsdl:portType name='MetadataExchange'>
+    &lt;wsdl:operation name='GetMetadata'>
       &lt;wsdl:input
        message='tns:GetMetadataMsg'
        wsam:Action=
@@ -1854,6 +1916,20 @@
        <loc href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=6587">6587</loc>
       </td>
      </tr>
+     <tr>
+      <td> 2009/03/17 </td>
+      <td> KW </td>
+      <td> Added resolution of issue 
+       <loc href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=6405">6405</loc>
+      </td>
+     </tr>
+     <tr>
+      <td> 2009/03/17 </td>
+      <td> KW </td>
+      <td> Added resolution of issue 
+       <loc href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=6604">6604</loc>
+      </td>
+     </tr>
     </tbody>
    </table>
   </div1>

Index: wsmex.html
===================================================================
RCS file: /w3ccvs/WWW/2002/ws/ra/edcopies/wsmex.html,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- wsmex.html	16 Mar 2009 17:01:30 -0000	1.24
+++ wsmex.html	18 Mar 2009 02:46:44 -0000	1.25
@@ -1,7 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en"><head><title>Web Services Metadata Exchange (WS-MetadataExchange)</title><style type="text/css">
+<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml" lang="en"><head><title>Web Services Metadata Exchange (WS-MetadataExchange)</title><style type="text/css">
 code           { font-family: monospace; }
 
 div.constraint,
@@ -33,10 +30,8 @@
                     margin: 4px}
 </style><link rel="stylesheet" type="text/css" href="http://www.w3.org/StyleSheets/TR/base.css"/></head><body><div class="head">
 <h1><a name="title" id="title"/>Web Services Metadata Exchange (WS-MetadataExchange)</h1>
-<h2><a name="w3c-doctype" id="w3c-doctype"/>Editor's Draft $Date$</h2><dl><dt>Latest version:</dt><dd>
-    <a href="http://www.w3.org/TR/ws-metadata-exchange">http://www.w3.org/TR/ws-metadata-exchange
-   </a>
-  </dd><dt>Editors:</dt><dd>Doug Davis, IBM</dd><dd>Ashok Malhotra, Oracle</dd><dd>Katy Warr, IBM</dd><dd>Wu Chou, Avaya</dd></dl><p class="copyright"><a href="http://www.w3.org/Consortium/Legal/ipr-notice#Copyright">Copyright</a> &copy; 2009 <a href="http://www.w3.org/"><acronym title="World Wide Web Consortium">W3C</acronym></a><sup>&reg;</sup> (<a href="http://www.csail.mit.edu/"><acronym title="Massachusetts Institute of Technology">MIT</acronym></a>, <a href="http://www.ercim.org/"><acronym title="European Research Consortium for Informatics and Mathematics">ERCIM</acronym></a>, <a href="http://www.keio.ac.jp/">Keio</a>), All Rights Reserved. W3C <a href="http://www.w3.org/Consortium/Legal/ipr-notice#Legal_Disclaimer">liability</a>, <a href="http://www.w3.org/Consortium/Legal/ipr-notice#W3C_Trademarks">trademark</a> and <a href="http://www.w3.org/Consortium/Legal/copyright-documents">document use</a> rules apply.</p></div><hr/><div>
+<h2><a name="w3c-doctype" id="w3c-doctype"/>Editor's Draft $Date$</h2><dl><dt>Latest version:</dt><dd><a href="http://www.w3.org/TR/ws-metadata-exchange">http://www.w3.org/TR/ws-metadata-exchange
+   </a></dd><dt>Editors:</dt><dd>Doug Davis, IBM</dd><dd>Ashok Malhotra, Oracle</dd><dd>Katy Warr, IBM</dd><dd>Wu Chou, Avaya</dd></dl><p class="copyright"><a href="http://www.w3.org/Consortium/Legal/ipr-notice#Copyright">Copyright</a> &copy; 2009 <a href="http://www.w3.org/"><acronym title="World Wide Web Consortium">W3C</acronym></a><sup>&reg;</sup> (<a href="http://www.csail.mit.edu/"><acronym title="Massachusetts Institute of Technology">MIT</acronym></a>, <a href="http://www.ercim.org/"><acronym title="European Research Consortium for Informatics and Mathematics">ERCIM</acronym></a>, <a href="http://www.keio.ac.jp/">Keio</a>), All Rights Reserved. W3C <a href="http://www.w3.org/Consortium/Legal/ipr-notice#Legal_Disclaimer">liability</a>, <a href="http://www.w3.org/Consortium/Legal/ipr-notice#W3C_Trademarks">trademark</a> and <a href="http://www.w3.org/Consortium/Legal/copyright-documents">document use</a> rules apply.</p></div><hr/><div>
 <h2><a name="abstract" id="abstract"/>Abstract</h2><p>
     This specification defines how metadata
     associated with a Web service endpoint can be represented as
@@ -131,8 +126,7 @@
        Enable description in <a href="#WSDL11">[WSDL 1.1]</a> of the optional 
        request-response interaction.
       </p></li></ul></div><div class="div2">
-<h3><a name="Example" id="Example"/>2.2 Example</h3><p>
-     <a href="#GetRequest">Example 2-1</a> illustrates a sample 
+<h3><a name="Example" id="Example"/>2.2 Example</h3><p><a href="#GetRequest">Example 2-1</a> illustrates a sample 
      <a href="#WS-Transfer">[WS-Transfer]</a> Get request for a resource'
      s representation.
     </p><div class="exampleOuter">
@@ -160,8 +154,7 @@
      endpoint. The fact that the resource's representation is a 
      mex:Metadata element may be known to the requestor but is not 
      explicitly encoded in the request message.
-    </p><p>
-     <a href="#GetResponse">Example 2-2</a> illustrates a sample response to the 
+    </p><p><a href="#GetResponse">Example 2-2</a> illustrates a sample response to the 
      request of <a href="#GetRequest">Example 2-1</a>.
     </p><div class="exampleOuter">
 <div class="exampleHeader"><a name="GetResponse" id="GetResponse"/>Example 2-2: Sample response message with metadata</div><div class="exampleInner"><pre>(01)  &lt;s11:Envelope
@@ -288,18 +281,15 @@
 (16)    &lt;/s11:Header&gt;
 (17)    &lt;s11:Body&gt;
 (18)      &lt;mex:GetMetadata&gt;
-(19)        &lt;mex:Dialect&gt;http://schemas.xmlsoap.org/ws/2004/09/policy&lt;/mex:Dialect&gt;
-(20)        &lt;mex:Identifier&gt;
-(21)          http://services.example.org/stockquote/policy
-(22)        &lt;/mex:Identifier&gt;
-(23)      &lt;/mex:GetMetadata&gt;
-(24)    &lt;/s11:Body&gt;
-(25)  &lt;/s11:Envelope&gt;</pre></div></div><p>
+(19)        &lt;mex:Dialect URI="http://schemas.xmlsoap.org/ws/2004/09/policy"
+(20)          Identifier="http://services.example.org/stockquote/policy"/&gt;
+(21)      &lt;/mex:GetMetadata&gt;
+(22)    &lt;/s11:Body&gt;
+(23)  &lt;/s11:Envelope&gt;</pre></div></div><p>
      Lines 7-9 in <a href="#GetMexReq">Example 2-3</a> indicate this is a Get Metadata 
-     request. As lines 18-22 indicate, this request is for the policy of 
+     request. As lines 18-21 indicate, this request is for the policy of 
      the Web service endpoint (line 6).
-    </p><p>
-     <a href="#GetMexRes">Example 2-4</a> lists a sample response to the request in 
+    </p><p><a href="#GetMexRes">Example 2-4</a> lists a sample response to the request in 
      <a href="#GetMexReq">Example 2-3</a>.
     </p><div class="exampleOuter">
 <div class="exampleHeader"><a name="GetMexRes" id="GetMexRes"/>Example 2-4: Sample Get Metadata response message</div><div class="exampleInner"><pre>(01)   &lt;s11:Envelope
@@ -344,11 +334,10 @@
 <h3><a name="Namespaces" id="Namespaces"/>3.1 XML Namespaces</h3><p>
      The XML namespace URI that MUST be used by implementations of this 
      specification is:
-    </p><div class="exampleOuter"><div class="exampleInner"><pre><a href="http://www.w3.org/2009/02/ws-mex">http://www.w3.org/2009/02/ws-mex</a></pre></div></div><p> 
-     <a href="#XMLNS">Table 3-1</a> lists XML namespaces that are used in this 
+    </p><div class="exampleOuter"><div class="exampleInner"><pre><a href="http://www.w3.org/2009/02/ws-mex">http://www.w3.org/2009/02/ws-mex</a></pre></div></div><p><a href="#XMLNS">Table 3-1</a> lists XML namespaces that are used in this 
      specification. The choice of any namespace prefix is arbitrary and 
      not semantically significant.
-    </p><a name="XMLNS" id="XMLNS"/><table border="1"><caption>Table 3-1:  Prefixes and XML namespaces used in this specification </caption><tbody><tr><th align="left"> Prefix </th><th align="left"> XML Namespaces </th><th align="left"> Specification(s) </th></tr><tr><td> s </td><td> (Either SOAP 1.1 or 1.2) </td><td> (Either SOAP 1.1 or 1.2) </td></tr><tr><td> s11 </td><td> http://schemas.xmlsoap.org/soap/envelope/ </td><td> <a href="#SOAP11">[SOAP 1.1]</a> </td></tr><tr><td> s12 </td><td> http://www.w3.org/2003/05/soap-envelope </td><td> <a href="#SOAP12">[SOAP 1.2]</a> </td></tr><tr><td> wsa </td><td> http://www.w3.org/2005/08/addressing </td><td> <a href="#AddrCore">[WS-Addressing 1.0 Core]</a> </td></tr><tr><td> wsdl </td><td> http://schemas.xmlsoap.org/wsdl/ </td><td> <a href="#WSDL11">[WSDL 1.1]</a> </td></tr><tr><td> wsp </td><td> http://schemas.xmlsoap.org/ws/2004/09/policy </td><td> <a href="#WS-Policy">[WS-Policy]</a> </td></tr><tr><td> mex </td><td> http://www.w3.org/2009/02/ws-mex </td><td> Ths specification </td></tr><tr><td> xs </td><td> http://www.w3.org/2001/XMLSchema </td><td> <a href="#Schema1">[XML Schema: Structures]</a> </td></tr><tr><td> wst </td><td> http://www.w3.org/2009/02/ws-tra </td><td> <a href="#WS-Transfer">[WS-Transfer]</a> </td></tr></tbody></table><p>
+    </p><a name="XMLNS" id="XMLNS"/><table border="1"><caption>Table 3-1:  Prefixes and XML namespaces used in this specification </caption><tbody><tr><th align="left"> Prefix </th><th align="left"> XML Namespaces </th><th align="left"> Specification(s) </th></tr><tr><td> s </td><td> (Either SOAP 1.1 or 1.2) </td><td> (Either SOAP 1.1 or 1.2) </td></tr><tr><td> s11 </td><td> http://schemas.xmlsoap.org/soap/envelope/ </td><td><a href="#SOAP11">[SOAP 1.1]</a></td></tr><tr><td> s12 </td><td> http://www.w3.org/2003/05/soap-envelope </td><td><a href="#SOAP12">[SOAP 1.2]</a></td></tr><tr><td> wsa </td><td> http://www.w3.org/2005/08/addressing </td><td><a href="#AddrCore">[WS-Addressing 1.0 Core]</a></td></tr><tr><td> wsdl </td><td> http://schemas.xmlsoap.org/wsdl/ </td><td><a href="#WSDL11">[WSDL 1.1]</a></td></tr><tr><td> wsp </td><td> http://schemas.xmlsoap.org/ws/2004/09/policy </td><td><a href="#WS-Policy">[WS-Policy]</a></td></tr><tr><td> mex </td><td> http://www.w3.org/2009/02/ws-mex </td><td> This specifiation </td></tr><tr><td> xs </td><td> http://www.w3.org/2001/XMLSchema </td><td><a href="#Schema1">[XML Schema: Structures]</a></td></tr><tr><td> wst </td><td> http://www.w3.org/2009/02/ws-tra </td><td><a href="#WS-Transfer">[WS-Transfer]</a></td></tr></tbody></table><p>
      The working group intends to update the value of the Web Services
      Metadata Exchange namespace URI each time a new version of this document is
      published until such time that the document reaches Candidate
@@ -405,7 +394,7 @@
     
     this specification uses the following properties to define messages:
     
-    </p><dl><dt class="label"> <b>[Headers]</b> </dt><dd><p>Unordered message headers. </p></dd><dt class="label"> <b>[Action]</b> </dt><dd><p> The value to be used for the wsa:Action URI. </p></dd><dt class="label"> <b>[Body]</b> </dt><dd><p> A message body. </p></dd></dl><p>
+    </p><dl><dt class="label"><b>[Headers]</b></dt><dd><p>Unordered message headers. </p></dd><dt class="label"><b>[Action]</b></dt><dd><p> The value to be used for the wsa:Action URI. </p></dd><dt class="label"><b>[Body]</b></dt><dd><p> A message body. </p></dd></dl><p>
      
      These properties bind to a SOAP Envelope as follows:
      
@@ -500,10 +489,10 @@
                       (Identifier="xs:anyURI")? ...&gt;
   (
     &lt;mex:MetadataReference ...&gt;
-      endpoint-reference
+      <em>endpoint-reference-type</em>
     &lt;/mex:MetadataReference&gt;
     |
-    &lt;mex:Location&gt;xs:anyURI&lt;/mex:Location&gt;
+    &lt;mex:Location&gt; <em>xs:anyURI</em> &lt;/mex:Location&gt;
     |
     DialectSpecificElement
   )
@@ -534,7 +523,7 @@
     This specification defines the following values for Dialect; 
     other specifications should define values for Dialect for their 
     metadata format(s).
-   </p><table border="1"><tbody><tr><th align="left"> Dialect URI </th><th align="left"> Metadata Format </th></tr><tr><td> http://www.w3.org/2001/XMLSchema </td><td> xs:schema <a href="#Schema1">[XML Schema: Structures]</a> </td></tr><tr><td> http://schemas.xmlsoap.org/wsdl/ </td><td> wsdl:definitions <a href="#WSDL11">[WSDL 1.1]</a> </td></tr><tr><td> http://schemas.xmlsoap.org/ws/2004/09/policy</td><td> wsp:Policy <a href="#WS-Policy">[WS-Policy]</a> </td></tr><tr><td> http://schemas.xmlsoap.org/ws/2004/09/policy/attachment </td><td> wsp:PolicyAttachment <a href="#WS-PolicyAttachment">[WS-PolicyAttachment]</a> </td></tr><tr><td> http://www.w3.org/2009/02/ws-mex </td><td> mex:Metadata [This specification] </td></tr></tbody></table><p>
+   </p><table border="1"><tbody><tr><th align="left"> Dialect URI </th><th align="left"> Metadata Format </th></tr><tr><td> http://www.w3.org/2001/XMLSchema </td><td> xs:schema <a href="#Schema1">[XML Schema: Structures]</a></td></tr><tr><td> http://schemas.xmlsoap.org/wsdl/ </td><td> wsdl:definitions <a href="#WSDL11">[WSDL 1.1]</a></td></tr><tr><td> http://schemas.xmlsoap.org/ws/2004/09/policy</td><td> wsp:Policy <a href="#WS-Policy">[WS-Policy]</a></td></tr><tr><td> http://schemas.xmlsoap.org/ws/2004/09/policy/attachment </td><td> wsp:PolicyAttachment <a href="#WS-PolicyAttachment">[WS-PolicyAttachment]</a></td></tr><tr><td> http://www.w3.org/2009/02/ws-mex </td><td> mex:Metadata [This specification] </td></tr></tbody></table><p>
     If there is more than one metadata unit with the same Dialect, e.g., 
     more than one XML Schema document, including them all, one per 
     Metadata Section, is explicitly encouraged.
@@ -629,28 +618,45 @@
 
 <b>[Body]</b>
   &lt;mex:GetMetadata ... &gt;
-    (&lt;mex:Dialect&gt;xs:anyURI&lt;/mex:Dialect&gt;
-      (&lt;mex:Identifier&gt;xs:anyURI&lt;/mex:Identifier&gt;)?
-    )?
+    &lt;mex:Dialect URI="<em>xs:anyURI</em>" 
+                 Identifier="<em>xs:anyURI</em>" ?
+                 Content="<em>xs:anyURI</em>" ? .../&gt; *
   &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>
-        When this element is present, the response MUST include only 
-        Metadata Sections with the indicated dialect; if the receiver does 
+    </p><dl><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 Metadata Sections corresponding to the
+        dialect specified by the URI attribute; if the receiver does 
         not have any Metadata Sections of the indicated dialect, the 
         response MUST include zero Metadata Sections. When this element 
         is not present, there is no implied value and so the response 
         may include Metadata Sections with any dialect.
-       </p></dd><dt class="label"> <b>[Body]</b>/mex:GetMetadata/mex:Identifier </dt><dd><p> 
-        When this element is present, the response MUST include only 
+       </p></dd><dt class="label"><b>[Body]</b>/mex:GetMetadata/mex:Dialect@URI </dt><dd><p>
+        This REQUIRED attribute specifies the Metadata dialect.  The
+        response MUST only include Metadata Sections corresponding to
+        the dialect specified by this URI. If the receiver does not
+        have any Metadata Sections of this indicated dialect, the
+        response MUST include zero Metadata Sections for this URI.
+       </p></dd><dt class="label"><b>[Body]</b>/mex:GetMetadata/mex:Dialect@Identifier </dt><dd><p>
+        When this OPTIONAL attribute is present, the response MUST include only
         Metadata Sections with the indicated identifier; if the receiver 
         does not have any Metadata Sections of the indicated identifier, 
-        the response MUST include zero Metadata Sections. When this 
-        element is not present, the implied value is any identifier. 
-        This element MUST NOT be present unless ./mex:Dialect is 
-        present. If multiple Metadata Sections have the indicated Dialect 
+        the response MUST include zero Metadata Sections for this
+        URI/Identifier pair.
+        When this attribute is not present, the implied value is any 
+        identifier. 
+        If multiple Metadata Sections 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
+        Metadata Sections of this specified content form. If the specified
+        content form is not available then the response MUST include zero
+        Metadata Sections of the specified form for this URI/Identifier pair.
+        This specification defines the following content form URIs:
+       </p><table border="1"><tbody><tr><th align="left"> Content Form URI </th><th align="left"> Form </th></tr><tr><td> http://www.w3.org/2009/02/ws-mex/Content/EPR </td><td> A MetadataReference element is returned </td></tr><tr><td> http://www.w3.org/2009/02/ws-mex/Content/URI </td><td> A Location element is returned </td></tr><tr><td> http://www.w3.org/2009/02/ws-mex/Content/Metadata </td><td> The metadata is inlined </td></tr><tr><td> http://www.w3.org/2009/02/ws-mex/Content/Any </td><td> The service is free to chose any content form </td></tr><tr><td> http://www.w3.org/2009/02/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/2009/02/ws-mex/Content/Any".
        </p></dd></dl><p>
      Other message information headers defined by WS-Addressing 
      <a href="#AddrCore">[WS-Addressing 1.0 Core]</a> MAY be included 
@@ -673,12 +679,11 @@
  &lt;/mex:Metadata&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:Metadata </dt><dd><p>
+    </p><dl><dt class="label"><b>[Body]</b>/mex:Metadata </dt><dd><p>
         The body of the response message MUST contain one mex:Metadata 
         element as defined in Section 4 of this specification.
        </p></dd></dl></div></div><div class="div1">
-<h2><a name="Metadata-in-Endpoint-References" id="Metadata-in-Endpoint-References"/>7 Metadata in Endpoint References</h2><p>
-    <a href="#Retrieving-Metadata"><b>6 Retrieving Metadata</b></a> describes two mechanisms that 
+<h2><a name="Metadata-in-Endpoint-References" id="Metadata-in-Endpoint-References"/>7 Metadata in Endpoint References</h2><p><a href="#Retrieving-Metadata"><b>6 Retrieving Metadata</b></a> describes two mechanisms that 
     allow requesters to retrieve ("pull metadata") Web services metadata 
     from an endpoint (GetMetadata) or a metadata resource 
     (WS-Transfer Get).
@@ -820,8 +825,7 @@
 (22)        &lt;/mex:MetadataSection&gt;
 (23)      &lt;/mex:Metadata&gt;
 (24)    &lt;/wsa:Metadata&gt;
-(25)  &lt;/wsa:EndpointReference&gt;</pre></div></div><p>
-    <a href="#EPRMD">Example 7-2</a> shows an example of a Web service endpoint 
+(25)  &lt;/wsa:EndpointReference&gt;</pre></div></div><p><a href="#EPRMD">Example 7-2</a> shows an example of a Web service endpoint 
     reference in which the Metadata element contains a single 
     Metadata Reference element to a metadata resource (lines 8-21) the 
     representation of which is mex:Metadata as hinted by the value of 
@@ -892,36 +896,29 @@
     The following list summarizes common classes of attacks that apply to 
     this protocol and identifies the mechanism to prevent/mitigate 
     the attacks:
-   </p><ul><li><p>
-      <b>Message alteration</b> - Alteration is prevented by including 
+   </p><ul><li><p><b>Message alteration</b> - Alteration is prevented by including 
       signatures of the message information using WS-Security.
-     </p></li><li><p>
-      <b>Message disclosure</b> - Confidentiality is preserved by 
+     </p></li><li><p><b>Message disclosure</b> - Confidentiality is preserved by 
       encrypting sensitive data using WS-Security.
-     </p></li><li><p>
-      <b>Key integrity</b> - Key integrity is maintained by using 
+     </p></li><li><p><b>Key integrity</b> - Key integrity is maintained by using 
       the strongest algorithms possible (by comparing secured policies 
       - see <a href="#WS-Policy">[WS-Policy]</a> and 
       <a href="#WS-SecurityPolicy">[WS-SecurityPolicy]</a>)
-     </p></li><li><p>
-      <b>Authentication</b> - Authentication is established using the 
+     </p></li><li><p><b>Authentication</b> - Authentication is established using the 
       mechanisms described in WS-Security and WS-Trust. Each message is 
       authenticated using the mechanisms described in WS-Security
-     </p></li><li><p>
-      <b>Accountability</b> - Accountability is a function of the type 
+     </p></li><li><p><b>Accountability</b> - Accountability is a function of the type 
       of and strength of the key and algorithms being used. In many 
       cases, a strong symmetric key provides sufficient accountability. 
       However, in some environments, strong PKI signatures are required.
-     </p></li><li><p>
-      <b>Availability</b> - Metadata services are subject to a variety 
+     </p></li><li><p><b>Availability</b> - Metadata services are subject to a variety 
       of availability attacks such as application-level denial of 
       service. It is recommended that the mechanisms described in 
       WS-Security be considered as mitigations for some forms of 
       attacks. Other attacks, such as network-level denial of service 
       are harder to avoid. Note that both of these classes of attack 
       are outside the scope of this specification.
-     </p></li><li><p>
-      <b>Replay</b> - Messages may be replayed for a variety of 
+     </p></li><li><p><b>Replay</b> - Messages may be replayed for a variety of 
       reasons. To detect and eliminate this attack, mechanisms should 
       be used to identify replayed messages such as the timestamp/nonce 
       outlined in WS-Security. Alternatively, and optionally, other 
@@ -950,73 +947,59 @@
       Wu Chou (Avaya Communications),
       Yves Lafon (W3C)
    </p></div><div class="div1">
-<h2><a name="References" id="References"/>11 References</h2><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="References" id="References"/>11 References</h2><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, Harvard University, March 1997.
-      (See http://www.ietf.org/rfc/rfc2119.txt.)</dd><dt class="label"><a name="SOAP11" id="SOAP11"/>SOAP 1.1</dt><dd>
-     <a href="http://www.w3.org/TR/2000/NOTE-SOAP-20000508/"><cite>
+      (See http://www.ietf.org/rfc/rfc2119.txt.)</dd><dt class="label"><a name="SOAP11" id="SOAP11"/>SOAP 1.1</dt><dd><a href="http://www.w3.org/TR/2000/NOTE-SOAP-20000508/"><cite>
       Simple Object Access Protocol (SOAP) 1.1
      </cite></a>
      , D. Box, et al, May 2000.
-      (See http://www.w3.org/TR/2000/NOTE-SOAP-20000508/.)</dd><dt class="label"><a name="SOAP12" id="SOAP12"/>SOAP 1.2</dt><dd>
-     <a href="http://www.w3.org/TR/2003/REC-soap12-part1-20030624/"><cite>
+      (See http://www.w3.org/TR/2000/NOTE-SOAP-20000508/.)</dd><dt class="label"><a name="SOAP12" id="SOAP12"/>SOAP 1.2</dt><dd><a href="http://www.w3.org/TR/2003/REC-soap12-part1-20030624/"><cite>
       "SOAP Version 1.2 Part 1: Messaging Framework
      </cite></a>
      , M. Gudgin, et al, June 2003.
-      (See http://www.w3.org/TR/2003/REC-soap12-part1-20030624/.)</dd><dt class="label"><a name="AddrCore" id="AddrCore"/>WS-Addressing 1.0 Core</dt><dd>
-     <a href="http://www.w3.org/TR/2006/PR-ws-addr-core-20060321/"><cite>
+      (See http://www.w3.org/TR/2003/REC-soap12-part1-20030624/.)</dd><dt class="label"><a name="AddrCore" id="AddrCore"/>WS-Addressing 1.0 Core</dt><dd><a href="http://www.w3.org/TR/2006/PR-ws-addr-core-20060321/"><cite>
       Web Services Addressing 1.0 - Core" (Proposed Recommendation)
      </cite></a>
      , M. Gudgin, M. Hadley, T. Rogers (editors), March 2006.
-      (See http://www.w3.org/TR/2006/PR-ws-addr-core-20060321/.)</dd><dt class="label"><a name="WS-Policy" id="WS-Policy"/>WS-Policy</dt><dd>
-     <a href="http://www.w3.org/Submission/2006/SUBM-WS-Policy-20060425/"><cite>
+      (See http://www.w3.org/TR/2006/PR-ws-addr-core-20060321/.)</dd><dt class="label"><a name="WS-Policy" id="WS-Policy"/>WS-Policy</dt><dd><a href="http://www.w3.org/Submission/2006/SUBM-WS-Policy-20060425/"><cite>
       Web Services Policy Framework (WS-Policy)
      </cite></a>
      , S. Bajaj, et al, March 2006.
-      (See http://www.w3.org/Submission/2006/SUBM-WS-Policy-20060425/.)</dd><dt class="label"><a name="WS-PolicyAttachment" id="WS-PolicyAttachment"/>WS-PolicyAttachment</dt><dd>
-     <a href="http://www.w3.org/Submission/2006/SUBM-WS-PolicyAttachment-20060425/"><cite>
+      (See http://www.w3.org/Submission/2006/SUBM-WS-Policy-20060425/.)</dd><dt class="label"><a name="WS-PolicyAttachment" id="WS-PolicyAttachment"/>WS-PolicyAttachment</dt><dd><a href="http://www.w3.org/Submission/2006/SUBM-WS-PolicyAttachment-20060425/"><cite>
       Web Services Policy Attachment (WS-PolicyAttachment)
      </cite></a>
      , S. Bajaj, et al, March 2006.
-      (See http://www.w3.org/Submission/2006/SUBM-WS-PolicyAttachment-20060425/.)</dd><dt class="label"><a name="WS-SecureConversation" id="WS-SecureConversation"/>WS-SecureConversation</dt><dd>
-     <a href="http://www.oasis-open.org/committees/download.php/17364."><cite>
+      (See http://www.w3.org/Submission/2006/SUBM-WS-PolicyAttachment-20060425/.)</dd><dt class="label"><a name="WS-SecureConversation" id="WS-SecureConversation"/>WS-SecureConversation</dt><dd><a href="http://www.oasis-open.org/committees/download.php/17364."><cite>
       Web Services Secure Conversation Language (WS-SecureConversation)
      </cite></a>
      , S. Anderson, et al, February 2005.
-      (See http://www.oasis-open.org/committees/download.php/17364..)</dd><dt class="label"><a name="WS-Security" id="WS-Security"/>WS-Security</dt><dd>
-     <a href="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-soap-message-security-1.0.pdf"><cite>
+      (See http://www.oasis-open.org/committees/download.php/17364..)</dd><dt class="label"><a name="WS-Security" id="WS-Security"/>WS-Security</dt><dd><a href="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-soap-message-security-1.0.pdf"><cite>
       Web Services Security: SOAP Message Security 1.0 (WS-Security 2004)
      </cite></a>
      , A. Nadalin, et al, March 2004.
-      (See http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-soap-message-security-1.0.pdf.)</dd><dt class="label"><a name="WS-SecurityPolicy" id="WS-SecurityPolicy"/>WS-SecurityPolicy</dt><dd>
-     <a href="http://www.oasis-open.org/committees/download.php/16569/"><cite>
+      (See http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-soap-message-security-1.0.pdf.)</dd><dt class="label"><a name="WS-SecurityPolicy" id="WS-SecurityPolicy"/>WS-SecurityPolicy</dt><dd><a href="http://www.oasis-open.org/committees/download.php/16569/"><cite>
       Web Services Security Policy Language (WS-SecurityPolicy)
      </cite></a>
      , G. Della-Libera, et al, July 2005.
-      (See http://www.oasis-open.org/committees/download.php/16569/.)</dd><dt class="label"><a name="WS-Transfer" id="WS-Transfer"/>WS-Transfer</dt><dd>
-     <a href="http://www.w3.org/Submission/2006/SUBM-WS-Transfer-20060315/"><cite>
+      (See http://www.oasis-open.org/committees/download.php/16569/.)</dd><dt class="label"><a name="WS-Transfer" id="WS-Transfer"/>WS-Transfer</dt><dd><a href="http://www.w3.org/Submission/2006/SUBM-WS-Transfer-20060315/"><cite>
       Web Services Transfer (WS-Transfer)
      </cite></a>
      , J. Alexander, et al, September 2004.
-      (See http://www.w3.org/Submission/2006/SUBM-WS-Transfer-20060315/.)</dd><dt class="label"><a name="WS-Trust" id="WS-Trust"/>WS-Trust</dt><dd>
-     <a href="http://www.oasis-open.org/committees/download.php/17364"><cite>
+      (See http://www.w3.org/Submission/2006/SUBM-WS-Transfer-20060315/.)</dd><dt class="label"><a name="WS-Trust" id="WS-Trust"/>WS-Trust</dt><dd><a href="http://www.oasis-open.org/committees/download.php/17364"><cite>
       Web Services Trust Language (WS-Trust)
      </cite></a>
      , S. Anderson, et al, February 2005.
-      (See http://www.oasis-open.org/committees/download.php/17364.)</dd><dt class="label"><a name="WSDL11" id="WSDL11"/>WSDL 1.1</dt><dd>
-     <a href="http://www.w3.org/TR/2001/NOTE-wsdl-20010315"><cite>
+      (See http://www.oasis-open.org/committees/download.php/17364.)</dd><dt class="label"><a name="WSDL11" id="WSDL11"/>WSDL 1.1</dt><dd><a href="http://www.w3.org/TR/2001/NOTE-wsdl-20010315"><cite>
       Web Services Description Language (WSDL) 1.1
      </cite></a>
      , E. Christensen, et al, March 2001
-      (See http://www.w3.org/TR/2001/NOTE-wsdl-20010315.)</dd><dt class="label"><a name="Schema1" id="Schema1"/>XML Schema: Structures</dt><dd>
-     <a href="http://www.w3.org/TR/2004/REC-xmlschema-1-20041028/"><cite>
+      (See http://www.w3.org/TR/2001/NOTE-wsdl-20010315.)</dd><dt class="label"><a name="Schema1" id="Schema1"/>XML Schema: Structures</dt><dd><a href="http://www.w3.org/TR/2004/REC-xmlschema-1-20041028/"><cite>
       XML Schema Part 1: Structures
      </cite></a>
      , H. Thompson, et al, October 2004.
-      (See http://www.w3.org/TR/2004/REC-xmlschema-1-20041028/.)</dd><dt class="label"><a name="Schema2" id="Schema2"/>XML Schema: Datatypes</dt><dd>
-     <a href="http://www.w3.org/TR/2004/REC-xmlschema-2-20041028/"><cite>
+      (See http://www.w3.org/TR/2004/REC-xmlschema-1-20041028/.)</dd><dt class="label"><a name="Schema2" id="Schema2"/>XML Schema: Datatypes</dt><dd><a href="http://www.w3.org/TR/2004/REC-xmlschema-2-20041028/"><cite>
       XML Schema Part 2: Datatypes
      </cite></a>
      , P. Biron, et al, October 2004.
@@ -1034,58 +1017,61 @@
     xmlns:wsa='http://www.w3.org/2005/08/addressing'
     xmlns:xs='http://www.w3.org/2001/XMLSchema'
     elementFormDefault='qualified'
-    blockDefault='#all' &gt;
+    blockDefault='#all'&gt;
+
+  &lt;xs:import
+      namespace="http://www.w3.org/2005/08/addressing"
+      schemaLocation="http://www.w3.org/2006/03/addressing/ws-addr.xsd"/&gt;
 
   &lt;!-- Get Metadata request --&gt;
-  &lt;xs:element name='GetMetadata' &gt;
+  &lt;xs:element name='GetMetadata'&gt;
     &lt;xs:complexType&gt;
       &lt;xs:sequence&gt;
-        &lt;xs:element ref='tns:Dialect' minOccurs='0' /&gt;
-        &lt;xs:element ref='tns:Identifier' minOccurs='0' /&gt;
+        &lt;xs:element ref='tns:Dialect' minOccurs='0' maxOccurs='unbounded'/&gt;
       &lt;/xs:sequence&gt;
-      &lt;xs:anyAttribute namespace='##other' processContents='lax' /&gt;
+      &lt;xs:anyAttribute namespace='##other' processContents='lax'/&gt;
     &lt;/xs:complexType&gt;
   &lt;/xs:element&gt;
 
-  &lt;xs:element name='Dialect' type='xs:anyURI' /&gt;
-  &lt;xs:element name='Identifier' type='xs:anyURI' /&gt;
+  &lt;xs:element name='Dialect'&gt;
+    &lt;xs:complexType&gt;
+      &lt;xs:attribute name='URI' type='xs:anyURI' use='required'/&gt;
+      &lt;xs:attribute name='Identifier' type='xs:anyURI'/&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;
 
   &lt;!-- Get Metadata response --&gt;
-  &lt;xs:element name='Metadata' &gt;
+  &lt;xs:element name='Metadata'&gt;
     &lt;xs:complexType&gt;
       &lt;xs:sequence&gt;
         &lt;xs:element ref='tns:MetadataSection'
                     minOccurs='0'
-                    maxOccurs='unbounded' /&gt;
+                    maxOccurs='unbounded'/&gt;
         &lt;xs:any namespace='##other' processContents='lax'
                 minOccurs='0'
-                maxOccurs='unbounded' /&gt;
+                maxOccurs='unbounded'/&gt;
       &lt;/xs:sequence&gt;
-      &lt;xs:anyAttribute namespace='##other' processContents='lax' /&gt;
+      &lt;xs:anyAttribute namespace='##other' processContents='lax'/&gt;
     &lt;/xs:complexType&gt;
   &lt;/xs:element&gt;
 
-  &lt;xs:element name='MetadataSection' &gt;
+  &lt;xs:element name='MetadataSection'&gt;
     &lt;xs:complexType&gt;
       &lt;xs:choice&gt;
-        &lt;xs:any namespace='##other' processContents='lax' /&gt;
-        &lt;xs:element ref='tns:MetadataReference' /&gt;
-        &lt;xs:element ref='tns:Location' /&gt;
+        &lt;xs:any namespace='##other' processContents='lax'/&gt;
+        &lt;xs:element ref='tns:MetadataReference'/&gt;
+        &lt;xs:element ref='tns:Location'/&gt;
       &lt;/xs:choice&gt;
-      &lt;xs:attribute name='Dialect' type='xs:anyURI' use='required' /&gt;
-      &lt;xs:attribute name='Identifier' type='xs:anyURI' /&gt;
-      &lt;xs:anyAttribute namespace='##other' processContents='lax' /&gt;
+      &lt;xs:attribute name='Dialect' type='xs:anyURI' use='required'/&gt;
+      &lt;xs:attribute name='Identifier' type='xs:anyURI'/&gt;
+      &lt;xs:anyAttribute namespace='##other' processContents='lax'/&gt;
     &lt;/xs:complexType&gt;
   &lt;/xs:element&gt;
 
-  &lt;xs:element name='MetadataReference'&gt;
-    &lt;xs:complexType&gt;
-      &lt;xs:sequence&gt;
-        &lt;wsa:EndpointReferenceType minOccurs='1' maxOccurs='unbounded'/&gt;
-      &lt;/xs:sequence&gt;
-    &lt;/xs:complexType&gt;
-  &lt;/xs:element&gt;
-  &lt;xs:element name='Location' type='xs:anyURI' /&gt;
+  &lt;xs:element name='MetadataReference' type='wsa:EndpointReferenceType'/&gt;
+  &lt;xs:element name='Location' type='xs:anyURI'/&gt;
 &lt;/xs:schema&gt;</pre></div></div></div><div class="div1">
 <h2><a name="Appendix-B" id="Appendix-B"/>B WSDL</h2><p>
     A normative copy of the WSDL <a href="#WSDL11">[WSDL 1.1]</a> description for 
@@ -1099,23 +1085,23 @@
     xmlns:wsa='http://www.w3.org/2005/08/addressing'
     xmlns:wsam='http://www.w3.org/2007/05/addressing/metadata'
     xmlns:wsdl='http://schemas.xmlsoap.org/wsdl/'
-    xmlns:xs='http://www.w3.org/2001/XMLSchema' &gt;
+    xmlns:xs='http://www.w3.org/2001/XMLSchema'&gt;
 
   &lt;wsdl:types&gt;
     &lt;xs:schema
-        targetNamespace='http://www.w3.org/2009/02/ws-mex' &gt;
-      &lt;xs:include schemaLocation='metadataexchange.xsd' /&gt;
+        targetNamespace='http://www.w3.org/2009/02/ws-mex'&gt;
+      &lt;xs:include schemaLocation='metadataexchange.xsd'/&gt;
     &lt;/xs:schema&gt;
   &lt;/wsdl:types&gt;
 
-  &lt;wsdl:message name='GetMetadataMsg' &gt;
-    &lt;wsdl:part name='body' element='tns:GetMetadata' /&gt;
+  &lt;wsdl:message name='GetMetadataMsg'&gt;
+    &lt;wsdl:part name='body' element='tns:GetMetadata'/&gt;
   &lt;/wsdl:message&gt;
-  &lt;wsdl:message name='GetMetadataResponseMsg' &gt;
-    &lt;wsdl:part name='body' element='tns:Metadata' /&gt;
+  &lt;wsdl:message name='GetMetadataResponseMsg'&gt;
+    &lt;wsdl:part name='body' element='tns:Metadata'/&gt;
   &lt;/wsdl:message&gt;
-  &lt;wsdl:portType name='MetadataExchange' &gt;
-    &lt;wsdl:operation name='GetMetadata' &gt;
+  &lt;wsdl:portType name='MetadataExchange'&gt;
+    &lt;wsdl:operation name='GetMetadata'&gt;
       &lt;wsdl:input
        message='tns:GetMetadataMsg'
        wsam:Action=
@@ -1129,13 +1115,10 @@
 
 &lt;/wsdl:definitions&gt;</pre></div></div></div><div class="div1">
 <h2><a name="changelog" id="changelog"/>C Change Log</h2><table border="1"><tbody><tr><th> Data </th><th> Author </th><th> Description </th></tr><tr><td> 2009/03/04 </td><td> DD </td><td> Added resolution of issue 
-       <a href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=6391">6391</a>
-      </td></tr><tr><td> 2009/03/04 </td><td> DD </td><td> Added resolution of issue 
-       <a href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=6519">6519</a>
-      </td></tr><tr><td> 2009/03/11 </td><td> DD </td><td> Added change log </td></tr><tr><td> 2009/03/11 </td><td> DD </td><td> Added resolution of issue 
-       <a href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=6639">6639</a>
-      </td></tr><tr><td> 2009/03/11 </td><td> DD </td><td> Added resolution of issue 
-       <a href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=6425">6425</a>
-      </td></tr><tr><td> 2009/03/16 </td><td> KW </td><td> Added resolution of issue 
-       <a href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=6587">6587</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=6391">6391</a></td></tr><tr><td> 2009/03/04 </td><td> DD </td><td> Added resolution of issue 
+       <a href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=6519">6519</a></td></tr><tr><td> 2009/03/11 </td><td> DD </td><td> Added change log </td></tr><tr><td> 2009/03/11 </td><td> DD </td><td> Added resolution of issue 
+       <a href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=6639">6639</a></td></tr><tr><td> 2009/03/11 </td><td> DD </td><td> Added resolution of issue 
+       <a href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=6425">6425</a></td></tr><tr><td> 2009/03/16 </td><td> KW </td><td> Added resolution of issue 
+       <a href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=6587">6587</a></td></tr><tr><td> 2009/03/17 </td><td> KW </td><td> Added resolution of issue 
+       <a href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=6405">6405</a></td></tr><tr><td> 2009/03/17 </td><td> KW </td><td> Added resolution of issue 
+       <a href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=6604">6604</a></td></tr></tbody></table></div></div></body></html>
\ No newline at end of file

Received on Wednesday, 18 March 2009 02:49:55 UTC