Author: markus
Date: 2006-01-06 10:57:27 +0100 (Fri, 06 Jan 2006)
New Revision: 403
Modified:
trunk/protocol/tapir.xsd
Log:
- add to all complex/simple type names "Type" if not yet named like this
Modified: trunk/protocol/tapir.xsd
===================================================================
--- trunk/protocol/tapir.xsd 2006-01-06 09:52:14 UTC (rev 402)
+++ trunk/protocol/tapir.xsd 2006-01-06 09:57:27 UTC (rev 403)
@@ -6,7 +6,7 @@
<!-- ============================================= -->
<!-- SIMPLE TYPE DEFINITIONS-->
<!-- ============================================= -->
- <xsd:simpleType name="simpleXPath">
+ <xsd:simpleType name="simpleXPathType">
<xsd:annotation>
<xsd:documentation>A simple XPath expression used to reference XML
nodes.</xsd:documentation>
@@ -15,7 +15,7 @@
<xsd:pattern value="(/[a-zA-Z0-9_\-]+)+(@[a-zA-Z0-9_\-]+)?"/>
</xsd:restriction>
</xsd:simpleType>
- <xsd:simpleType name="qualifiedConceptID">
+ <xsd:simpleType name="qualifiedConceptIdType">
<xsd:annotation>
<xsd:documentation>A simpleType to represent qualified concept identifiers. This can
either be the full format NAMESPACE#LOCAL_CONCEPT or an alias which can be any
@@ -40,7 +40,7 @@
<xsd:complexType name="externalResourceType">
<xsd:attribute name="location" type="xsd:anyURI" use="required"/>
</xsd:complexType>
- <xsd:complexType name="languageAwareElement">
+ <xsd:complexType name="languageAwareElementType">
<xsd:annotation>
<xsd:documentation>A type for elements that may be language
specific.</xsd:documentation>
@@ -51,26 +51,26 @@
</xsd:extension>
</xsd:simpleContent>
</xsd:complexType>
- <xsd:complexType name="nodeReference">
+ <xsd:complexType name="nodeReferenceType">
<xsd:annotation>
<xsd:documentation>A reference to an XML node.</xsd:documentation>
</xsd:annotation>
- <xsd:attribute name="path" type="simpleXPath" use="required"/>
+ <xsd:attribute name="path" type="simpleXPathType" use="required"/>
</xsd:complexType>
- <xsd:complexType name="qualifiedConceptReference">
+ <xsd:complexType name="qualifiedConceptReferenceType">
<xsd:annotation>
<xsd:documentation>A qualified reference to a concept.</xsd:documentation>
</xsd:annotation>
- <xsd:attribute name="id" type="qualifiedConceptID" use="required"/>
+ <xsd:attribute name="id" type="qualifiedConceptIdType" use="required"/>
</xsd:complexType>
- <xsd:complexType name="softwareInformation">
+ <xsd:complexType name="softwareInformationType">
<xsd:annotation>
<xsd:documentation>Basic information about a software.</xsd:documentation>
</xsd:annotation>
<xsd:attribute name="name" type="xsd:string" use="required"/>
<xsd:attribute name="version" type="xsd:string" use="required"/>
</xsd:complexType>
- <xsd:complexType name="header">
+ <xsd:complexType name="headerType">
<xsd:annotation>
<xsd:documentation>Header used for requests. If the noresponse attribute is set to true
the request is meant for logging only and no response should be
@@ -95,7 +95,7 @@
</xsd:annotation>
<xsd:complexType>
<xsd:complexContent>
- <xsd:extension base="softwareInformation">
+ <xsd:extension base="softwareInformationType">
<xsd:sequence minOccurs="0">
<xsd:element name="dependencies" minOccurs="0">
<xsd:annotation>
@@ -104,7 +104,7 @@
</xsd:annotation>
<xsd:complexType>
<xsd:sequence minOccurs="0">
- <xsd:element name="dependency" type="softwareInformation" minOccurs="0" maxOccurs="unbounded">
+ <xsd:element name="dependency" type="softwareInformationType" minOccurs="0" maxOccurs="unbounded">
<xsd:annotation>
<xsd:documentation>A single
dependency for the software,
@@ -136,7 +136,7 @@
<xsd:element ref="custom" minOccurs="0"/>
</xsd:sequence>
</xsd:complexType>
- <xsd:complexType name="diagnosticMessage">
+ <xsd:complexType name="diagnosticMessageType">
<xsd:annotation>
<xsd:documentation>A diagnostic message from the service (error, warning, additional
information, etc).</xsd:documentation>
@@ -159,12 +159,12 @@
</xsd:extension>
</xsd:simpleContent>
</xsd:complexType>
- <xsd:complexType name="diagnosticsList">
+ <xsd:complexType name="diagnosticsListType">
<xsd:annotation>
<xsd:documentation>A list of diagnostic messages from the service.</xsd:documentation>
</xsd:annotation>
<xsd:sequence minOccurs="0">
- <xsd:element name="diagnostic" type="diagnosticMessage" minOccurs="0" maxOccurs="unbounded"/>
+ <xsd:element name="diagnostic" type="diagnosticMessageType" minOccurs="0" maxOccurs="unbounded"/>
</xsd:sequence>
</xsd:complexType>
<xsd:element name="custom">
@@ -214,7 +214,7 @@
should be used as a reference for counting.</xsd:documentation>
</xsd:annotation>
<xsd:complexType>
- <xsd:attribute name="path" type="simpleXPath" use="required"/>
+ <xsd:attribute name="path" type="simpleXPathType" use="required"/>
</xsd:complexType>
</xsd:element>
<xsd:element name="mapping">
@@ -236,7 +236,7 @@
<xsd:element ref="literal"/>
<xsd:element ref="variable"/>
</xsd:choice>
- <xsd:attribute name="path" type="simpleXPath" use="required"/>
+ <xsd:attribute name="path" type="simpleXPathType" use="required"/>
</xsd:complexType>
</xsd:element>
</xsd:sequence>
@@ -301,7 +301,7 @@
</xsd:annotation>
<xsd:complexType>
<xsd:sequence>
- <xsd:element name="concept" type="qualifiedConceptReference" minOccurs="0" maxOccurs="unbounded">
+ <xsd:element name="concept" type="qualifiedConceptReferenceType" minOccurs="0" maxOccurs="unbounded">
<xsd:annotation>
<xsd:documentation>A single qualified
concept</xsd:documentation>
@@ -365,7 +365,7 @@
</xsd:element>
<xsd:complexType name="conceptType">
<xsd:complexContent>
- <xsd:extension base="qualifiedConceptReference"/>
+ <xsd:extension base="qualifiedConceptReferenceType"/>
</xsd:complexContent>
</xsd:complexType>
<!-- ===== COMPLEX EXPRESSIONS ===== -->
@@ -631,7 +631,7 @@
specific parameters.</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
- <xsd:element name="header" type="header"/>
+ <xsd:element name="header" type="headerType"/>
<xsd:choice>
<xsd:element name="ping">
<xsd:complexType>
@@ -653,7 +653,7 @@
<xsd:complexContent>
<xsd:extension base="inventoryTemplateType">
<xsd:attributeGroup ref="operationRequestGroup"/>
- <xsd:attributeGroup ref="pagingParameters"/>
+ <xsd:attributeGroup ref="pagingParametersGroup"/>
</xsd:extension>
</xsd:complexContent>
</xsd:complexType>
@@ -682,7 +682,7 @@
</xsd:annotation>
<xsd:complexType>
<xsd:sequence>
- <xsd:element name="node" type="nodeReference" maxOccurs="unbounded">
+ <xsd:element name="node" type="nodeReferenceType" maxOccurs="unbounded">
<xsd:annotation>
<xsd:documentation>A node taken from the
response structure
@@ -694,13 +694,13 @@
</xsd:element>
</xsd:sequence>
<xsd:attributeGroup ref="operationRequestGroup"/>
- <xsd:attributeGroup ref="pagingParameters"/>
+ <xsd:attributeGroup ref="pagingParametersGroup"/>
</xsd:extension>
</xsd:complexContent>
</xsd:complexType>
</xsd:element>
</xsd:choice>
- <xsd:element name="diagnostics" type="diagnosticsList" minOccurs="0"/>
+ <xsd:element name="diagnostics" type="diagnosticsListType" minOccurs="0"/>
</xsd:sequence>
</xsd:complexType>
<xsd:attributeGroup name="operationRequestGroup">
@@ -708,7 +708,7 @@
<xsd:attribute name="xslt" type="xsd:anyURI" use="optional"/>
<xsd:attribute name="xslt-apply" type="xsd:boolean" use="optional" default="false"/>
</xsd:attributeGroup>
- <xsd:attributeGroup name="pagingParameters">
+ <xsd:attributeGroup name="pagingParametersGroup">
<xsd:attribute name="count" type="xsd:boolean" use="optional" default="false"/>
<xsd:attribute name="start" type="xsd:nonNegativeInteger" use="optional" default="0"/>
<xsd:attribute name="limit" type="xsd:nonNegativeInteger" use="optional" default="1"/>
@@ -727,16 +727,16 @@
requested operation and possible diagnostic messages.</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
- <xsd:element name="header" type="header"/>
+ <xsd:element name="header" type="headerType"/>
<xsd:choice>
<xsd:element ref="pong"/>
<xsd:element ref="metadata"/>
<xsd:element ref="capabilities"/>
- <xsd:element name="inventory" type="inventoryResult"/>
- <xsd:element name="search" type="searchResult"/>
- <xsd:element name="error" type="diagnosticMessage"/>
+ <xsd:element name="inventory" type="inventoryResultType"/>
+ <xsd:element name="search" type="searchResultType"/>
+ <xsd:element name="error" type="diagnosticMessageType"/>
</xsd:choice>
- <xsd:element name="diagnostics" type="diagnosticsList" minOccurs="0">
+ <xsd:element name="diagnostics" type="diagnosticsListType" minOccurs="0">
<xsd:annotation>
<xsd:documentation>The diagnostics element can contain many diagnostic pieces of
information. Should the possible diagnostic codes/messages be defined more
@@ -745,7 +745,7 @@
</xsd:element>
</xsd:sequence>
</xsd:complexType>
- <xsd:complexType name="resultSummary">
+ <xsd:complexType name="resultSummaryType">
<xsd:annotation>
<xsd:documentation>Summary about inventory and search results. The very first index of a
record is 0. The number of record being actually returned is given in totalReturned.
@@ -759,15 +759,15 @@
<xsd:attribute name="totalMatched" type="xsd:integer" use="optional"/>
</xsd:complexType>
<!-- ===== PING ===== -->
- <xsd:element name="pong" type="pingResult"/>
- <xsd:complexType name="pingResult">
+ <xsd:element name="pong" type="pingResultType"/>
+ <xsd:complexType name="pingResultType">
<xsd:annotation>
<xsd:documentation>Format of ping operation result.</xsd:documentation>
</xsd:annotation>
</xsd:complexType>
<!-- ===== CAPABILITIES ===== -->
- <xsd:element name="capabilities" type="capabilitiesResult"/>
- <xsd:complexType name="capabilitiesResult">
+ <xsd:element name="capabilities" type="capabilitiesResultType"/>
+ <xsd:complexType name="capabilitiesResultType">
<xsd:annotation>
<xsd:documentation>Format of capabilities operation result.</xsd:documentation>
</xsd:annotation>
@@ -813,7 +813,7 @@
<xsd:element name="customOutputModels">
<xsd:complexType>
<xsd:sequence minOccurs="0">
- <xsd:element name="structure" type="responseStructureCapabilities" minOccurs="0">
+ <xsd:element name="structure" type="responseStructureCapabilitiesType" minOccurs="0">
<xsd:annotation>
<xsd:documentation>The supported subset of
the XML Schema
@@ -830,7 +830,7 @@
</xsd:sequence>
</xsd:complexType>
</xsd:element>
- <xsd:element name="filter" type="filterCapabilities">
+ <xsd:element name="filter" type="filterCapabilitiesType">
<xsd:annotation>
<xsd:documentation>Information about the supported filter operators of this
service.</xsd:documentation>
@@ -874,7 +874,7 @@
</xsd:annotation>
<xsd:complexType>
<xsd:complexContent>
- <xsd:extension base="qualifiedConceptReference">
+ <xsd:extension base="qualifiedConceptReferenceType">
<xsd:attribute name="searchable" type="xsd:boolean" use="optional" default="true"/>
<xsd:attribute name="mandatory" type="xsd:boolean" use="optional" default="false"/>
</xsd:extension>
@@ -952,7 +952,7 @@
<xsd:element ref="custom" minOccurs="0"/>
</xsd:sequence>
</xsd:complexType>
- <xsd:complexType name="responseStructureCapabilities">
+ <xsd:complexType name="responseStructureCapabilitiesType">
<xsd:annotation>
<xsd:documentation>A complete indication about what subset of the response structure
specification is supported by a service.</xsd:documentation>
@@ -1252,7 +1252,7 @@
</xsd:element>
</xsd:sequence>
</xsd:complexType>
- <xsd:complexType name="filterCapabilities">
+ <xsd:complexType name="filterCapabilitiesType">
<xsd:annotation>
<xsd:documentation>A complete indication about what filter operators are supported by a
service.</xsd:documentation>
@@ -1379,7 +1379,7 @@
</xsd:sequence>
</xsd:complexType>
<!-- ===== METADATA ===== -->
- <xsd:element name="metadata" type="metadataResult">
+ <xsd:element name="metadata" type="metadataResultType">
<xsd:annotation>
<xsd:documentation>Global element to validate external metadata XML
files.</xsd:documentation>
@@ -1405,19 +1405,19 @@
<xsd:field xpath="@lang"/>
</xsd:unique>
</xsd:element>
- <xsd:element name="entity" type="entityInformation">
+ <xsd:element name="entity" type="entityInformationType">
<xsd:annotation>
<xsd:documentation>Global element to validate external XML representations of entities.
An entity here could be a company, organisation, institution, or
person.</xsd:documentation>
</xsd:annotation>
</xsd:element>
- <xsd:complexType name="metadataResult">
+ <xsd:complexType name="metadataResultType">
<xsd:annotation>
<xsd:documentation>Format of metadata operation result.</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
- <xsd:element name="label" type="languageAwareElement" maxOccurs="unbounded">
+ <xsd:element name="label" type="languageAwareElementType" maxOccurs="unbounded">
<xsd:annotation>
<xsd:documentation>The name of this service possibly in different
languages.</xsd:documentation>
@@ -1437,18 +1437,18 @@
</xsd:annotation>
<xsd:complexType mixed="true">
<xsd:simpleContent>
- <xsd:extension base="languageAwareElement"/>
+ <xsd:extension base="languageAwareElementType"/>
</xsd:simpleContent>
</xsd:complexType>
</xsd:element>
- <xsd:element name="keywords" type="languageAwareElement" minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="citation" type="languageAwareElement" minOccurs="0" maxOccurs="unbounded">
+ <xsd:element name="keywords" type="languageAwareElementType" minOccurs="0" maxOccurs="unbounded"/>
+ <xsd:element name="citation" type="languageAwareElementType" minOccurs="0" maxOccurs="unbounded">
<xsd:annotation>
<xsd:documentation>How this service should be cited when
referenced.</xsd:documentation>
</xsd:annotation>
</xsd:element>
- <xsd:element name="rights" type="languageAwareElement" minOccurs="0" maxOccurs="unbounded">
+ <xsd:element name="rights" type="languageAwareElementType" minOccurs="0" maxOccurs="unbounded">
<xsd:annotation>
<xsd:documentation>Legal matters concerning the service and its underlying
data.</xsd:documentation>
@@ -1472,20 +1472,20 @@
</xsd:annotation>
<xsd:complexType>
<xsd:sequence>
- <xsd:element name="entity" type="relatedEntityInformation" maxOccurs="unbounded"/>
+ <xsd:element name="entity" type="relatedEntityInformationType" maxOccurs="unbounded"/>
</xsd:sequence>
</xsd:complexType>
</xsd:element>
</xsd:sequence>
<xsd:attribute ref="lang"/>
</xsd:complexType>
- <xsd:complexType name="contactInformation">
+ <xsd:complexType name="contactInformationType">
<xsd:annotation>
<xsd:documentation>Contact information.</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:element name="name" type="xsd:string"/>
- <xsd:element name="title" type="languageAwareElement" minOccurs="0"/>
+ <xsd:element name="title" type="languageAwareElementType" minOccurs="0"/>
<xsd:element name="email" type="xsd:string"/>
<xsd:element name="phone" type="xsd:string" minOccurs="0"/>
<xsd:element name="role" type="xsd:string" maxOccurs="unbounded">
@@ -1497,7 +1497,7 @@
</xsd:sequence>
<xsd:attribute ref="lang"/>
</xsd:complexType>
- <xsd:complexType name="entityInformation">
+ <xsd:complexType name="entityInformationType">
<xsd:annotation>
<xsd:documentation>Entity information.</xsd:documentation>
</xsd:annotation>
@@ -1508,7 +1508,7 @@
entity.</xsd:documentation>
</xsd:annotation>
</xsd:element>
- <xsd:element name="name" type="languageAwareElement" maxOccurs="unbounded">
+ <xsd:element name="name" type="languageAwareElementType" maxOccurs="unbounded">
<xsd:annotation>
<xsd:documentation>The name of the entity possibly in different
languages.</xsd:documentation>
@@ -1524,7 +1524,7 @@
<xsd:documentation>A URL to a small logo of the entity.</xsd:documentation>
</xsd:annotation>
</xsd:element>
- <xsd:element name="description" type="languageAwareElement" minOccurs="0" maxOccurs="unbounded">
+ <xsd:element name="description" type="languageAwareElementType" minOccurs="0" maxOccurs="unbounded">
<xsd:annotation>
<xsd:documentation>The description of the entity possibly in different
languages.</xsd:documentation>
@@ -1536,18 +1536,18 @@
specified URL.</xsd:documentation>
</xsd:annotation>
</xsd:element>
- <xsd:element name="contact" type="contactInformation" maxOccurs="unbounded"/>
+ <xsd:element name="contact" type="contactInformationType" maxOccurs="unbounded"/>
<xsd:element name="geoLocation" type="geoLocationType" minOccurs="0"/>
</xsd:sequence>
<xsd:attribute ref="lang"/>
</xsd:complexType>
- <xsd:complexType name="relatedEntityInformation">
+ <xsd:complexType name="relatedEntityInformationType">
<xsd:annotation>
<xsd:documentation>Information about an entity that may have some relationship with the
service being provided.</xsd:documentation>
</xsd:annotation>
<xsd:complexContent>
- <xsd:extension base="entityInformation">
+ <xsd:extension base="entityInformationType">
<xsd:sequence>
<xsd:element name="role" type="xsd:string" maxOccurs="unbounded">
<xsd:annotation>
@@ -1567,7 +1567,7 @@
<xsd:attribute name="long" type="xsd:double" use="required"/>
</xsd:complexType>
<!-- ===== INVENTORY===== -->
- <xsd:complexType name="inventoryResult">
+ <xsd:complexType name="inventoryResultType">
<xsd:annotation>
<xsd:documentation>Format of inventory operation result.</xsd:documentation>
</xsd:annotation>
@@ -1604,7 +1604,7 @@
<xsd:attribute name="count" type="xsd:positiveInteger" use="optional"/>
</xsd:complexType>
</xsd:element>
- <xsd:element name="summary" type="resultSummary">
+ <xsd:element name="summary" type="resultSummaryType">
<xsd:annotation>
<xsd:documentation>Used to show information about the number of records for
counting and paging purposes.</xsd:documentation>
@@ -1613,13 +1613,13 @@
</xsd:sequence>
</xsd:complexType>
<!-- ===== SEARCH ===== -->
- <xsd:complexType name="searchResult">
+ <xsd:complexType name="searchResultType">
<xsd:annotation>
<xsd:documentation>Format of search operation result.</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:any/>
- <xsd:element name="summary" type="resultSummary">
+ <xsd:element name="summary" type="resultSummaryType">
<xsd:annotation>
<xsd:documentation>Used to show information about the number of records for
counting and paging purposes.</xsd:documentation>
