Author: markus Date: 2006-05-16 10:56:41 +0200 (Tue, 16 May 2006) New Revision: 528 Modified: trunk/protocol/tapir.xsd Log: Replaces service metadata elements with corresponding DublinCore elements. Modified: trunk/protocol/tapir.xsd =================================================================== --- trunk/protocol/tapir.xsd 2006-05-15 15:19:09 UTC (rev 527) +++ trunk/protocol/tapir.xsd 2006-05-16 08:56:41 UTC (rev 528) @@ -23,6 +23,9 @@ <!-- ============================================= --> <!-- NAMESPACE IMPORTS --> <!-- ============================================= --> + <xsd:import namespace="http://www.w3.org/XML/1998/namespace" + schemaLocation="http://www.w3.org/2001/03/xml.xsd"> + </xsd:import> <xsd:import namespace="http://purl.org/dc/elements/1.1/" schemaLocation="http://www.dublincore.org/schemas/xmls/simpledc20021212.xsd"/> <xsd:import namespace="http://purl.org/dc/terms/" @@ -1441,44 +1444,53 @@ <xsd:documentation>Format of metadata operation result.</xsd:documentation> </xsd:annotation> <xsd:sequence> - <xsd:element name="label" type="languageAwareElementType" maxOccurs="unbounded"> + <xsd:element ref="dc:title"> <xsd:annotation> <xsd:documentation>The name of this service possibly in different languages.</xsd:documentation> </xsd:annotation> </xsd:element> + <xsd:element ref="dc:type"> + <xsd:annotation> + <xsd:documentation>http://purl.org/dc/dcmitype/Service</xsd:documentation> + </xsd:annotation> + </xsd:element> <xsd:element name="accesspoint" type="xsd:anyURI"> <xsd:annotation> <xsd:documentation>The URL of the access point of this service.</xsd:documentation> </xsd:annotation> </xsd:element> - <xsd:element name="geoLocation" type="geoLocationType" minOccurs="0"/> - <xsd:element name="abstract" minOccurs="0" maxOccurs="unbounded"> + <xsd:element ref="dc:description"> <xsd:annotation> - <xsd:documentation>The description of the service possibly in different - languages.</xsd:documentation> + <xsd:documentation></xsd:documentation> </xsd:annotation> - <xsd:complexType mixed="true"> - <xsd:simpleContent> - <xsd:extension base="languageAwareElementType"/> - </xsd:simpleContent> - </xsd:complexType> - </xsd:element> - <xsd:element name="keywords" type="languageAwareElementType" minOccurs="0" maxOccurs="unbounded"/> - <xsd:element name="citation" type="languageAwareElementType" minOccurs="0" maxOccurs="unbounded"> + </xsd:element> + <xsd:element ref="dc:language"> <xsd:annotation> - <xsd:documentation>How this service should be cited when - referenced.</xsd:documentation> + <xsd:documentation></xsd:documentation> </xsd:annotation> - </xsd:element> - <xsd:element name="rights" type="languageAwareElementType" minOccurs="0" maxOccurs="unbounded"> + </xsd:element> + <xsd:element ref="dc:subject"> <xsd:annotation> - <xsd:documentation>Legal matters concerning the service and its underlying - data.</xsd:documentation> + <xsd:documentation></xsd:documentation> </xsd:annotation> - </xsd:element> - <xsd:element name="lastUpdated" type="xsd:dateTime" minOccurs="0"/> + </xsd:element> + <xsd:element ref="dct:bibliographicCitation"> + <xsd:annotation> + <xsd:documentation></xsd:documentation> + </xsd:annotation> + </xsd:element> + <xsd:element ref="dc:rights"> + <xsd:annotation> + <xsd:documentation></xsd:documentation> + </xsd:annotation> + </xsd:element> + <xsd:element ref="dct:modified"> + <xsd:annotation> + <xsd:documentation></xsd:documentation> + </xsd:annotation> + </xsd:element> <xsd:element name="indexingPreferences" minOccurs="0"> <xsd:complexType> <xsd:attribute name="startTime" type="xsd:time"/> @@ -1486,21 +1498,15 @@ <xsd:attribute name="frequency" type="xsd:duration" /> </xsd:complexType> </xsd:element> - <xsd:element name="relatedEntities"> + <xsd:element name="relatedEntity" type="relatedEntityInformationType" maxOccurs="unbounded"> <xsd:annotation> <xsd:documentation>Entities (companies, organisations, institutions) related to this service with their respective roles, e.g. publisher, data supplier</xsd:documentation> </xsd:annotation> - <xsd:complexType> - <xsd:sequence> - <xsd:element name="entity" type="relatedEntityInformationType" maxOccurs="unbounded"/> - </xsd:sequence> - </xsd:complexType> </xsd:element> <xsd:element ref="custom"/> </xsd:sequence> - <xsd:attribute ref="lang"/> </xsd:complexType> <xsd:complexType name="contactInformationType"> <xsd:annotation>