[Volute] r4928 - trunk/projects/grid/vospace/doc

Volute commit messages volutecommits at g-vo.org
Wed Apr 18 01:19:41 CEST 2018


Author: major.brian
Date: Wed Apr 18 01:19:41 2018
New Revision: 4928

Log:
added optional version attribute to other top-level elements

Modified:
   trunk/projects/grid/vospace/doc/VOSpace-2.1.xsd

Modified: trunk/projects/grid/vospace/doc/VOSpace-2.1.xsd
==============================================================================
--- trunk/projects/grid/vospace/doc/VOSpace-2.1.xsd	Tue Apr 17 17:54:37 2018	(r4927)
+++ trunk/projects/grid/vospace/doc/VOSpace-2.1.xsd	Wed Apr 18 01:19:41 2018	(r4928)
@@ -3,11 +3,22 @@
     attributeFormDefault="unqualified"
     version="2.1-PR-20170924"
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
-    xmlns:vos="http://www.ivoa.net/xml/VOSpace/v2.1"
+    xmlns:vos="http://www.ivoa.net/xml/VOSpace/v2.0"
     xmlns:uws="http://www.ivoa.net/xml/UWS/v1.0"
-    xmlns:xlink="http://www.w3.org/1999/xlink">
+    xmlns:xlink="http://www.w3.org/1999/xlink"
+    version="2.1">
   <xs:import namespace="http://www.ivoa.net/xml/UWS/v1.0" schemaLocation="http://www.ivoa.net/xml/UWS/v1.0"/>
 
+    <!--  VOSpace 2.1 (as noted with the "version" tag) - targetNamespace remains 2.0
+      for backwards compatibility -->
+
+  <xs:simpleType name="VOSVersion">
+    <xs:annotation>
+      <xs:documentation>The version of the VOSpace standard. </xs:documentation>
+    </xs:annotation>
+    <xs:restriction base="xs:string"/>
+  </xs:simpleType>
+
   <!-- ======== Node types ======== -->
 
   <xs:complexType name="Node">
@@ -32,6 +43,11 @@
         </xs:documentation>
       </xs:annotation>
     </xs:attribute>
+    <xs:attribute name="version" type="vos:VOSVersion" use="optional">
+       <xs:annotation>
+          <xs:documentation>The version of this VOSpace document.</xs:documentation>
+       </xs:annotation>
+    </xs:attribute>
   </xs:complexType>
 
   <xs:complexType name="DataNode">
@@ -174,6 +190,11 @@
     <xs:sequence>
       <xs:element name="property" type="vos:Property" minOccurs="0" maxOccurs="unbounded" nillable="true"/>
     </xs:sequence>
+    <xs:attribute name="version" type="vos:VOSVersion" use="optional">
+       <xs:annotation>
+          <xs:documentation>The version of this VOSpace document.</xs:documentation>
+       </xs:annotation>
+    </xs:attribute>
   </xs:complexType>
 
   <xs:complexType name="PropertyReference">
@@ -309,6 +330,11 @@
     <xs:sequence>
       <xs:element name="view" type="vos:View" minOccurs="0" maxOccurs="unbounded" nillable="true"/>
     </xs:sequence>
+    <xs:attribute name="version" type="vos:VOSVersion" use="optional">
+       <xs:annotation>
+          <xs:documentation>The version of this VOSpace document.</xs:documentation>
+       </xs:annotation>
+    </xs:attribute>
   </xs:complexType>
 
   <xs:complexType name="GetViewsResponse">
@@ -405,6 +431,11 @@
     <xs:sequence>
       <xs:element name="protocol" type="vos:Protocol" minOccurs="0" maxOccurs="unbounded" nillable="true"/>
     </xs:sequence>
+    <xs:attribute name="version" type="vos:VOSVersion" use="optional">
+       <xs:annotation>
+          <xs:documentation>The version of this VOSpace document.</xs:documentation>
+       </xs:annotation>
+    </xs:attribute>
   </xs:complexType>
 
   <xs:complexType name="GetProtocolsResponse">
@@ -475,6 +506,11 @@
     <xs:sequence>
       <xs:element name="capability" type="vos:Capability" minOccurs="0" maxOccurs="unbounded" nillable="true"/>
     </xs:sequence>
+    <xs:attribute name="version" type="vos:VOSVersion" use="optional">
+       <xs:annotation>
+          <xs:documentation>The version of this VOSpace document.</xs:documentation>
+       </xs:annotation>
+    </xs:attribute>
   </xs:complexType>
 
   <!-- ======== Node list type ======== -->
@@ -577,23 +613,12 @@
         </xs:element>
     </xs:sequence>
     <xs:attribute name="version" type="vos:VOSVersion" use="optional">
-      <xs:annotation>
-        <xs:documentation>
-          Note that this attribute is actually required by the 2.1 specification - however remains optional in the schema for backwards compatibility. It will be formally required in the next major revision.
-        </xs:documentation>
-      </xs:annotation>
+       <xs:annotation>
+          <xs:documentation>The version of this VOSpace document.</xs:documentation>
+       </xs:annotation>
     </xs:attribute>
   </xs:complexType>
 
-  <xs:simpleType name="VOSVersion">
-    <xs:annotation>
-      <xs:documentation>
-        The version of the VOSpace standard that the server complies with.
-      </xs:documentation>
-    </xs:annotation>
-    <xs:restriction base="xs:string"/>
-  </xs:simpleType>
-
   <!-- ======== Response representations ======== -->
 
   <xs:element name="protocols" type="vos:ProtocolList"/>


More information about the Volutecommits mailing list