- From: Doug Davis via cvs-syncmail <cvsmail@w3.org>
- Date: Wed, 18 Mar 2009 02:46:46 +0000
- To: public-ws-resource-access-notifications@w3.org
Update of /w3ccvs/WWW/2002/ws/ra/edcopies/ws-mex
In directory hutz:/tmp/cvs-serv31153/ws-mex
Modified Files:
MetadataExchange.xsd
Log Message:
issues 6604 and 6405
Index: MetadataExchange.xsd
===================================================================
RCS file: /w3ccvs/WWW/2002/ws/ra/edcopies/ws-mex/MetadataExchange.xsd,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- MetadataExchange.xsd 4 Mar 2009 16:14:33 -0000 1.2
+++ MetadataExchange.xsd 18 Mar 2009 02:46:44 -0000 1.3
@@ -4,56 +4,59 @@
xmlns:wsa='http://www.w3.org/2005/08/addressing'
xmlns:xs='http://www.w3.org/2001/XMLSchema'
elementFormDefault='qualified'
- blockDefault='#all' >
+ blockDefault='#all'>
+
+ <xs:import
+ namespace="http://www.w3.org/2005/08/addressing"
+ schemaLocation="http://www.w3.org/2006/03/addressing/ws-addr.xsd"/>
<!-- Get Metadata request -->
- <xs:element name='GetMetadata' >
+ <xs:element name='GetMetadata'>
<xs:complexType>
<xs:sequence>
- <xs:element ref='tns:Dialect' minOccurs='0' />
- <xs:element ref='tns:Identifier' minOccurs='0' />
+ <xs:element ref='tns:Dialect' minOccurs='0' maxOccurs='unbounded'/>
</xs:sequence>
- <xs:anyAttribute namespace='##other' processContents='lax' />
+ <xs:anyAttribute namespace='##other' processContents='lax'/>
</xs:complexType>
</xs:element>
- <xs:element name='Dialect' type='xs:anyURI' />
- <xs:element name='Identifier' type='xs:anyURI' />
+ <xs:element name='Dialect'>
+ <xs:complexType>
+ <xs:attribute name='URI' type='xs:anyURI' use='required'/>
+ <xs:attribute name='Identifier' type='xs:anyURI'/>
+ <xs:attribute name='Content' type='xs:anyURI'/>
+ <xs:anyAttribute namespace='##other' processContents='lax'/>
+ </xs:complexType>
+ </xs:element>
<!-- Get Metadata response -->
- <xs:element name='Metadata' >
+ <xs:element name='Metadata'>
<xs:complexType>
<xs:sequence>
<xs:element ref='tns:MetadataSection'
minOccurs='0'
- maxOccurs='unbounded' />
+ maxOccurs='unbounded'/>
<xs:any namespace='##other' processContents='lax'
minOccurs='0'
- maxOccurs='unbounded' />
+ maxOccurs='unbounded'/>
</xs:sequence>
- <xs:anyAttribute namespace='##other' processContents='lax' />
+ <xs:anyAttribute namespace='##other' processContents='lax'/>
</xs:complexType>
</xs:element>
- <xs:element name='MetadataSection' >
+ <xs:element name='MetadataSection'>
<xs:complexType>
<xs:choice>
- <xs:any namespace='##other' processContents='lax' />
- <xs:element ref='tns:MetadataReference' />
- <xs:element ref='tns:Location' />
+ <xs:any namespace='##other' processContents='lax'/>
+ <xs:element ref='tns:MetadataReference'/>
+ <xs:element ref='tns:Location'/>
</xs:choice>
- <xs:attribute name='Dialect' type='xs:anyURI' use='required' />
- <xs:attribute name='Identifier' type='xs:anyURI' />
- <xs:anyAttribute namespace='##other' processContents='lax' />
+ <xs:attribute name='Dialect' type='xs:anyURI' use='required'/>
+ <xs:attribute name='Identifier' type='xs:anyURI'/>
+ <xs:anyAttribute namespace='##other' processContents='lax'/>
</xs:complexType>
</xs:element>
- <xs:element name='MetadataReference'>
- <xs:complexType>
- <xs:sequence>
- <wsa:EndpointReferenceType minOccurs='1' maxOccurs='unbounded'/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name='Location' type='xs:anyURI' />
+ <xs:element name='MetadataReference' type='wsa:EndpointReferenceType'/>
+ <xs:element name='Location' type='xs:anyURI'/>
</xs:schema>
Received on Wednesday, 18 March 2009 02:49:55 UTC