[Volute] r3981 - trunk/projects/dm/vo-dml/xsd/ext

Volute commit messages volutecommits at g-vo.org
Thu Apr 27 16:53:12 CEST 2017


Author: lmichel
Date: Thu Apr 27 16:53:12 2017
New Revision: 3981

Log:
The schema <import>, with 2 different name spaces for VOTABLE and VODML, has been replaced with a schema <include>  with the same name space  for VOTABLE and VODML. This prevents issues with some validators.

Modified:
   trunk/projects/dm/vo-dml/xsd/ext/VOTable-1.4_extvodml.xsd

Modified: trunk/projects/dm/vo-dml/xsd/ext/VOTable-1.4_extvodml.xsd
==============================================================================
--- trunk/projects/dm/vo-dml/xsd/ext/VOTable-1.4_extvodml.xsd	Thu Apr 27 16:52:39 2017	(r3980)
+++ trunk/projects/dm/vo-dml/xsd/ext/VOTable-1.4_extvodml.xsd	Thu Apr 27 16:53:12 2017	(r3981)
@@ -9,12 +9,11 @@
 	to stay compatible with 1.1 .Version 1.3: MT: Added BINARY2 element .Version 1.3: MT: Further relaxed LINK content-role type 
 	to token -->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified"
-	xmlns="http://www.ivoa.net/xml/VOTable/v1.4_vodml" targetNamespace="http://www.ivoa.net/xml/VOTable/v1.4_vodml"
-  xmlns:vodml="http://www.ivoa.net/xml/VODML_Mapping/v0.x"
-  >
-
-      <xs:import namespace="http://www.ivoa.net/xml/VODML_Mapping/v0.x"
-               schemaLocation="http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/xsd/ext/VODML-mapping.xsd"/>
+	xmlns="http://www.ivoa.net/xml/VOTable/v1.4_vodml" targetNamespace="http://www.ivoa.net/xml/VOTable/v1.4_vodml">
+	<!-- 
+		Include the VOML mapping within a unique namespace (workaround for validator issues) (LM)
+	 -->
+    <xs:include schemaLocation="VODML-mapping.xsd"/>
   
 	<xs:annotation>
 		<xs:documentation>
@@ -481,7 +480,7 @@
 	<xs:element name="VOTABLE">
 		<xs:complexType>
 			<xs:sequence>
-				<xs:element name="VODML" type="vodml:VODML" minOccurs="0" />
+				<xs:element name="VODML" type="VODML" minOccurs="0" />
 				<xs:element name="DESCRIPTION" type="anyTEXT" minOccurs="0" />
 				<xs:element name="DEFINITIONS" type="Definitions" minOccurs="0" />
 				<!-- Deprecated -->


More information about the Volutecommits mailing list