fixed issues with ns declarations

openaire · Jul 18, 2017 · 7ab155a · 7ab155a
1 parent 44aa635
commit 7ab155a
Show file tree

Hide file tree

Showing 13 changed files with 83 additions and 48 deletions.
diff --git a/schemas/accessRight-v4.xsd b/schemas/accessRight-v4.xsd
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://openaire.eu/schema/v4" targetNamespace="http://openaire.eu/schema/v4" elementFormDefault="qualified">
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" 
+	xmlns="http://openaire.eu/schema/v4" 
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	targetNamespace="http://openaire.eu/schema/v4" 
+	elementFormDefault="qualified"
+	xsi:schemaLocation="http://www.w3.org/2001/XMLSchema https://www.w3.org/2012/04/XMLSchema.xsd">
     <xs:simpleType name="accessRight" id="accessRight">
         <xs:annotation>
             <xs:documentation>The main access right of the resource. Choose an SKOS-Concept-URI from the COAR access right vocabulary</xs:documentation>

diff --git a/schemas/bibo.xsd b/schemas/bibo.xsd
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
-	targetNamespace="http://purl.org/ontology/bibo/" xmlns="http://purl.org/ontology/bibo/"
-	elementFormDefault="qualified" attributeFormDefault="unqualified">
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	targetNamespace="http://purl.org/ontology/bibo/" 
+	xmlns="http://purl.org/ontology/bibo/"
+	elementFormDefault="qualified" 
+	attributeFormDefault="unqualified"
+	xsi:schemaLocation="http://www.w3.org/2001/XMLSchema https://www.w3.org/2012/04/XMLSchema.xsd">
 
 	<!-- This is not the full bibo, just the elements we might intend to reuse -->
 	<xs:element name="status" type="xs:string"/>

diff --git a/schemas/datacite-contributorType-v4.xsd b/schemas/datacite-contributorType-v4.xsd
@@ -3,7 +3,12 @@
    2013-05 v3.0: Addition of ID to simpleType element, added values "ResearchGroup" & "Other"
    2014-08-20 v3.1: Addition of value "DataCurator"
    2015-05-14 v4.0 dropped value "Funder", use new "funderReference" -->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://datacite.org/schema/kernel-4" targetNamespace="http://datacite.org/schema/kernel-4" elementFormDefault="qualified">
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" 
+	xmlns="http://datacite.org/schema/kernel-4" 
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	targetNamespace="http://datacite.org/schema/kernel-4" 
+	elementFormDefault="qualified"
+	xsi:schemaLocation="http://www.w3.org/2001/XMLSchema https://www.w3.org/2012/04/XMLSchema.xsd">
   <xs:simpleType name="contributorType" id="contributorType">
     <xs:annotation>
       <xs:documentation>The type of contributor of the resource.</xs:documentation>

diff --git a/schemas/datacite-dateType-v4.xsd b/schemas/datacite-dateType-v4.xsd
@@ -1,7 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Version 1.0 - Created 2011-01-13 - FZ, TIB, Germany
      2013-05 v3.0: Addition of ID to simpleType element; addition of value "Collected"; deleted "StartDate" & "EndDate"-->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://datacite.org/schema/kernel-4" targetNamespace="http://datacite.org/schema/kernel-4" elementFormDefault="qualified">
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" 
+	xmlns="http://datacite.org/schema/kernel-4" 
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+	targetNamespace="http://datacite.org/schema/kernel-4" 
+	elementFormDefault="qualified"
+	xsi:schemaLocation="http://www.w3.org/2001/XMLSchema https://www.w3.org/2012/04/XMLSchema.xsd">
   <xs:simpleType name="dateType" id="dateType">
     <xs:annotation>
       <xs:documentation>The type of date. Use RKMS‐ISO8601 standard for depicting date ranges.To indicate the end of an embargo period, use Available. To indicate the start of an embargo period, use Submitted or Accepted, as appropriate.</xs:documentation>

diff --git a/schemas/datacite-funderIdentifierType-v4.xsd b/schemas/datacite-funderIdentifierType-v4.xsd
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Version 1.0 - Created 2016-05-14 -->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://datacite.org/schema/kernel-4" targetNamespace="http://datacite.org/schema/kernel-4" elementFormDefault="qualified">
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" 
+	xmlns="http://datacite.org/schema/kernel-4" 
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	targetNamespace="http://datacite.org/schema/kernel-4" 
+	elementFormDefault="qualified"
+	xsi:schemaLocation="http://www.w3.org/2001/XMLSchema https://www.w3.org/2012/04/XMLSchema.xsd">
   <xs:simpleType name="funderIdentifierType" id="funderIdentifierType">
     <xs:annotation>
       <xs:documentation>The type of the funderIdentifier.</xs:documentation>

diff --git a/schemas/datacite-relatedIdentifierType-v4.xsd b/schemas/datacite-relatedIdentifierType-v4.xsd
@@ -3,7 +3,12 @@
   2013-05 v3.0: Addition of ID to simpleType element; addition of value "PMID"
   2014-08-20 v3.1: Addition of values "arxiv" and "bibcode"
   2015-02-12 v4.0 Addition of value "IGSN" -->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://datacite.org/schema/kernel-4" targetNamespace="http://datacite.org/schema/kernel-4" elementFormDefault="qualified">
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" 
+	xmlns="http://datacite.org/schema/kernel-4"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"	
+	targetNamespace="http://datacite.org/schema/kernel-4" 
+	elementFormDefault="qualified"
+	xsi:schemaLocation="http://www.w3.org/2001/XMLSchema https://www.w3.org/2012/04/XMLSchema.xsd">
   <xs:simpleType name="relatedIdentifierType" id="relatedIdentifierType">
     <xs:annotation>
       <xs:documentation>The type of the RelatedIdentifier.</xs:documentation>

diff --git a/schemas/datacite-relationType-v4.xsd b/schemas/datacite-relationType-v4.xsd
@@ -3,7 +3,12 @@
   2011-01-13 v1.0 - FZ, TIB, Germany
   2013-05 v3.0: Addition of ID to simpleType element, addition of values "IsIdenticalTo", "HasMetadata" & "IsMetadataFor"
   2014-08-20 v3.1: Addition of values "Reviews" & "IsReviewedBy" and "IsDerivedFrom" & "IsSourceOf"-->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://datacite.org/schema/kernel-4" targetNamespace="http://datacite.org/schema/kernel-4" elementFormDefault="qualified">
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" 
+	xmlns="http://datacite.org/schema/kernel-4" 
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	targetNamespace="http://datacite.org/schema/kernel-4" 
+	elementFormDefault="qualified"
+	xsi:schemaLocation="http://www.w3.org/2001/XMLSchema https://www.w3.org/2012/04/XMLSchema.xsd">
   <xs:simpleType name="relationType" id="relationType">
     <xs:annotation>
       <xs:documentation>Description of the relationship of the resource being registered (A) and the related resource (B).</xs:documentation>

diff --git a/schemas/datacite_v4.xsd b/schemas/datacite_v4.xsd
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://datacite.org/schema/kernel-4"
-    targetNamespace="http://datacite.org/schema/kernel-4" elementFormDefault="qualified">
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" 
+	xmlns="http://datacite.org/schema/kernel-4"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	targetNamespace="http://datacite.org/schema/kernel-4" 
+	elementFormDefault="qualified"
+	xsi:schemaLocation="http://www.w3.org/2001/XMLSchema https://www.w3.org/2012/04/XMLSchema.xsd">
 
     <xs:include schemaLocation="datacite-contributorType-v4.xsd"/>
     <xs:include schemaLocation="datacite-funderIdentifierType-v4.xsd"/>

diff --git a/schemas/dcmes-dc.xsd b/schemas/dcmes-dc.xsd
@@ -1,13 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE schema PUBLIC "-//W3C//DTD XMLSchema 200102//EN"
-"http://www.w3.org/2001/XMLSchema.dtd" [
-<!ENTITY % p ''>
-<!ENTITY % s ''>
-]>
 <schema xmlns="http://www.w3.org/2001/XMLSchema"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
         xmlns:dc="http://purl.org/dc/elements/1.1/"
-        targetNamespace="http://purl.org/dc/elements/1.1/">
+	targetNamespace="http://purl.org/dc/elements/1.1/"
+	xsi:schemaLocation="http://www.w3.org/2001/XMLSchema https://www.w3.org/2012/04/XMLSchema.xsd">
 
   <annotation>
     <documentation xml:lang="en"

diff --git a/schemas/dcmes-rdf.xsd b/schemas/dcmes-rdf.xsd
@@ -1,13 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE schema PUBLIC "-//W3C//DTD XMLSchema 200102//EN"
-"http://www.w3.org/2001/XMLSchema.dtd" [
-<!ENTITY % p ''>
-<!ENTITY % s ''>
-]>
 <schema xmlns="http://www.w3.org/2001/XMLSchema"
         xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-        xmlns:dc="http://purl.org/dc/elements/1.1/"
-        targetNamespace="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+	xmlns:dc="http://purl.org/dc/elements/1.1/"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	targetNamespace="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+	xsi:schemaLocation="http://www.w3.org/2001/XMLSchema https://www.w3.org/2012/04/XMLSchema.xsd">
 
    <annotation>
      <documentation xml:lang="en"

diff --git a/schemas/dcmes-xml-xsd.xsd b/schemas/dcmes-xml-xsd.xsd
@@ -1,17 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE schema PUBLIC "-//W3C//DTD XMLSchema 200102//EN"
-"http://www.w3.org/2001/XMLSchema.dtd" [
-<!ENTITY % p ''>
-<!ENTITY % s ''>
-]>
-<xsi:schema xmlns:xsi="http://www.w3.org/2001/XMLSchema"
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+       	    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-            xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
             xmlns:t="http://dublincore.org/documents/2002/07/31/dcmes-xml/"
-            targetNamespace="http://dublincore.org/documents/2002/07/31/dcmes-xml/">
+	    targetNamespace="http://dublincore.org/documents/2002/07/31/dcmes-xml/"
+	    xsi:schemaLocation="http://www.w3.org/2001/XMLSchema https://www.w3.org/2012/04/XMLSchema.xsd">
 
-  <xsi:annotation>
-    <xsi:documentation xml:lang="en"
+  <xs:annotation>
+    <xs:documentation xml:lang="en"
                        source="http://dublincore.org/documents/2002/07/31/dcmes-xml/">
 
   W3C XML Schema 2002-07-31 by Dave Beckett - http://purl.org/net/dajobe
@@ -29,20 +25,20 @@
 
     This W3C XML Schema is for information only
 
-    </xsi:documentation>
-  </xsi:annotation>
+    </xs:documentation>
+  </xs:annotation>
 
  <!-- Import the RDF namespace schema for rdf:RDF -->
- <xsi:import namespace="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ <xs:import namespace="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
              schemaLocation="dcmes-rdf.xsd"/>
 
  <!-- Define an element 'top', abstract so it can never be used -->
- <xsi:element name="top" abstract="true">
-   <xsi:complexType>
-     <xsi:sequence>
-       <xsi:element ref="rdf:RDF"/>
-     </xsi:sequence>
-   </xsi:complexType>
- </xsi:element>
-
-</xsi:schema>
+ <xs:element name="top" abstract="true">
+   <xs:complexType>
+     <xs:sequence>
+       <xs:element ref="rdf:RDF"/>
+     </xs:sequence>
+   </xs:complexType>
+ </xs:element>
+
+</xs:schema>
diff --git a/schemas/openaire-v4.xsd b/schemas/openaire-v4.xsd
@@ -1,14 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xs:schema 
-  xmlns:xs ="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified"
+	xmlns:xs ="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xmlns:dc="http://purl.org/dc/elements/1.1/"
   xmlns:datacite="http://datacite.org/schema/kernel-4"
   xmlns:bibo="http://purl.org/ontology/bibo/"
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
   xmlns:vc="http://www.w3.org/2007/XMLSchema-versioning"
   xmlns="http://openaire.eu/schema/v4"
   targetNamespace="http://openaire.eu/schema/v4"
-  vc:minVersion="1.1">
+  vc:minVersion="1.1"
+  xsi:schemaLocation="http://www.w3.org/2001/XMLSchema https://www.w3.org/2012/04/XMLSchema.xsd">
 
   <xs:import namespace="http://purl.org/dc/elements/1.1/"
     schemaLocation="dcmes-dc.xsd"/>

diff --git a/schemas/resourceType-v4.xsd b/schemas/resourceType-v4.xsd
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://openaire.eu/schema/v4" targetNamespace="http://openaire.eu/schema/v4" elementFormDefault="qualified">
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" 
+	xmlns="http://openaire.eu/schema/v4" 
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	targetNamespace="http://openaire.eu/schema/v4" 
+	elementFormDefault="qualified"
+	xsi:schemaLocation="http://www.w3.org/2001/XMLSchema https://www.w3.org/2012/04/XMLSchema.xsd">
     <xs:simpleType name="resourceType" id="resourceType">
         <xs:annotation>
             <xs:documentation>The type of the resource. Choose an SKOS-Concept-URI from the COAR resource type vocabulary</xs:documentation>