From: Mathieu Baudier <mbaudier@argeo.org>
Date: Tue, 31 May 2022 08:53:41 +0000 (+0200)
Subject: Use local XSD imports.
X-Git-Tag: v2.3.10~210
X-Git-Url: https://git.argeo.org/?a=commitdiff_plain;ds=sidebyside;h=ceb6d574e9ea49fcac490d0923d23f259f271f8d;p=lgpl%2Fargeo-commons.git

Use local XSD imports.
---

diff --git a/org.argeo.cms/src/org/argeo/cms/acr/schemas/SVG.xsd b/org.argeo.cms/src/org/argeo/cms/acr/schemas/SVG.xsd
index a298f7f4b..7cb1689ad 100644
--- a/org.argeo.cms/src/org/argeo/cms/acr/schemas/SVG.xsd
+++ b/org.argeo.cms/src/org/argeo/cms/acr/schemas/SVG.xsd
@@ -3,7 +3,7 @@
 <schema targetNamespace="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" elementFormDefault="unqualified" attributeFormDefault="unqualified" xml:lang="en">
   <!-- don't declare the XML namespace; it is predeclared and redeclaring it upsets some software -->
   <import namespace="http://www.w3.org/1999/xlink" schemaLocation="xlink.xsd"/>
-  <import namespace="http://www.w3.org/XML/1998/namespace"/>
+  <import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="xml.xsd"/>
   <!-- simpleTypes -->
   <simpleType name="BaselineShiftValueType">
     <annotation>
diff --git a/org.argeo.cms/src/org/argeo/cms/acr/schemas/XForms-11-Schema.xsd b/org.argeo.cms/src/org/argeo/cms/acr/schemas/XForms-11-Schema.xsd
index f17df3f53..881bfcb97 100644
--- a/org.argeo.cms/src/org/argeo/cms/acr/schemas/XForms-11-Schema.xsd
+++ b/org.argeo.cms/src/org/argeo/cms/acr/schemas/XForms-11-Schema.xsd
@@ -73,8 +73,8 @@ XForms 1.1
 13 JAN 2010 JMB: Put maxOccurs=1 on instance content to limit to one child element in an instance
 16 SEP 2010 JBM: Added xforms:duration datatype (1.1 Erratum #1), added UICommon before ListUICommon on select/select1 (1.1 Erratum #2)
 -->
-	<xsd:import namespace="http://www.w3.org/2001/xml-events" schemaLocation="http://www.w3.org/MarkUp/SCHEMA/xml-events-attribs-1.xsd"/>
-	<xsd:import namespace="http://www.w3.org/2001/XMLSchema" schemaLocation="http://www.w3.org/2001/XMLSchema.xsd"/>
+	<xsd:import namespace="http://www.w3.org/2001/xml-events" schemaLocation="xml-events-attribs-1.xsd"/>
+	<xsd:import namespace="http://www.w3.org/2001/XMLSchema" schemaLocation="XMLSchema.xsd"/>
 
 	<!--
 structural elements
diff --git a/org.argeo.cms/src/org/argeo/cms/acr/schemas/XMLSchema.xsd b/org.argeo.cms/src/org/argeo/cms/acr/schemas/XMLSchema.xsd
index 2e9a2729e..12c220911 100644
--- a/org.argeo.cms/src/org/argeo/cms/acr/schemas/XMLSchema.xsd
+++ b/org.argeo.cms/src/org/argeo/cms/acr/schemas/XMLSchema.xsd
@@ -88,7 +88,7 @@
       towards the end of this schema document</xs:documentation>
  </xs:annotation>
 
- <xs:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="http://www.w3.org/2001/xml.xsd">
+ <xs:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="xml.xsd">
    <xs:annotation>
      <xs:documentation>
        Get access to the xml: attribute groups for xml:lang
diff --git a/org.argeo.cms/src/org/argeo/cms/acr/schemas/schema-for-xslt20.xsd b/org.argeo.cms/src/org/argeo/cms/acr/schemas/schema-for-xslt20.xsd
index 0a95ffcff..30b1c5a07 100644
--- a/org.argeo.cms/src/org/argeo/cms/acr/schemas/schema-for-xslt20.xsd
+++ b/org.argeo.cms/src/org/argeo/cms/acr/schemas/schema-for-xslt20.xsd
@@ -54,14 +54,14 @@ The declaration of xml:space and xml:lang may need to be commented out because
 of problems processing the schema using various tools
 -->
       
-<xs:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="http://www.w3.org/2001/xml.xsd"/>
+<xs:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="xml.xsd"/>
 
 <!-- 
     An XSLT stylesheet may contain an in-line schema within an xsl:import-schema element,
     so the Schema for schemas needs to be imported
 -->
   
-<xs:import namespace="http://www.w3.org/2001/XMLSchema" schemaLocation="http://www.w3.org/2001/XMLSchema.xsd"/>
+<xs:import namespace="http://www.w3.org/2001/XMLSchema" schemaLocation="XMLSchema.xsd"/>
 
 <!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
 <xs:annotation>
diff --git a/org.argeo.cms/src/org/argeo/cms/acr/schemas/xlink.xsd b/org.argeo.cms/src/org/argeo/cms/acr/schemas/xlink.xsd
index 8e4d85242..e9ce6355a 100644
--- a/org.argeo.cms/src/org/argeo/cms/acr/schemas/xlink.xsd
+++ b/org.argeo.cms/src/org/argeo/cms/acr/schemas/xlink.xsd
@@ -47,7 +47,7 @@ constructs, e.g.
 </xs:schema>]]></xs:documentation>
  </xs:annotation>
 
- <xs:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="http://www.w3.org/2001/xml.xsd"/>
+ <xs:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="xml.xsd"/>
 
  <xs:attribute name="type" type="xlink:typeType"/>