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 a298f7f4b0e8372472a0e210351990c939813587..7cb1689ad103fce84ab99e080b68269abe9d9c5a 100644 (file)
--- 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">\r
   <!-- don't declare the XML namespace; it is predeclared and redeclaring it upsets some software -->\r
   <import namespace="http://www.w3.org/1999/xlink" schemaLocation="xlink.xsd"/>\r
-  <import namespace="http://www.w3.org/XML/1998/namespace"/>\r
+  <import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="xml.xsd"/>\r
   <!-- simpleTypes -->\r
   <simpleType name="BaselineShiftValueType">\r
     <annotation>\r

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 f17df3f5367286d45c246dc17fd944d9bb91676e..881bfcb976fe429333551a951524c8e0ab247826 100644 (file)
--- 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 2e9a2729ec5dcf3cba092c68cbe82de0d4527903..12c2209110e82ad035a8a13eeffec8139d9e92b9 100644 (file)
--- 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 0a95ffcffa5719f04ed366acca3aea2e07985a76..30b1c5a07ab70761cc45ca698a8aae7c61a326ff 100644 (file)
--- 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 8e4d8524239e592f91147cc53d9902df930dd2be..e9ce6355ac4bda6f578300fccdbe0dd46cfadf9e 100644 (file)
--- 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>\r
  </xs:annotation>\r
 \r
- <xs:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="http://www.w3.org/2001/xml.xsd"/>\r
+ <xs:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="xml.xsd"/>\r
 \r
  <xs:attribute name="type" type="xlink:typeType"/>\r
 \r