sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject [sis] 03/03: Change default namespace of legacy "gmd" metadata from "http://schemas.opengis.net/iso/19139/20070417/" to "http://www.isotc211.org/2005/" and update XML documentation accordingly. The new documentation anticipate on support for control on gmi and gml namespace, to be provided in a next commit. The change required that we move ISO schema location from "http" to "https" protocol in order to tests. However SchemaComplianceTest is now broken, until we also move from "http" to "https" in GeoAP [...]
Date Thu, 14 Nov 2019 15:50:04 GMT
This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git

commit 8afd4db2a4bb1d09edbb54c75f2456ebd4b71776
Author: Martin Desruisseaux <martin.desruisseaux@geomatys.com>
AuthorDate: Thu Nov 14 16:16:14 2019 +0100

    Change default namespace of legacy "gmd" metadata from "http://schemas.opengis.net/iso/19139/20070417/" to "http://www.isotc211.org/2005/" and update XML documentation accordingly. The new documentation anticipate on support for control on gmi and gml namespace, to be provided in a next commit. The change required that we move ISO schema location from "http" to "https" protocol in order to tests. However SchemaComplianceTest is now broken, until we also move from "http" to "https" in  [...]
    
    https://issues.apache.org/jira/browse/SIS-479
    https://issues.apache.org/jira/browse/SIS-480
---
 .../apache/sis/internal/jaxb/cat/CodeListUID.java  |  6 +-
 .../internal/jaxb/gco/ObjectIdentification.html    |  2 +-
 .../sis/internal/jaxb/gco/ObjectReference.java     |  2 +-
 .../org/apache/sis/internal/jaxb/gml/Measure.java  |  4 +-
 .../java/org/apache/sis/internal/xml/Schemas.java  |  6 +-
 .../sis/metadata/iso/acquisition/package-info.java |  2 +-
 .../sis/metadata/iso/citation/package-info.java    |  2 +-
 .../sis/metadata/iso/constraint/package-info.java  |  2 +-
 .../sis/metadata/iso/content/package-info.java     |  2 +-
 .../metadata/iso/distribution/package-info.java    |  2 +-
 .../sis/metadata/iso/extent/package-info.java      |  2 +-
 .../metadata/iso/identification/package-info.java  |  2 +-
 .../sis/metadata/iso/lineage/package-info.java     |  2 +-
 .../sis/metadata/iso/maintenance/package-info.java |  2 +-
 .../org/apache/sis/metadata/iso/package-info.java  |  2 +-
 .../sis/metadata/iso/quality/package-info.java     |  2 +-
 .../sis/metadata/iso/spatial/package-info.java     |  2 +-
 .../src/main/java/org/apache/sis/xml/Pooled.java   |  2 +-
 .../src/main/java/org/apache/sis/xml/XML.java      | 38 ++++++----
 .../apache/sis/internal/jaxb/gml/MeasureTest.java  |  6 +-
 .../sis/internal/jaxb/lan/LanguageCodeTest.java    |  2 +-
 .../iso/citation/DefaultResponsibilityTest.java    |  4 +-
 .../constraint/DefaultLegalConstraintsTest.java    |  2 +-
 .../iso/identification/DefaultResolutionTest.java  |  4 +-
 .../org/apache/sis/test/xml/PackageVerifier.java   | 10 ++-
 .../org/apache/sis/metadata/xml/2007/Citation.xml  | 12 +--
 .../org/apache/sis/metadata/xml/2007/Extent.xml    |  2 +-
 .../org/apache/sis/metadata/xml/2007/Locales.xml   | 26 +++----
 .../org/apache/sis/metadata/xml/2007/Metadata.xml  | 88 +++++++++++-----------
 .../apache/sis/metadata/xml/2007/Multiplicity.xml  |  2 +-
 .../sis/metadata/xml/2007/PositionalAccuracy.xml   |  4 +-
 .../apache/sis/metadata/xml/2007/ProcessStep.xml   |  2 +-
 .../metadata/xml/2007/ServiceIdentification.xml    |  4 +-
 .../org/apache/sis/metadata/xml/2016/Citation.xml  |  4 +-
 .../org/apache/sis/metadata/xml/2016/Extent.xml    |  2 +-
 .../org/apache/sis/metadata/xml/2016/Locales.xml   |  2 +-
 .../org/apache/sis/metadata/xml/2016/Metadata.xml  | 28 +++----
 .../apache/sis/metadata/xml/2016/Multiplicity.xml  |  3 +-
 .../sis/metadata/xml/2016/PositionalAccuracy.xml   |  6 +-
 .../apache/sis/metadata/xml/2016/ProcessStep.xml   |  2 +-
 .../metadata/xml/2016/ServiceIdentification.xml    |  2 +-
 .../integration/Metadata with vertical CRS.xml     | 14 ++--
 .../org/apache/sis/test/integration/Metadata.xml   | 42 +++++------
 .../java/org/apache/sis/internal/util/XPaths.java  |  4 +-
 .../java/org/apache/sis/measure/UnitFormat.java    |  2 +-
 .../sis/internal/util/DefinitionURITest.java       |  1 +
 .../org/apache/sis/internal/util/XPathsTest.java   |  7 +-
 .../org/apache/sis/measure/UnitFormatTest.java     |  2 +-
 .../java/org/apache/sis/measure/UnitsTest.java     |  2 +-
 .../internal/profile/fra/DirectReferenceSystem.xml |  4 +-
 src/main/javadoc/sis.css                           |  7 +-
 51 files changed, 198 insertions(+), 188 deletions(-)

diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/cat/CodeListUID.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/cat/CodeListUID.java
index 36444c9..f1a6054 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/cat/CodeListUID.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/cat/CodeListUID.java
@@ -58,9 +58,9 @@ public final class CodeListUID {
      *
      * <ul>
      *   <li>{@code "http://standards.iso.org/iso/19115/resources/Codelist/cat/codelists.xml#LanguageCode"}</li>
-     *   <li>{@code "http://schemas.opengis.net/iso/19139/20070417/resources/Codelist/gmxCodelists.xml#LanguageCode"}</li>
-     *   <li>{@code "http://schemas.opengis.net/iso/19139/20070417/resources/Codelist/gmxCodelists.xml#MD_CharacterSetCode"}</li>
-     *   <li>{@code "http://schemas.opengis.net/iso/19139/20070417/resources/Codelist/gmxCodelists.xml#CI_OnLineFunctionCode"}</li>
+     *   <li>{@code "http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#LanguageCode"}</li>
+     *   <li>{@code "http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#MD_CharacterSetCode"}</li>
+     *   <li>{@code "http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#CI_OnLineFunctionCode"}</li>
      * </ul>
      *
      * @param  context     the current (un)marshalling context, or {@code null} if none.
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gco/ObjectIdentification.html b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gco/ObjectIdentification.html
index ae171ba..d2f0c3f 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gco/ObjectIdentification.html
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gco/ObjectIdentification.html
@@ -53,7 +53,7 @@
           unique identifier, but only available within GCO context.</li>
     </ul>
 
-    <p>However according the <a href="http://schemas.opengis.net/iso/19139/20070417/gco/gcoBase.xsd">OGC schema</a>,
+    <p>However according the <a href="https://www.isotc211.org/2005/gco/gcoBase.xsd">OGC/ISO schema</a>,
        those identifiers seem to be defined in the GCO schema.</p>
   </body>
 </html>
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gco/ObjectReference.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gco/ObjectReference.java
index 7910f55..adaf37c 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gco/ObjectReference.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gco/ObjectReference.java
@@ -43,7 +43,7 @@ import org.apache.sis.internal.jaxb.SpecializedIdentifier;
  *
  * @see PropertyType
  * @see <a href="ObjectIdentification.html">ObjectIdentification</a>
- * @see <a href="http://schemas.opengis.net/iso/19139/20070417/gco/gcoBase.xsd">OGC schema</a>
+ * @see <a href="https://www.isotc211.org/2005/gco/gcoBase.xsd">OGC/ISO schema</a>
  *
  * @since 0.3
  * @module
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/Measure.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/Measure.java
index 13e8ddb..e9d94b1 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/Measure.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/Measure.java
@@ -49,7 +49,7 @@ import org.apache.sis.measure.Units;
  *
  * {@preformat xml
  *   <mri:distance>
- *     <gco:Distance uom="http://schemas.opengis.net/iso/19139/20070417/resources/uom/gmxUom.xml#xpointer(//*[@gml:id='m'])">1000.0</gco:Distance>
+ *     <gco:Distance uom="http://www.isotc211.org/2005/resources/uom/gmxUom.xml#xpointer(//*[@gml:id='m'])">1000.0</gco:Distance>
  *   </mri:distance>
  * }
  *
@@ -133,8 +133,8 @@ public final class Measure {
      * or one of the following:
      *
      * {@preformat text
-     *     http://schemas.opengis.net/iso/19139/20070417/resources/uom/gmxUom.xml#xpointer(//*[@gml:id='m'])
      *     http://www.isotc211.org/2005/resources/uom/gmxUom.xml#xpointer(//*[@gml:id='m'])
+     *     http://schemas.opengis.net/iso/19139/20070417/resources/uom/gmxUom.xml#xpointer(//*[@gml:id='m'])
      * }
      *
      * @return the string representation of the unit of measure.
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/xml/Schemas.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/xml/Schemas.java
index 656461e..14e3b09 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/xml/Schemas.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/xml/Schemas.java
@@ -42,7 +42,7 @@ package org.apache.sis.internal.xml;
  *
  * @author  Martin Desruisseaux (Geomatys)
  * @author  Cullen Rombach (Image Matters)
- * @version 1.0
+ * @version 1.1
  * @since   0.4
  * @module
  */
@@ -59,11 +59,11 @@ public final class Schemas {
      * Some alternatives to this URL are:
      *
      * <ul>
+     *   <li>http://schemas.opengis.net/iso/19139/20070417/</li>
      *   <li>http://standards.iso.org/ittf/PubliclyAvailableStandards/ISO_19139_Schemas/</li>
-     *   <li>http://www.isotc211.org/2005/</li>
      * </ul>
      */
-    public static final String METADATA_ROOT_LEGACY = "http://schemas.opengis.net/iso/19139/20070417/";
+    public static final String METADATA_ROOT_LEGACY = "http://www.isotc211.org/2005/";
 
     /**
      * The string to append to {@link #METADATA_ROOT} for obtaining the path to the definitions of code lists.
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/package-info.java b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/package-info.java
index 7161170..1db697b 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/package-info.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/package-info.java
@@ -91,7 +91,7 @@
  * @since   0.3
  * @module
  */
-@XmlSchema(location="http://standards.iso.org/iso/19115/-3/mac/1.0/mac.xsd",
+@XmlSchema(location="https://standards.iso.org/iso/19115/-3/mac/1.0/mac.xsd",
            elementFormDefault=XmlNsForm.QUALIFIED, namespace=Namespaces.MAC,
            xmlns = {
                 @XmlNs(prefix = "mac", namespaceURI = Namespaces.MAC),      // Metadata for Acquisition
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/package-info.java b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/package-info.java
index 4e5b356..28e6bca 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/package-info.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/package-info.java
@@ -91,7 +91,7 @@
  * @since   0.3
  * @module
  */
-@XmlSchema(location="http://standards.iso.org/iso/19115/-3/cit/1.0/cit.xsd",
+@XmlSchema(location="https://standards.iso.org/iso/19115/-3/cit/1.0/cit.xsd",
            elementFormDefault=XmlNsForm.QUALIFIED, namespace=Namespaces.CIT,
            xmlns = {
                 @XmlNs(prefix = "cit", namespaceURI = Namespaces.CIT),      // Citation and responsible party information
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/package-info.java b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/package-info.java
index 4a2d6b0..a048dab 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/package-info.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/package-info.java
@@ -68,7 +68,7 @@
  * @since   0.3
  * @module
  */
-@XmlSchema(location="http://standards.iso.org/iso/19115/-3/mco/1.0/mco.xsd",
+@XmlSchema(location="https://standards.iso.org/iso/19115/-3/mco/1.0/mco.xsd",
            elementFormDefault=XmlNsForm.QUALIFIED, namespace=Namespaces.MCO,
            xmlns = {
                 @XmlNs(prefix = "mco", namespaceURI = Namespaces.MCO),      // Metadata for Constraints
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/package-info.java b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/package-info.java
index 91fff93..38cccd3 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/package-info.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/package-info.java
@@ -85,7 +85,7 @@
  * @since   0.3
  * @module
  */
-@XmlSchema(location="http://standards.iso.org/iso/19115/-3/mrc/1.0/mrc.xsd",
+@XmlSchema(location="https://standards.iso.org/iso/19115/-3/mrc/1.0/mrc.xsd",
            elementFormDefault=XmlNsForm.QUALIFIED, namespace=Namespaces.MRC,
            xmlns = {
                 @XmlNs(prefix = "mrc", namespaceURI = Namespaces.MRC),      // Metadata for Resource Content
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/package-info.java b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/package-info.java
index dd9ce34..f391908 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/package-info.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/package-info.java
@@ -72,7 +72,7 @@
  * @since   0.3
  * @module
  */
-@XmlSchema(location="http://standards.iso.org/iso/19115/-3/mrd/1.0/mrd.xsd",
+@XmlSchema(location="https://standards.iso.org/iso/19115/-3/mrd/1.0/mrd.xsd",
            elementFormDefault=XmlNsForm.QUALIFIED, namespace=Namespaces.MRD,
            xmlns = {
                 @XmlNs(prefix = "mrd", namespaceURI = Namespaces.MRD),      // Metadata for Resource Distribution
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/package-info.java b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/package-info.java
index 685c216..d5d88c6 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/package-info.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/package-info.java
@@ -140,7 +140,7 @@
  * @since   0.3
  * @module
  */
-@XmlSchema(location="http://standards.iso.org/iso/19115/-3/gex/1.0/gex.xsd",
+@XmlSchema(location="https://standards.iso.org/iso/19115/-3/gex/1.0/gex.xsd",
            elementFormDefault=XmlNsForm.QUALIFIED, namespace=Namespaces.GEX,
            xmlns = {
                 @XmlNs(prefix = "gex", namespaceURI = Namespaces.GEX),      // Geospatial Extent
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/package-info.java b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/package-info.java
index a3a249a..61e0ecc 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/package-info.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/package-info.java
@@ -100,7 +100,7 @@
  * @since   0.3
  * @module
  */
-@XmlSchema(location="http://standards.iso.org/iso/19115/-3/mri/1.0/mri.xsd",
+@XmlSchema(location="https://standards.iso.org/iso/19115/-3/mri/1.0/mri.xsd",
            elementFormDefault=XmlNsForm.QUALIFIED, namespace=Namespaces.MRI,
            xmlns = {
                 @XmlNs(prefix = "mri",  namespaceURI = Namespaces.MRI),        // Metadata for Resource Identification
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/package-info.java b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/package-info.java
index 252f2ae..78181f9 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/package-info.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/package-info.java
@@ -70,7 +70,7 @@
  * @since   0.3
  * @module
  */
-@XmlSchema(location="http://standards.iso.org/iso/19115/-3/mrl/1.0/mrl.xsd",
+@XmlSchema(location="https://standards.iso.org/iso/19115/-3/mrl/1.0/mrl.xsd",
            elementFormDefault=XmlNsForm.QUALIFIED, namespace=Namespaces.MRL,
            xmlns = {
                 @XmlNs(prefix = "mrl", namespaceURI = Namespaces.MRL),      // Metadata for Resource Lineage
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/package-info.java b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/package-info.java
index 4b1119a..30b4edb 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/package-info.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/package-info.java
@@ -67,7 +67,7 @@
  * @since   0.3
  * @module
  */
-@XmlSchema(location="http://standards.iso.org/iso/19115/-3/mmi/1.0/mmi.xsd",
+@XmlSchema(location="https://standards.iso.org/iso/19115/-3/mmi/1.0/mmi.xsd",
            elementFormDefault=XmlNsForm.QUALIFIED, namespace=Namespaces.MMI,
            xmlns = {
                 @XmlNs(prefix = "mmi", namespaceURI = Namespaces.MMI),      // Metadata for Maintenance Information
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/package-info.java b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/package-info.java
index 06827f2..71509b9 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/package-info.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/package-info.java
@@ -86,7 +86,7 @@
  * @since   0.3
  * @module
  */
-@XmlSchema(location="http://standards.iso.org/iso/19115/-3/mdb/1.0/mdb.xsd",
+@XmlSchema(location="https://standards.iso.org/iso/19115/-3/mdb/1.0/mdb.xsd",
            elementFormDefault=XmlNsForm.QUALIFIED, namespace=Namespaces.MDB,
            xmlns = {
                 @XmlNs(prefix = "mdb", namespaceURI = Namespaces.MDB),      // Metadata Base
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/package-info.java b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/package-info.java
index 60e616f..8fb66e9 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/package-info.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/package-info.java
@@ -117,7 +117,7 @@
  * @since 0.3
  * @module
  */
-@XmlSchema(location="http://standards.iso.org/iso/19157/-2/mdq/1.0/mdq.xsd",
+@XmlSchema(location="https://standards.iso.org/iso/19157/-2/mdq/1.0/mdq.xsd",
            elementFormDefault=XmlNsForm.QUALIFIED, namespace=Namespaces.MDQ,
            xmlns = {
                 @XmlNs(prefix = "mdq", namespaceURI = Namespaces.MDQ),      // Metadata for Data Quality
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/package-info.java b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/package-info.java
index 7e70d6d..bd643c8 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/package-info.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/package-info.java
@@ -88,7 +88,7 @@
  * @since   0.3
  * @module
  */
-@XmlSchema(location="http://standards.iso.org/iso/19115/-3/msr/1.0/msr.xsd",
+@XmlSchema(location="https://standards.iso.org/iso/19115/-3/msr/1.0/msr.xsd",
            elementFormDefault=XmlNsForm.QUALIFIED, namespace=Namespaces.MSR,
            xmlns = {
                 @XmlNs(prefix = "msr", namespaceURI = Namespaces.MSR),      // Metadata for Spatial Representation
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/xml/Pooled.java b/core/sis-metadata/src/main/java/org/apache/sis/xml/Pooled.java
index c06fb65..a901c30 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/xml/Pooled.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/xml/Pooled.java
@@ -61,7 +61,7 @@ abstract class Pooled {
      * The keys of entries that can be stored in the {@link #schemas} map.
      * Those keys are documented in {@link XML#SCHEMAS}.
      */
-    private static final String[] SCHEMA_KEYS = {"cat", "gmd"};
+    private static final String[] SCHEMA_KEYS = {"cat", "gmd", "gmi", "gml"};
 
     /**
      * {@code true} if the JAXB implementation is the one bundled in JDK 6, or {@code false}
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/xml/XML.java b/core/sis-metadata/src/main/java/org/apache/sis/xml/XML.java
index 91bb5f8..feff66b 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/xml/XML.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/xml/XML.java
@@ -137,8 +137,10 @@ public final class XML extends Static {
     public static final String TIMEZONE = "org.apache.sis.xml.timezone";
 
     /**
-     * Specifies the root URL of schemas. The value for this property shall
-     * be an instance of {@link Map Map&lt;String,String&gt;}.
+     * Specifies the root URL of schemas. This property specifies only the schema locations;
+     * it does not change the content of marshalled XML documents (for content schemas, see
+     * {@link #METADATA_VERSION}). The value for this property shall be an instance of
+     * {@link Map Map&lt;String,String&gt;}.
      * This property controls the URL to be used when marshalling the following elements:
      *
      * <ul>
@@ -148,14 +150,11 @@ public final class XML extends Static {
      *       (for example {@code <gco:Distance>}).</li>
      * </ul>
      *
-     * Two {@code Map} keys are currently recognized: {@code "cat"} and {@code "gmd"},
-     * which stands for the new ISO 19115-3:2016 and the legacy ISO 19139:2007 schemas respectively.
-     * The key to be used depends on the {@linkplain #METADATA_VERSION metadata version} to be marshalled.
-     * Additional keys, if any, are ignored. Future SIS versions may recognize more keys.
-     *
-     * <h4>Valid values</h4>
-     * The following table gives some typical URLs.
-     * The URL in bold character is the default one.
+     * The currently recognized keys are listed below.
+     * The entries to be used depend on the {@linkplain #METADATA_VERSION metadata version} to be marshalled.
+     * For example the {@code "cat"} entry is used when marshalling ISO 19115-3:2016 document, while the
+     * {@code "gmd"} and {@code "gmi"} entries are used when marshalling ISO 19139:2007 documents.
+     * The following table gives some typical URLs, with the default URL in bold characters:
      *
      * <table class="sis">
      *   <caption>Supported schemas</caption>
@@ -163,13 +162,22 @@ public final class XML extends Static {
      *   <tr><td><b>cat</b></td><td>
      *     <b>http://standards.iso.org/iso/19115/</b>
      *   </td></tr>
-     *   <tr><td><b>gmd</b></td><td>
+     *   <tr><td class="hsep"><b>gmd</b></td><td class="hsep">
+     *     <b>http://www.isotc211.org/2005/</b><br>
+     *        http://schemas.opengis.net/iso/19139/20070417/<br>
+     *        http://standards.iso.org/ittf/PubliclyAvailableStandards/ISO_19139_Schemas/
+     *   </td></tr>
+     *   <tr><td class="hsep"><b>gmi</b></td><td class="hsep">
      *        http://www.isotc211.org/2005/<br>
-     *     <b>http://schemas.opengis.net/iso/19139/20070417/</b><br>
-     *        http://standards.iso.org/ittf/PubliclyAvailableStandards/ISO_19139_Schemas/<br>
-     *        http://eden.ign.fr/xsd/fra/20060922/
+     *     <b>http://standards.iso.org/iso/19115/-2/gmi/1.0/</b>
+     *   </td></tr>
+     *   <tr><td class="hsep"><b>gml</b></td><td class="hsep">
+     *     <b>http://schemas.opengis.net/gml/3.2.1/</b><br>
+     *        https://www.isotc211.org/2005/gml/
      *   </td></tr>
      * </table>
+     *
+     * Additional keys, if any, are ignored. Future SIS versions may recognize more keys.
      */
     public static final String SCHEMAS = "org.apache.sis.xml.schemas";
     // If more keys are documented, update the Pooled.SCHEMAS_KEY array.
@@ -331,7 +339,7 @@ public final class XML extends Static {
      * {@preformat xml
      *   <gmd:language>
      *     <gmd:LanguageCode
-     *         codeList="http://schemas.opengis.net/iso/19139/20070417/resources/Codelist/gmxCodelists.xml#LanguageCode"
+     *         codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#LanguageCode"
      *         codeListValue="fra">French</gmd:LanguageCode>
      *   </gmd:language>
      * }
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/gml/MeasureTest.java b/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/gml/MeasureTest.java
index f34f616..c0b437c 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/gml/MeasureTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/gml/MeasureTest.java
@@ -27,10 +27,10 @@ import static org.junit.Assert.*;
 
 
 /**
- * Test {@link Measure}.
+ * Tests {@link Measure}.
  *
  * @author  Martin Desruisseaux (Geomatys)
- * @version 0.4
+ * @version 1.1
  * @since   0.3
  * @module
  */
@@ -57,7 +57,7 @@ public final strictfp class MeasureTest extends TestCase {
     @DependsOnMethod("testGetUOM")
     public void testSetUOM() throws URISyntaxException {
         final Measure measure = new Measure();
-        measure.setUOM("http://schemas.opengis.net/iso/19139/20070417/resources/uom/gmxUom.xml#m");
+        measure.setUOM("http://www.isotc211.org/2005/resources/uom/gmxUom.xml#m");
         assertEquals(Units.METRE, measure.unit);
         assertEquals("urn:ogc:def:uom:EPSG::9001", measure.getUOM());
         measure.asXPointer = true;
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/lan/LanguageCodeTest.java b/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/lan/LanguageCodeTest.java
index d55cd18..24aca9d 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/lan/LanguageCodeTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/lan/LanguageCodeTest.java
@@ -45,7 +45,7 @@ import static org.apache.sis.internal.util.StandardDateFormat.UTC;
  * The locale is marshalled as a character string. This format was used directly by ISO 19139:2007
  * but only indirectly by ISO 19115-3 (the newer version wraps the language in {@code PT_Locale}).
  *
- * <p>This class also test indirectly the {@link org.apache.sis.xml} capability to map the legacy
+ * <p>This class also tests indirectly the {@link org.apache.sis.xml} capability to map the legacy
  * {@code "http://www.isotc211.org/2005/gmd"} namespace to {@code "http://standards.iso.org/…"}.</p>
  *
  * @author  Martin Desruisseaux (Geomatys)
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/DefaultResponsibilityTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/DefaultResponsibilityTest.java
index e2df8a5..1dabcbf 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/DefaultResponsibilityTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/DefaultResponsibilityTest.java
@@ -31,7 +31,7 @@ import static org.apache.sis.test.MetadataAssert.*;
  *
  * @author  Martin Desruisseaux (Geomatys)
  * @author  Cullen Rombach (Image Matters)
- * @version 1.0
+ * @version 1.1
  * @since   0.5
  * @module
  */
@@ -56,7 +56,7 @@ public final strictfp class DefaultResponsibilityTest extends TestCase {
                 "        <gco:CharacterString>An author</gco:CharacterString>\n" +
                 "      </gmd:individualName>\n" +
                 "      <gmd:role>\n" +
-                "        <gmd:CI_RoleCode codeList=\"http://schemas.opengis.net/iso/19139/20070417/resources/Codelist/gmxCodelists.xml#CI_RoleCode\" codeListValue=\"author\" codeSpace=\"eng\">Author</gmd:CI_RoleCode>\n" +
+                "        <gmd:CI_RoleCode codeList=\"http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#CI_RoleCode\" codeListValue=\"author\" codeSpace=\"eng\">Author</gmd:CI_RoleCode>\n" +
                 "      </gmd:role>\n" +
                 "    </gmd:CI_ResponsibleParty>\n" +
                 "  </gmd:citedResponsibleParty>\n" +
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/constraint/DefaultLegalConstraintsTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/constraint/DefaultLegalConstraintsTest.java
index f4c6b6e..6708b61 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/constraint/DefaultLegalConstraintsTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/constraint/DefaultLegalConstraintsTest.java
@@ -97,7 +97,7 @@ public final strictfp class DefaultLegalConstraintsTest extends TestCase {
         xml  =  "<gmd:MD_LegalConstraints xmlns:gmd=\"" + LegacyNamespaces.GMD + "\">\n" +
                 "  <gmd:useConstraints>\n" +
                 "    <gmd:MD_RestrictionCode"
-                        + " codeList=\"http://schemas.opengis.net/iso/19139/20070417/resources/Codelist/gmxCodelists.xml#MD_RestrictionCode\""
+                        + " codeList=\"http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#MD_RestrictionCode\""
                         + " codeListValue=\"license\""                              // Note the "s" - from old ISO 19115:2013 spelling.
                         + " codeSpace=\"eng\">Licence</gmd:MD_RestrictionCode>\n" + // Note the "c" - this one come from resource file.
                 "  </gmd:useConstraints>\n" +
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultResolutionTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultResolutionTest.java
index 07d8f73..c3b9f07 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultResolutionTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultResolutionTest.java
@@ -110,7 +110,7 @@ public final strictfp class DefaultResolutionTest extends TestCase {
      * {@preformat xml
      *   <mri:MD_Resolution>
      *     <mri:distance>
-     *       <gco:Distance uom="http://schemas.opengis.net/iso/19139/20070417/resources/uom/gmxUom.xml#xpointer(//*[@gml:id='m'])">1000.0</gco:Distance>
+     *       <gco:Distance uom="http://www.isotc211.org/2005/resources/uom/gmxUom.xml#xpointer(//*[@gml:id='m'])">1000.0</gco:Distance>
      *     </mri:distance>
      *   </mri:MD_Resolution>
      * }
@@ -141,7 +141,7 @@ public final strictfp class DefaultResolutionTest extends TestCase {
      * {@preformat xml
      *   <gmd:MD_Resolution>
      *     <gmd:distance>
-     *       <gco:Distance uom="http://schemas.opengis.net/iso/19139/20070417/resources/uom/gmxUom.xml#xpointer(//*[@gml:id='m'])">1000.0</gco:Distance>
+     *       <gco:Distance uom="http://www.isotc211.org/2005/resources/uom/gmxUom.xml#xpointer(//*[@gml:id='m'])">1000.0</gco:Distance>
      *     </gmd:distance>
      *   </gmd:MD_Resolution>
      * }
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/test/xml/PackageVerifier.java b/core/sis-metadata/src/test/java/org/apache/sis/test/xml/PackageVerifier.java
index 74f6667..6c62d47 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/test/xml/PackageVerifier.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/test/xml/PackageVerifier.java
@@ -49,11 +49,11 @@ import static org.apache.sis.test.TestCase.PENDING_FUTURE_SIS_VERSION;
 
 
 /**
- * Verify JAXB annotations in a single package. A new instance of this class is created by
+ * Verifies JAXB annotations in a single package. A new instance of this class is created by
  * {@link SchemaCompliance#verify(java.nio.file.Path)} for each Java package to be verified.
  *
  * @author  Martin Desruisseaux (Geomatys)
- * @version 1.0
+ * @version 1.1
  * @since   1.0
  * @module
  */
@@ -171,7 +171,11 @@ final strictfp class PackageVerifier {
                 namespace = schema.namespace();
                 String location = schema.location();
                 if (!XmlSchema.NO_LOCATION.equals(location)) {
-                    if (!location.startsWith(schema.namespace())) {
+                    String expected = location;
+                    if (expected.startsWith("https:")) {
+                        expected = "http:" + expected.substring(6);
+                    }
+                    if (!expected.startsWith(schema.namespace())) {
                         throw new SchemaException("XML schema location inconsistent with namespace in package " + name);
                     }
                     schemas.loadSchema(location);
diff --git a/core/sis-metadata/src/test/resources/org/apache/sis/metadata/xml/2007/Citation.xml b/core/sis-metadata/src/test/resources/org/apache/sis/metadata/xml/2007/Citation.xml
index 165fa66..ee97875 100644
--- a/core/sis-metadata/src/test/resources/org/apache/sis/metadata/xml/2007/Citation.xml
+++ b/core/sis-metadata/src/test/resources/org/apache/sis/metadata/xml/2007/Citation.xml
@@ -23,7 +23,7 @@
     xmlns:gmd          = "http://www.isotc211.org/2005/gmd"
     xmlns:xsi          = "http://www.w3.org/2001/XMLSchema-instance"
     xmlns:xlink        = "http://www.w3.org/1999/xlink"
-    xsi:schemaLocation = "http://www.isotc211.org/2005/gmd http://schemas.opengis.net/iso/19139/20070417/gmd/gmd.xsd">
+    xsi:schemaLocation = "http://www.isotc211.org/2005/gmd https://www.isotc211.org/2005/gmd/gmd.xsd">
 
   <gmd:title>
     <gco:CharacterString>Fight against poverty</gco:CharacterString>
@@ -35,7 +35,7 @@
         <gco:DateTime>2015-10-17T02:00:00+02:00</gco:DateTime>
       </gmd:date>
       <gmd:dateType>
-        <gmd:CI_DateTypeCode codeList="http://schemas.opengis.net/iso/19139/20070417/resources/Codelist/gmxCodelists.xml#CI_DateTypeCode"
+        <gmd:CI_DateTypeCode codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#CI_DateTypeCode"
                              codeListValue="adopted">Adopted</gmd:CI_DateTypeCode>
       </gmd:dateType>
     </gmd:CI_Date>
@@ -59,7 +59,7 @@
                 <gco:CharacterString>High delay, low throughput, and low altitude service.</gco:CharacterString>
               </gmd:description>
               <gmd:function>
-                <gmd:CI_OnLineFunctionCode codeList="http://schemas.opengis.net/iso/19139/20070417/resources/Codelist/gmxCodelists.xml#CI_OnLineFunctionCode"
+                <gmd:CI_OnLineFunctionCode codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#CI_OnLineFunctionCode"
                                            codeListValue="offlineAccess">Offline access</gmd:CI_OnLineFunctionCode>
               </gmd:function>
             </gmd:CI_OnlineResource>
@@ -70,7 +70,7 @@
         </gmd:CI_Contact>
       </gmd:contactInfo>
       <gmd:role>
-        <gmd:CI_RoleCode codeList="http://schemas.opengis.net/iso/19139/20070417/resources/Codelist/gmxCodelists.xml#CI_RoleCode"
+        <gmd:CI_RoleCode codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#CI_RoleCode"
                          codeListValue="originator">Originator</gmd:CI_RoleCode>
       </gmd:role>
     </gmd:CI_ResponsibleParty>
@@ -82,13 +82,13 @@
       </gmd:individualName>
       <gmd:contactInfo xlink:href="#ip-protocol"/>
       <gmd:role>
-        <gmd:CI_RoleCode codeList="http://schemas.opengis.net/iso/19139/20070417/resources/Codelist/gmxCodelists.xml#CI_RoleCode"
+        <gmd:CI_RoleCode codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#CI_RoleCode"
                          codeListValue="funder">Funder</gmd:CI_RoleCode>
       </gmd:role>
     </gmd:CI_ResponsibleParty>
   </gmd:citedResponsibleParty>
   <gmd:presentationForm>
-    <gmd:CI_PresentationFormCode codeList="http://schemas.opengis.net/iso/19139/20070417/resources/Codelist/gmxCodelists.xml#CI_PresentationFormCode"
+    <gmd:CI_PresentationFormCode codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#CI_PresentationFormCode"
                                  codeListValue="physicalObject">Physical object</gmd:CI_PresentationFormCode>
   </gmd:presentationForm>
 </gmd:CI_Citation>
diff --git a/core/sis-metadata/src/test/resources/org/apache/sis/metadata/xml/2007/Extent.xml b/core/sis-metadata/src/test/resources/org/apache/sis/metadata/xml/2007/Extent.xml
index 08a5b58..b697907 100644
--- a/core/sis-metadata/src/test/resources/org/apache/sis/metadata/xml/2007/Extent.xml
+++ b/core/sis-metadata/src/test/resources/org/apache/sis/metadata/xml/2007/Extent.xml
@@ -23,7 +23,7 @@
     xmlns:gmd = "http://www.isotc211.org/2005/gmd"
     xmlns:gml = "http://www.opengis.net/gml/3.2"
     xmlns:xsi = "http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation = "http://www.isotc211.org/2005/gmd http://schemas.opengis.net/iso/19139/20070417/gmd/gmd.xsd">
+    xsi:schemaLocation = "http://www.isotc211.org/2005/gmd https://www.isotc211.org/2005/gmd/gmd.xsd">
 
   <gmd:geographicElement>
     <gmd:EX_GeographicBoundingBox id="bbox">
diff --git a/core/sis-metadata/src/test/resources/org/apache/sis/metadata/xml/2007/Locales.xml b/core/sis-metadata/src/test/resources/org/apache/sis/metadata/xml/2007/Locales.xml
index 7afed67..7746592 100644
--- a/core/sis-metadata/src/test/resources/org/apache/sis/metadata/xml/2007/Locales.xml
+++ b/core/sis-metadata/src/test/resources/org/apache/sis/metadata/xml/2007/Locales.xml
@@ -21,10 +21,10 @@
 <gmd:MD_Metadata
     xmlns:gmd = "http://www.isotc211.org/2005/gmd"
     xmlns:xsi = "http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation = "http://www.isotc211.org/2005/gmd http://schemas.opengis.net/iso/19139/20070417/gmd/gmd.xsd">
+    xsi:schemaLocation = "http://www.isotc211.org/2005/gmd https://www.isotc211.org/2005/gmd/gmd.xsd">
 
   <gmd:language>
-    <gmd:LanguageCode codeList="http://schemas.opengis.net/iso/19139/20070417/resources/Codelist/gmxCodelists.xml#LanguageCode" codeListValue="eng" codeSpace="eng">English</gmd:LanguageCode>
+    <gmd:LanguageCode codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#LanguageCode" codeListValue="eng" codeSpace="eng">English</gmd:LanguageCode>
   </gmd:language>
 
   <!-- Following empty elements are mandatory according ISO 19115, but ignored for this test. -->
@@ -34,49 +34,49 @@
   <gmd:locale>
     <gmd:PT_Locale>
       <gmd:languageCode>
-        <gmd:LanguageCode codeList="http://schemas.opengis.net/iso/19139/20070417/resources/Codelist/gmxCodelists.xml#LanguageCode" codeListValue="jpn" codeSpace="eng">Japanese</gmd:LanguageCode>
+        <gmd:LanguageCode codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#LanguageCode" codeListValue="jpn" codeSpace="eng">Japanese</gmd:LanguageCode>
       </gmd:languageCode>
       <gmd:characterEncoding>
-        <gmd:MD_CharacterSetCode codeList="http://schemas.opengis.net/iso/19139/20070417/resources/Codelist/gmxCodelists.xml#MD_CharacterSetCode" codeListValue="utf8">UTF-8</gmd:MD_CharacterSetCode>
+        <gmd:MD_CharacterSetCode codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#MD_CharacterSetCode" codeListValue="utf8">UTF-8</gmd:MD_CharacterSetCode>
       </gmd:characterEncoding>
     </gmd:PT_Locale>
   </gmd:locale>
   <gmd:locale>
     <gmd:PT_Locale>
       <gmd:languageCode>
-        <gmd:LanguageCode codeList="http://schemas.opengis.net/iso/19139/20070417/resources/Codelist/gmxCodelists.xml#LanguageCode" codeListValue="eng" codeSpace="eng">English</gmd:LanguageCode>
+        <gmd:LanguageCode codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#LanguageCode" codeListValue="eng" codeSpace="eng">English</gmd:LanguageCode>
       </gmd:languageCode>
       <gmd:country>
-        <gmd:Country codeList="http://schemas.opengis.net/iso/19139/20070417/resources/Codelist/gmxCodelists.xml#Country" codeListValue="CA" codeSpace="eng">Canada</gmd:Country>
+        <gmd:Country codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#Country" codeListValue="CA" codeSpace="eng">Canada</gmd:Country>
       </gmd:country>
       <gmd:characterEncoding>
-        <gmd:MD_CharacterSetCode codeList="http://schemas.opengis.net/iso/19139/20070417/resources/Codelist/gmxCodelists.xml#MD_CharacterSetCode" codeListValue="utf8">UTF-8</gmd:MD_CharacterSetCode>
+        <gmd:MD_CharacterSetCode codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#MD_CharacterSetCode" codeListValue="utf8">UTF-8</gmd:MD_CharacterSetCode>
       </gmd:characterEncoding>
     </gmd:PT_Locale>
   </gmd:locale>
   <gmd:locale>
     <gmd:PT_Locale>
       <gmd:languageCode>
-        <gmd:LanguageCode codeList="http://schemas.opengis.net/iso/19139/20070417/resources/Codelist/gmxCodelists.xml#LanguageCode" codeListValue="fra" codeSpace="eng">French</gmd:LanguageCode>
+        <gmd:LanguageCode codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#LanguageCode" codeListValue="fra" codeSpace="eng">French</gmd:LanguageCode>
       </gmd:languageCode>
       <gmd:country>
-        <gmd:Country codeList="http://schemas.opengis.net/iso/19139/20070417/resources/Codelist/gmxCodelists.xml#Country" codeListValue="FR" codeSpace="eng">France</gmd:Country>
+        <gmd:Country codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#Country" codeListValue="FR" codeSpace="eng">France</gmd:Country>
       </gmd:country>
       <gmd:characterEncoding>
-        <gmd:MD_CharacterSetCode codeList="http://schemas.opengis.net/iso/19139/20070417/resources/Codelist/gmxCodelists.xml#MD_CharacterSetCode" codeListValue="utf8">UTF-8</gmd:MD_CharacterSetCode>
+        <gmd:MD_CharacterSetCode codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#MD_CharacterSetCode" codeListValue="utf8">UTF-8</gmd:MD_CharacterSetCode>
       </gmd:characterEncoding>
     </gmd:PT_Locale>
   </gmd:locale>
   <gmd:locale>
     <gmd:PT_Locale>
       <gmd:languageCode>
-        <gmd:LanguageCode codeList="http://schemas.opengis.net/iso/19139/20070417/resources/Codelist/gmxCodelists.xml#LanguageCode" codeListValue="fra" codeSpace="eng">French</gmd:LanguageCode>
+        <gmd:LanguageCode codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#LanguageCode" codeListValue="fra" codeSpace="eng">French</gmd:LanguageCode>
       </gmd:languageCode>
       <gmd:country>
-        <gmd:Country codeList="http://schemas.opengis.net/iso/19139/20070417/resources/Codelist/gmxCodelists.xml#Country" codeListValue="CA" codeSpace="eng">Canada</gmd:Country>
+        <gmd:Country codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#Country" codeListValue="CA" codeSpace="eng">Canada</gmd:Country>
       </gmd:country>
       <gmd:characterEncoding>
-        <gmd:MD_CharacterSetCode codeList="http://schemas.opengis.net/iso/19139/20070417/resources/Codelist/gmxCodelists.xml#MD_CharacterSetCode" codeListValue="utf8">UTF-8</gmd:MD_CharacterSetCode>
+        <gmd:MD_CharacterSetCode codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#MD_CharacterSetCode" codeListValue="utf8">UTF-8</gmd:MD_CharacterSetCode>
       </gmd:characterEncoding>
     </gmd:PT_Locale>
   </gmd:locale>
diff --git a/core/sis-metadata/src/test/resources/org/apache/sis/metadata/xml/2007/Metadata.xml b/core/sis-metadata/src/test/resources/org/apache/sis/metadata/xml/2007/Metadata.xml
index e66bede..b2f1f29 100644
--- a/core/sis-metadata/src/test/resources/org/apache/sis/metadata/xml/2007/Metadata.xml
+++ b/core/sis-metadata/src/test/resources/org/apache/sis/metadata/xml/2007/Metadata.xml
@@ -26,8 +26,8 @@
     xmlns:srv   = "http://www.isotc211.org/2005/srv"
     xmlns:xsi   = "http://www.w3.org/2001/XMLSchema-instance"
     xmlns:xlink = "http://www.w3.org/1999/xlink"
-    xsi:schemaLocation = "http://www.isotc211.org/2005/gmd http://schemas.opengis.net/iso/19139/20070417/gmd/gmd.xsd
-                          http://www.isotc211.org/2005/gmx http://schemas.opengis.net/iso/19139/20070417/gmx/gmx.xsd">
+    xsi:schemaLocation = "http://www.isotc211.org/2005/gmd https://www.isotc211.org/2005/gmd/gmd.xsd
+                          http://www.isotc211.org/2005/gmx https://www.isotc211.org/2005/gmx/gmx.xsd">
 
   <!--
     WARNING: this file is not yet compliant with ISO schema.
@@ -37,16 +37,16 @@
     <gco:CharacterString>a-metadata-identifier</gco:CharacterString>
   </gmd:fileIdentifier>
   <gmd:language>
-    <gmd:LanguageCode codeList="http://schemas.opengis.net/iso/19139/20070417/resources/Codelist/gmxCodelists.xml#LanguageCode" codeListValue="eng" codeSpace="eng">English</gmd:LanguageCode>
+    <gmd:LanguageCode codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#LanguageCode" codeListValue="eng" codeSpace="eng">English</gmd:LanguageCode>
   </gmd:language>
   <gmd:characterSet>
-    <gmd:MD_CharacterSetCode codeList="http://schemas.opengis.net/iso/19139/20070417/resources/Codelist/gmxCodelists.xml#MD_CharacterSetCode" codeListValue="8859part1">ISO-8859-1</gmd:MD_CharacterSetCode>
+    <gmd:MD_CharacterSetCode codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#MD_CharacterSetCode" codeListValue="8859part1">ISO-8859-1</gmd:MD_CharacterSetCode>
   </gmd:characterSet>
   <gmd:parentIdentifier>
     <gco:CharacterString>A parent metadata</gco:CharacterString>
   </gmd:parentIdentifier>
   <gmd:hierarchyLevel>
-    <gmd:MD_ScopeCode codeList="http://schemas.opengis.net/iso/19139/20070417/resources/Codelist/gmxCodelists.xml#MD_ScopeCode" codeListValue="dataset" codeSpace="eng">Dataset</gmd:MD_ScopeCode>
+    <gmd:MD_ScopeCode codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#MD_ScopeCode" codeListValue="dataset" codeSpace="eng">Dataset</gmd:MD_ScopeCode>
   </gmd:hierarchyLevel>
   <gmd:hierarchyLevelName>
     <gco:CharacterString>Metadata for an imaginary data set</gco:CharacterString>
@@ -122,7 +122,7 @@
                 </gmd:PT_FreeText>
               </gmd:description>
               <gmd:function>
-                <gmd:CI_OnLineFunctionCode codeList="http://schemas.opengis.net/iso/19139/20070417/resources/Codelist/gmxCodelists.xml#CI_OnLineFunctionCode" codeListValue="search" codeSpace="eng">Search</gmd:CI_OnLineFunctionCode>
+                <gmd:CI_OnLineFunctionCode codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#CI_OnLineFunctionCode" codeListValue="search" codeSpace="eng">Search</gmd:CI_OnLineFunctionCode>
               </gmd:function>
             </gmd:CI_OnlineResource>
           </gmd:onlineResource>
@@ -135,7 +135,7 @@
         </gmd:CI_Contact>
       </gmd:contactInfo>
       <gmd:role>
-        <gmd:CI_RoleCode codeList="http://schemas.opengis.net/iso/19139/20070417/resources/Codelist/gmxCodelists.xml#CI_RoleCode" codeListValue="pointOfContact" codeSpace="eng">Point of contact</gmd:CI_RoleCode>
+        <gmd:CI_RoleCode codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#CI_RoleCode" codeListValue="pointOfContact" codeSpace="eng">Point of contact</gmd:CI_RoleCode>
       </gmd:role>
     </gmd:CI_ResponsibleParty>
   </gmd:contact>
@@ -149,7 +149,7 @@
       </gmd:positionName>
       <gmd:contactInfo xlink:href="#thought"></gmd:contactInfo>
       <gmd:role>
-        <gmd:CI_RoleCode codeList="http://schemas.opengis.net/iso/19139/20070417/resources/Codelist/gmxCodelists.xml#CI_RoleCode" codeListValue="pointOfContact" codeSpace="eng">Point of contact</gmd:CI_RoleCode>
+        <gmd:CI_RoleCode codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#CI_RoleCode" codeListValue="pointOfContact" codeSpace="eng">Point of contact</gmd:CI_RoleCode>
       </gmd:role>
     </gmd:CI_ResponsibleParty>
   </gmd:contact>
@@ -165,13 +165,13 @@
   <gmd:locale>
     <gmd:PT_Locale>
       <gmd:languageCode>
-        <gmd:LanguageCode codeList="http://schemas.opengis.net/iso/19139/20070417/resources/Codelist/gmxCodelists.xml#LanguageCode" codeListValue="fra" codeSpace="eng">French</gmd:LanguageCode>
+        <gmd:LanguageCode codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#LanguageCode" codeListValue="fra" codeSpace="eng">French</gmd:LanguageCode>
       </gmd:languageCode>
       <gmd:country>
-        <gmd:Country codeList="http://schemas.opengis.net/iso/19139/20070417/resources/Codelist/gmxCodelists.xml#Country" codeListValue="CA" codeSpace="eng">Canada</gmd:Country>
+        <gmd:Country codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#Country" codeListValue="CA" codeSpace="eng">Canada</gmd:Country>
       </gmd:country>
       <gmd:characterEncoding>
-        <gmd:MD_CharacterSetCode codeList="http://schemas.opengis.net/iso/19139/20070417/resources/Codelist/gmxCodelists.xml#MD_CharacterSetCode" codeListValue="utf8" codeSpace="eng">UTF-8</gmd:MD_CharacterSetCode>
+        <gmd:MD_CharacterSetCode codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#MD_CharacterSetCode" codeListValue="utf8" codeSpace="eng">UTF-8</gmd:MD_CharacterSetCode>
       </gmd:characterEncoding>
     </gmd:PT_Locale>
   </gmd:locale>
@@ -183,31 +183,31 @@
       <gmd:axisDimensionProperties>
         <gmd:MD_Dimension>
           <gmd:dimensionName>
-            <gmd:MD_DimensionNameTypeCode codeList="http://schemas.opengis.net/iso/19139/20070417/resources/Codelist/gmxCodelists.xml#MD_DimensionNameTypeCode" codeListValue="row">Row</gmd:MD_DimensionNameTypeCode>
+            <gmd:MD_DimensionNameTypeCode codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#MD_DimensionNameTypeCode" codeListValue="row">Row</gmd:MD_DimensionNameTypeCode>
           </gmd:dimensionName>
           <gmd:dimensionSize>
             <gco:Integer>7777</gco:Integer>
           </gmd:dimensionSize>
           <gmd:resolution>
-            <gco:Measure uom="http://schemas.opengis.net/iso/19139/20070417/resources/uom/gmxUom.xml#xpointer(//*[@gml:id='m'])">10.0</gco:Measure>
+            <gco:Measure uom="http://www.isotc211.org/2005/resources/uom/gmxUom.xml#xpointer(//*[@gml:id='m'])">10.0</gco:Measure>
           </gmd:resolution>
         </gmd:MD_Dimension>
       </gmd:axisDimensionProperties>
       <gmd:axisDimensionProperties>
         <gmd:MD_Dimension>
           <gmd:dimensionName>
-            <gmd:MD_DimensionNameTypeCode codeList="http://schemas.opengis.net/iso/19139/20070417/resources/Codelist/gmxCodelists.xml#MD_DimensionNameTypeCode" codeListValue="column">Column</gmd:MD_DimensionNameTypeCode>
+            <gmd:MD_DimensionNameTypeCode codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#MD_DimensionNameTypeCode" codeListValue="column">Column</gmd:MD_DimensionNameTypeCode>
           </gmd:dimensionName>
           <gmd:dimensionSize>
             <gco:Integer>2233</gco:Integer>
           </gmd:dimensionSize>
           <gmd:resolution>
-            <gco:Measure uom="http://schemas.opengis.net/iso/19139/20070417/resources/uom/gmxUom.xml#xpointer(//*[@gml:id='m'])">5.0</gco:Measure>
+            <gco:Measure uom="http://www.isotc211.org/2005/resources/uom/gmxUom.xml#xpointer(//*[@gml:id='m'])">5.0</gco:Measure>
           </gmd:resolution>
         </gmd:MD_Dimension>
       </gmd:axisDimensionProperties>
       <gmd:cellGeometry>
-        <gmd:MD_CellGeometryCode codeList="http://schemas.opengis.net/iso/19139/20070417/resources/Codelist/gmxCodelists.xml#MD_CellGeometryCode" codeListValue="area" codeSpace="eng">Area</gmd:MD_CellGeometryCode>
+        <gmd:MD_CellGeometryCode codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#MD_CellGeometryCode" codeListValue="area" codeSpace="eng">Area</gmd:MD_CellGeometryCode>
       </gmd:cellGeometry>
       <gmd:transformationParameterAvailability>
         <gco:Boolean>false</gco:Boolean>
@@ -235,7 +235,7 @@
                     <gco:DateTime>2009-12-16T12:00:29.580+01:00</gco:DateTime>
                   </gmd:date>
                   <gmd:dateType>
-                    <gmd:CI_DateTypeCode codeList="http://schemas.opengis.net/iso/19139/20070417/resources/Codelist/gmxCodelists.xml#CI_DateTypeCode" codeListValue="creation" codeSpace="eng">Creation</gmd:CI_DateTypeCode>
+                    <gmd:CI_DateTypeCode codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#CI_DateTypeCode" codeListValue="creation" codeSpace="eng">Creation</gmd:CI_DateTypeCode>
                   </gmd:dateType>
                 </gmd:CI_Date>
               </gmd:date>
@@ -245,7 +245,7 @@
                     <gco:CharacterString>Atlantis national mapping agency</gco:CharacterString>
                   </gmd:organisationName>
                   <gmd:role>
-                    <gmd:CI_RoleCode codeList="http://schemas.opengis.net/iso/19139/20070417/resources/Codelist/gmxCodelists.xml#CI_RoleCode" codeListValue="publisher" codeSpace="eng">Publisher</gmd:CI_RoleCode>
+                    <gmd:CI_RoleCode codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#CI_RoleCode" codeListValue="publisher" codeSpace="eng">Publisher</gmd:CI_RoleCode>
                   </gmd:role>
                 </gmd:CI_ResponsibleParty>
               </gmd:citedResponsibleParty>
@@ -288,7 +288,7 @@
             <gco:CharacterString>Presents in “Imaginary work” profile.</gco:CharacterString>
           </gmd:condition>
           <gmd:dataType>
-            <gmd:MD_DatatypeCode codeList="http://schemas.opengis.net/iso/19139/20070417/resources/Codelist/gmxCodelists.xml#MD_DatatypeCode" codeListValue="metaClass">Meta class</gmd:MD_DatatypeCode>
+            <gmd:MD_DatatypeCode codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#MD_DatatypeCode" codeListValue="metaClass">Meta class</gmd:MD_DatatypeCode>
           </gmd:dataType>
           <gmd:maximumOccurrence>
             <gco:CharacterString>3</gco:CharacterString>
@@ -329,7 +329,7 @@
                 <gco:Date>2018-04-09</gco:Date>
               </gmd:date>
               <gmd:dateType>
-                <gmd:CI_DateTypeCode codeList="http://schemas.opengis.net/iso/19139/20070417/resources/Codelist/gmxCodelists.xml#CI_DateTypeCode" codeListValue="creation" codeSpace="eng">Creation</gmd:CI_DateTypeCode>
+                <gmd:CI_DateTypeCode codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#CI_DateTypeCode" codeListValue="creation" codeSpace="eng">Creation</gmd:CI_DateTypeCode>
               </gmd:dateType>
             </gmd:CI_Date>
           </gmd:date>
@@ -359,15 +359,15 @@
         <gco:CharacterString>For XML (un)marshalling tests.</gco:CharacterString>
       </gmd:purpose>
       <gmd:status>
-        <gmd:MD_ProgressCode codeList="http://schemas.opengis.net/iso/19139/20070417/resources/Codelist/gmxCodelists.xml#MD_ProgressCode" codeListValue="historicalArchive" codeSpace="eng">Historical archive</gmd:MD_ProgressCode>
+        <gmd:MD_ProgressCode codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#MD_ProgressCode" codeListValue="historicalArchive" codeSpace="eng">Historical archive</gmd:MD_ProgressCode>
       </gmd:status>
       <gmd:spatialRepresentationType>
-        <gmd:MD_SpatialRepresentationTypeCode codeList="http://schemas.opengis.net/iso/19139/20070417/resources/Codelist/gmxCodelists.xml#MD_SpatialRepresentationTypeCode" codeListValue="grid">Grid</gmd:MD_SpatialRepresentationTypeCode>
+        <gmd:MD_SpatialRepresentationTypeCode codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#MD_SpatialRepresentationTypeCode" codeListValue="grid">Grid</gmd:MD_SpatialRepresentationTypeCode>
       </gmd:spatialRepresentationType>
       <gmd:spatialResolution>
         <gmd:MD_Resolution>
           <gmd:distance>
-            <gco:Distance uom="http://schemas.opengis.net/iso/19139/20070417/resources/uom/gmxUom.xml#xpointer(//*[@gml:id='m'])">56777.0</gco:Distance>
+            <gco:Distance uom="http://www.isotc211.org/2005/resources/uom/gmxUom.xml#xpointer(//*[@gml:id='m'])">56777.0</gco:Distance>
           </gmd:distance>
         </gmd:MD_Resolution>
       </gmd:spatialResolution>
@@ -380,10 +380,10 @@
       <gmd:resourceMaintenance>
         <gmd:MD_MaintenanceInformation id="not-planned">
           <gmd:maintenanceAndUpdateFrequency>
-            <gmd:MD_MaintenanceFrequencyCode codeList="http://schemas.opengis.net/iso/19139/20070417/resources/Codelist/gmxCodelists.xml#MD_MaintenanceFrequencyCode" codeListValue="notPlanned" codeSpace="eng">Not planned</gmd:MD_MaintenanceFrequencyCode>
+            <gmd:MD_MaintenanceFrequencyCode codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#MD_MaintenanceFrequencyCode" codeListValue="notPlanned" codeSpace="eng">Not planned</gmd:MD_MaintenanceFrequencyCode>
           </gmd:maintenanceAndUpdateFrequency>
           <gmd:updateScope>
-            <gmd:MD_ScopeCode codeList="http://schemas.opengis.net/iso/19139/20070417/resources/Codelist/gmxCodelists.xml#MD_ScopeCode" codeListValue="model" codeSpace="eng">Model</gmd:MD_ScopeCode>
+            <gmd:MD_ScopeCode codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#MD_ScopeCode" codeListValue="model" codeSpace="eng">Model</gmd:MD_ScopeCode>
           </gmd:updateScope>
           <gmd:updateScopeDescription>
             <gmd:MD_ScopeDescription>
@@ -422,7 +422,7 @@
             <gco:CharacterString>Aether</gco:CharacterString>
           </gmd:keyword>
           <gmd:type>
-            <gmd:MD_KeywordTypeCode codeList="http://schemas.opengis.net/iso/19139/20070417/resources/Codelist/gmxCodelists.xml#MD_KeywordTypeCode" codeListValue="theme" codeSpace="eng">Theme</gmd:MD_KeywordTypeCode>
+            <gmd:MD_KeywordTypeCode codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#MD_KeywordTypeCode" codeListValue="theme" codeSpace="eng">Theme</gmd:MD_KeywordTypeCode>
           </gmd:type>
           <gmd:thesaurusName>
             <gmd:CI_Citation>
@@ -456,21 +456,21 @@
       <gmd:aggregationInfo>
         <gmd:MD_AggregateInformation>
           <gmd:associationType>
-            <gmd:DS_AssociationTypeCode codeList="http://schemas.opengis.net/iso/19139/20070417/resources/Codelist/gmxCodelists.xml#DS_AssociationTypeCode" codeListValue="dependency" codeSpace="eng">Dependency</gmd:DS_AssociationTypeCode>
+            <gmd:DS_AssociationTypeCode codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#DS_AssociationTypeCode" codeListValue="dependency" codeSpace="eng">Dependency</gmd:DS_AssociationTypeCode>
           </gmd:associationType>
           <gmd:initiativeType>
-            <gmd:DS_InitiativeTypeCode codeList="http://schemas.opengis.net/iso/19139/20070417/resources/Codelist/gmxCodelists.xml#DS_InitiativeTypeCode" codeListValue="experiment">Experiment</gmd:DS_InitiativeTypeCode>
+            <gmd:DS_InitiativeTypeCode codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#DS_InitiativeTypeCode" codeListValue="experiment">Experiment</gmd:DS_InitiativeTypeCode>
           </gmd:initiativeType>
         </gmd:MD_AggregateInformation>
       </gmd:aggregationInfo>
       <gmd:language>
-        <gmd:LanguageCode codeList="http://schemas.opengis.net/iso/19139/20070417/resources/Codelist/gmxCodelists.xml#LanguageCode" codeListValue="eng" codeSpace="eng">English</gmd:LanguageCode>
+        <gmd:LanguageCode codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#LanguageCode" codeListValue="eng" codeSpace="eng">English</gmd:LanguageCode>
       </gmd:language>
       <gmd:language>
-        <gmd:LanguageCode codeList="http://schemas.opengis.net/iso/19139/20070417/resources/Codelist/gmxCodelists.xml#LanguageCode" codeListValue="fra" codeSpace="eng">French</gmd:LanguageCode>
+        <gmd:LanguageCode codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#LanguageCode" codeListValue="fra" codeSpace="eng">French</gmd:LanguageCode>
       </gmd:language>
       <gmd:characterSet>
-        <gmd:MD_CharacterSetCode codeList="http://schemas.opengis.net/iso/19139/20070417/resources/Codelist/gmxCodelists.xml#MD_CharacterSetCode" codeListValue="8859part1" codeSpace="eng">ISO-8859-1</gmd:MD_CharacterSetCode>
+        <gmd:MD_CharacterSetCode codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#MD_CharacterSetCode" codeListValue="8859part1" codeSpace="eng">ISO-8859-1</gmd:MD_CharacterSetCode>
       </gmd:characterSet>
       <gmd:environmentDescription>
         <gco:CharacterString>High humidity.</gco:CharacterString>
@@ -521,10 +521,10 @@
       <gmd:aggregationInfo>
         <gmd:MD_AggregateInformation>
           <gmd:associationType>
-            <gmd:DS_AssociationTypeCode codeList="http://schemas.opengis.net/iso/19139/20070417/resources/Codelist/gmxCodelists.xml#DS_AssociationTypeCode" codeListValue="dependency" codeSpace="eng">Dependency</gmd:DS_AssociationTypeCode>
+            <gmd:DS_AssociationTypeCode codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#DS_AssociationTypeCode" codeListValue="dependency" codeSpace="eng">Dependency</gmd:DS_AssociationTypeCode>
           </gmd:associationType>
           <gmd:initiativeType>
-            <gmd:DS_InitiativeTypeCode codeList="http://schemas.opengis.net/iso/19139/20070417/resources/Codelist/gmxCodelists.xml#DS_InitiativeTypeCode" codeListValue="experiment">Experiment</gmd:DS_InitiativeTypeCode>
+            <gmd:DS_InitiativeTypeCode codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#DS_InitiativeTypeCode" codeListValue="experiment">Experiment</gmd:DS_InitiativeTypeCode>
           </gmd:initiativeType>
         </gmd:MD_AggregateInformation>
       </gmd:aggregationInfo>
@@ -536,7 +536,7 @@
         <srv:SV_CoupledResource></srv:SV_CoupledResource>
       </srv:coupledResource>
       <srv:couplingType>
-        <srv:SV_CouplingType codeList="http://schemas.opengis.net/iso/19139/20070417/resources/Codelist/gmxCodelists.xml#SV_CouplingType" codeListValue="loose" codeSpace="eng">Loose</srv:SV_CouplingType>
+        <srv:SV_CouplingType codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#SV_CouplingType" codeListValue="loose" codeSpace="eng">Loose</srv:SV_CouplingType>
       </srv:couplingType>
       <srv:containsOperations>
         <srv:SV_OperationMetadata>
@@ -544,7 +544,7 @@
             <gco:CharacterString>Authoring</gco:CharacterString>
           </srv:operationName>
           <srv:DCP>
-            <srv:DCPList codeList="http://schemas.opengis.net/iso/19139/20070417/resources/Codelist/gmxCodelists.xml#DCPList" codeListValue="JAVA" codeSpace="eng">Java</srv:DCPList>
+            <srv:DCPList codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#DCPList" codeListValue="JAVA" codeSpace="eng">Java</srv:DCPList>
           </srv:DCP>
           <srv:operationDescription>
             <gco:CharacterString>Write a book.</gco:CharacterString>
@@ -572,15 +572,15 @@
             <gco:CharacterString>For XML (un)marshalling tests.</gco:CharacterString>
           </gmd:purpose>
           <gmd:status>
-            <gmd:MD_ProgressCode codeList="http://schemas.opengis.net/iso/19139/20070417/resources/Codelist/gmxCodelists.xml#MD_ProgressCode" codeListValue="historicalArchive" codeSpace="eng">Historical archive</gmd:MD_ProgressCode>
+            <gmd:MD_ProgressCode codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#MD_ProgressCode" codeListValue="historicalArchive" codeSpace="eng">Historical archive</gmd:MD_ProgressCode>
           </gmd:status>
           <gmd:spatialRepresentationType>
-            <gmd:MD_SpatialRepresentationTypeCode codeList="http://schemas.opengis.net/iso/19139/20070417/resources/Codelist/gmxCodelists.xml#MD_SpatialRepresentationTypeCode" codeListValue="grid">Grid</gmd:MD_SpatialRepresentationTypeCode>
+            <gmd:MD_SpatialRepresentationTypeCode codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#MD_SpatialRepresentationTypeCode" codeListValue="grid">Grid</gmd:MD_SpatialRepresentationTypeCode>
           </gmd:spatialRepresentationType>
           <gmd:spatialResolution>
             <gmd:MD_Resolution>
               <gmd:distance>
-                <gco:Distance uom="http://schemas.opengis.net/iso/19139/20070417/resources/uom/gmxUom.xml#xpointer(//*[@gml:id='m'])">56777.0</gco:Distance>
+                <gco:Distance uom="http://www.isotc211.org/2005/resources/uom/gmxUom.xml#xpointer(//*[@gml:id='m'])">56777.0</gco:Distance>
               </gmd:distance>
             </gmd:MD_Resolution>
           </gmd:spatialResolution>
@@ -628,21 +628,21 @@
           <gmd:aggregationInfo>
             <gmd:MD_AggregateInformation>
               <gmd:associationType>
-                <gmd:DS_AssociationTypeCode codeList="http://schemas.opengis.net/iso/19139/20070417/resources/Codelist/gmxCodelists.xml#DS_AssociationTypeCode" codeListValue="dependency" codeSpace="eng">Dependency</gmd:DS_AssociationTypeCode>
+                <gmd:DS_AssociationTypeCode codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#DS_AssociationTypeCode" codeListValue="dependency" codeSpace="eng">Dependency</gmd:DS_AssociationTypeCode>
               </gmd:associationType>
               <gmd:initiativeType>
-                <gmd:DS_InitiativeTypeCode codeList="http://schemas.opengis.net/iso/19139/20070417/resources/Codelist/gmxCodelists.xml#DS_InitiativeTypeCode" codeListValue="experiment">Experiment</gmd:DS_InitiativeTypeCode>
+                <gmd:DS_InitiativeTypeCode codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#DS_InitiativeTypeCode" codeListValue="experiment">Experiment</gmd:DS_InitiativeTypeCode>
               </gmd:initiativeType>
             </gmd:MD_AggregateInformation>
           </gmd:aggregationInfo>
           <gmd:language>
-            <gmd:LanguageCode codeList="http://schemas.opengis.net/iso/19139/20070417/resources/Codelist/gmxCodelists.xml#LanguageCode" codeListValue="eng" codeSpace="eng">English</gmd:LanguageCode>
+            <gmd:LanguageCode codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#LanguageCode" codeListValue="eng" codeSpace="eng">English</gmd:LanguageCode>
           </gmd:language>
           <gmd:language>
-            <gmd:LanguageCode codeList="http://schemas.opengis.net/iso/19139/20070417/resources/Codelist/gmxCodelists.xml#LanguageCode" codeListValue="fra" codeSpace="eng">French</gmd:LanguageCode>
+            <gmd:LanguageCode codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#LanguageCode" codeListValue="fra" codeSpace="eng">French</gmd:LanguageCode>
           </gmd:language>
           <gmd:characterSet>
-            <gmd:MD_CharacterSetCode codeList="http://schemas.opengis.net/iso/19139/20070417/resources/Codelist/gmxCodelists.xml#MD_CharacterSetCode" codeListValue="8859part1" codeSpace="eng">ISO-8859-1</gmd:MD_CharacterSetCode>
+            <gmd:MD_CharacterSetCode codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#MD_CharacterSetCode" codeListValue="8859part1" codeSpace="eng">ISO-8859-1</gmd:MD_CharacterSetCode>
           </gmd:characterSet>
           <gmd:environmentDescription>
             <gco:CharacterString>High humidity.</gco:CharacterString>
@@ -661,7 +661,7 @@
         <gco:RecordType></gco:RecordType>
       </gmd:attributeDescription>
       <gmd:contentType>
-        <gmd:MD_CoverageContentTypeCode codeList="http://schemas.opengis.net/iso/19139/20070417/resources/Codelist/gmxCodelists.xml#MD_CoverageContentTypeCode" codeListValue="auxillaryInformation" codeSpace="eng">Auxilliary information</gmd:MD_CoverageContentTypeCode>
+        <gmd:MD_CoverageContentTypeCode codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#MD_CoverageContentTypeCode" codeListValue="auxillaryInformation" codeSpace="eng">Auxilliary information</gmd:MD_CoverageContentTypeCode>
       </gmd:contentType>
       <gmd:dimension>
         <gmd:MD_RangeDimension>
diff --git a/core/sis-metadata/src/test/resources/org/apache/sis/metadata/xml/2007/Multiplicity.xml b/core/sis-metadata/src/test/resources/org/apache/sis/metadata/xml/2007/Multiplicity.xml
index b76c021..7ee6d51 100644
--- a/core/sis-metadata/src/test/resources/org/apache/sis/metadata/xml/2007/Multiplicity.xml
+++ b/core/sis-metadata/src/test/resources/org/apache/sis/metadata/xml/2007/Multiplicity.xml
@@ -22,7 +22,7 @@
     xmlns:gfc          = "http://www.isotc211.org/2005/gfc"
     xmlns:gco          = "http://www.isotc211.org/2005/gco"
     xmlns:xsi          = "http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation = "http://www.isotc211.org/2005/gfc http://www.isotc211.org/2005/gfc/gfc.xsd">
+    xsi:schemaLocation = "http://www.isotc211.org/2005/gfc https://www.isotc211.org/2005/gfc/gfc.xsd">
 
   <gfc:memberName>
     <gco:LocalName>
diff --git a/core/sis-metadata/src/test/resources/org/apache/sis/metadata/xml/2007/PositionalAccuracy.xml b/core/sis-metadata/src/test/resources/org/apache/sis/metadata/xml/2007/PositionalAccuracy.xml
index 8df980e..8173de2 100644
--- a/core/sis-metadata/src/test/resources/org/apache/sis/metadata/xml/2007/PositionalAccuracy.xml
+++ b/core/sis-metadata/src/test/resources/org/apache/sis/metadata/xml/2007/PositionalAccuracy.xml
@@ -22,7 +22,7 @@
     xmlns:gmd = "http://www.isotc211.org/2005/gmd"
     xmlns:gco = "http://www.isotc211.org/2005/gco"
     xmlns:xsi = "http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation = "http://www.isotc211.org/2005/gmd http://schemas.opengis.net/iso/19139/20070417/gmd/gmd.xsd">
+    xsi:schemaLocation = "http://www.isotc211.org/2005/gmd https://www.isotc211.org/2005/gmd/gmd.xsd">
 
   <!--
     The <nameOfMeasure> element below is the main purpose of MetadataMarshallingTest.testPositionalAccuracy().
@@ -55,7 +55,7 @@
                 <gco:DateTime>2009-08-12T19:40:17.653+02:00</gco:DateTime>
               </gmd:date>
               <gmd:dateType>
-                <gmd:CI_DateTypeCode codeList="http://schemas.opengis.net/iso/19139/20070417/resources/Codelist/gmxCodelists.xml#CI_DateTypeCode" codeListValue="creation">Creation</gmd:CI_DateTypeCode>
+                <gmd:CI_DateTypeCode codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#CI_DateTypeCode" codeListValue="creation">Creation</gmd:CI_DateTypeCode>
               </gmd:dateType>
             </gmd:CI_Date>
           </gmd:date>
diff --git a/core/sis-metadata/src/test/resources/org/apache/sis/metadata/xml/2007/ProcessStep.xml b/core/sis-metadata/src/test/resources/org/apache/sis/metadata/xml/2007/ProcessStep.xml
index 158c2dd..059d237 100644
--- a/core/sis-metadata/src/test/resources/org/apache/sis/metadata/xml/2007/ProcessStep.xml
+++ b/core/sis-metadata/src/test/resources/org/apache/sis/metadata/xml/2007/ProcessStep.xml
@@ -24,7 +24,7 @@
     xmlns:gmi = "http://standards.iso.org/iso/19115/-2/gmi/1.0"
     xmlns:xsi = "http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation = "http://standards.iso.org/iso/19115/-2/gmi/1.0
-                          http://standards.iso.org/iso/19115/-2/gmi/1.0/gmi.xsd">
+                          https://standards.iso.org/iso/19115/-2/gmi/1.0/gmi.xsd">
 
   <gmd:description>
     <gco:CharacterString>Some process step.</gco:CharacterString>
diff --git a/core/sis-metadata/src/test/resources/org/apache/sis/metadata/xml/2007/ServiceIdentification.xml b/core/sis-metadata/src/test/resources/org/apache/sis/metadata/xml/2007/ServiceIdentification.xml
index 8b3557d..209225e 100644
--- a/core/sis-metadata/src/test/resources/org/apache/sis/metadata/xml/2007/ServiceIdentification.xml
+++ b/core/sis-metadata/src/test/resources/org/apache/sis/metadata/xml/2007/ServiceIdentification.xml
@@ -51,7 +51,7 @@
   </srv:coupledResource>
 
   <srv:couplingType>
-    <srv:SV_CouplingType codeList="http://schemas.opengis.net/iso/19139/20070417/resources/Codelist/gmxCodelists.xml#SV_CouplingType" codeListValue="loose">Loose</srv:SV_CouplingType>
+    <srv:SV_CouplingType codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#SV_CouplingType" codeListValue="loose">Loose</srv:SV_CouplingType>
   </srv:couplingType>
 
   <srv:containsOperations>
@@ -60,7 +60,7 @@
         <gco:CharacterString>Get Map</gco:CharacterString>
       </srv:operationName>
       <srv:DCP>
-        <srv:DCPList codeList="http://schemas.opengis.net/iso/19139/20070417/resources/Codelist/gmxCodelists.xml#DCPList" codeListValue="WebServices">Web services</srv:DCPList>
+        <srv:DCPList codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#DCPList" codeListValue="WebServices">Web services</srv:DCPList>
       </srv:DCP>
       <srv:parameters>          <!-- This has been renamed <srv:parameter> in ISO 19115:2014. -->
         <srv:SV_Parameter>
diff --git a/core/sis-metadata/src/test/resources/org/apache/sis/metadata/xml/2016/Citation.xml b/core/sis-metadata/src/test/resources/org/apache/sis/metadata/xml/2016/Citation.xml
index 72051a8..d6a43ba 100644
--- a/core/sis-metadata/src/test/resources/org/apache/sis/metadata/xml/2016/Citation.xml
+++ b/core/sis-metadata/src/test/resources/org/apache/sis/metadata/xml/2016/Citation.xml
@@ -24,8 +24,8 @@
     xmlns:gcx="http://standards.iso.org/iso/19115/-3/gcx/1.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:xlink="http://www.w3.org/1999/xlink"
-    xsi:schemaLocation = "http://standards.iso.org/iso/19115/-3/cit/1.0 http://standards.iso.org/iso/19115/-3/cit/1.0/cit.xsd
-                          http://standards.iso.org/iso/19115/-3/gcx/1.0 http://standards.iso.org/iso/19115/-3/gcx/1.0/gcx.xsd">
+    xsi:schemaLocation = "http://standards.iso.org/iso/19115/-3/cit/1.0 https://standards.iso.org/iso/19115/-3/cit/1.0/cit.xsd
+                          http://standards.iso.org/iso/19115/-3/gcx/1.0 https://standards.iso.org/iso/19115/-3/gcx/1.0/gcx.xsd">
 
   <cit:title>
     <gco:CharacterString>Fight against poverty</gco:CharacterString>
diff --git a/core/sis-metadata/src/test/resources/org/apache/sis/metadata/xml/2016/Extent.xml b/core/sis-metadata/src/test/resources/org/apache/sis/metadata/xml/2016/Extent.xml
index b66ee27..f8dcf3f 100644
--- a/core/sis-metadata/src/test/resources/org/apache/sis/metadata/xml/2016/Extent.xml
+++ b/core/sis-metadata/src/test/resources/org/apache/sis/metadata/xml/2016/Extent.xml
@@ -24,7 +24,7 @@
     xmlns:gml = "http://www.opengis.net/gml/3.2"
     xmlns:xsi = "http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation = "http://standards.iso.org/iso/19115/-3/gex/1.0
-                          http://standards.iso.org/iso/19115/-3/gex/1.0/gex.xsd">
+                          https://standards.iso.org/iso/19115/-3/gex/1.0/gex.xsd">
 
   <gex:geographicElement>
     <gex:EX_GeographicBoundingBox id="bbox">
diff --git a/core/sis-metadata/src/test/resources/org/apache/sis/metadata/xml/2016/Locales.xml b/core/sis-metadata/src/test/resources/org/apache/sis/metadata/xml/2016/Locales.xml
index 5d09faf..53eb7bb 100644
--- a/core/sis-metadata/src/test/resources/org/apache/sis/metadata/xml/2016/Locales.xml
+++ b/core/sis-metadata/src/test/resources/org/apache/sis/metadata/xml/2016/Locales.xml
@@ -23,7 +23,7 @@
     xmlns:lan = "http://standards.iso.org/iso/19115/-3/lan/1.0"
     xmlns:xsi = "http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation = "http://standards.iso.org/iso/19115/-3/mdb/1.0
-                          http://standards.iso.org/iso/19115/-3/mdb/1.0/mdb.xsd">
+                          https://standards.iso.org/iso/19115/-3/mdb/1.0/mdb.xsd">
 
   <mdb:defaultLocale>
     <lan:PT_Locale>
diff --git a/core/sis-metadata/src/test/resources/org/apache/sis/metadata/xml/2016/Metadata.xml b/core/sis-metadata/src/test/resources/org/apache/sis/metadata/xml/2016/Metadata.xml
index 051599a..0a1d3f9 100644
--- a/core/sis-metadata/src/test/resources/org/apache/sis/metadata/xml/2016/Metadata.xml
+++ b/core/sis-metadata/src/test/resources/org/apache/sis/metadata/xml/2016/Metadata.xml
@@ -38,16 +38,16 @@
     xmlns:xsi = "http://www.w3.org/2001/XMLSchema-instance"
     xmlns:xlink = "http://www.w3.org/1999/xlink"
     xsi:schemaLocation =
-        "http://standards.iso.org/iso/19115/-3/mdb/1.0 http://standards.iso.org/iso/19115/-3/mdb/1.0/mdb.xsd
-         http://standards.iso.org/iso/19115/-3/mrs/1.0 http://standards.iso.org/iso/19115/-3/mrs/1.0/mrs.xsd
-         http://standards.iso.org/iso/19115/-3/msr/1.0 http://standards.iso.org/iso/19115/-3/msr/1.0/msr.xsd
-         http://standards.iso.org/iso/19115/-3/mrc/1.0 http://standards.iso.org/iso/19115/-3/mrc/1.0/mrc.xsd
-         http://standards.iso.org/iso/19115/-3/mrd/1.0 http://standards.iso.org/iso/19115/-3/mrd/1.0/mrd.xsd
-         http://standards.iso.org/iso/19115/-3/mco/1.0 http://standards.iso.org/iso/19115/-3/mco/1.0/mco.xsd
-         http://standards.iso.org/iso/19115/-3/mmi/1.0 http://standards.iso.org/iso/19115/-3/mmi/1.0/mmi.xsd
-         http://standards.iso.org/iso/19115/-3/mex/1.0 http://standards.iso.org/iso/19115/-3/mex/1.0/mex.xsd
-         http://standards.iso.org/iso/19115/-3/gcx/1.0 http://standards.iso.org/iso/19115/-3/gcx/1.0/gcx.xsd
-         http://standards.iso.org/iso/19115/-3/srv/2.0 http://standards.iso.org/iso/19115/-3/srv/2.0/srv.xsd">
+        "http://standards.iso.org/iso/19115/-3/mdb/1.0 https://standards.iso.org/iso/19115/-3/mdb/1.0/mdb.xsd
+         http://standards.iso.org/iso/19115/-3/mrs/1.0 https://standards.iso.org/iso/19115/-3/mrs/1.0/mrs.xsd
+         http://standards.iso.org/iso/19115/-3/msr/1.0 https://standards.iso.org/iso/19115/-3/msr/1.0/msr.xsd
+         http://standards.iso.org/iso/19115/-3/mrc/1.0 https://standards.iso.org/iso/19115/-3/mrc/1.0/mrc.xsd
+         http://standards.iso.org/iso/19115/-3/mrd/1.0 https://standards.iso.org/iso/19115/-3/mrd/1.0/mrd.xsd
+         http://standards.iso.org/iso/19115/-3/mco/1.0 https://standards.iso.org/iso/19115/-3/mco/1.0/mco.xsd
+         http://standards.iso.org/iso/19115/-3/mmi/1.0 https://standards.iso.org/iso/19115/-3/mmi/1.0/mmi.xsd
+         http://standards.iso.org/iso/19115/-3/mex/1.0 https://standards.iso.org/iso/19115/-3/mex/1.0/mex.xsd
+         http://standards.iso.org/iso/19115/-3/gcx/1.0 https://standards.iso.org/iso/19115/-3/gcx/1.0/gcx.xsd
+         http://standards.iso.org/iso/19115/-3/srv/2.0 https://standards.iso.org/iso/19115/-3/srv/2.0/srv.xsd">
 
   <!--
     WARNING: this file is not yet compliant with ISO schema.
@@ -264,7 +264,7 @@
             <gco:Integer>7777</gco:Integer>
           </msr:dimensionSize>
           <msr:resolution>
-            <gco:Measure uom="http://schemas.opengis.net/iso/19139/20070417/resources/uom/gmxUom.xml#xpointer(//*[@gml:id='m'])">10.0</gco:Measure>
+            <gco:Measure uom="http://www.isotc211.org/2005/resources/uom/gmxUom.xml#xpointer(//*[@gml:id='m'])">10.0</gco:Measure>
           </msr:resolution>
         </msr:MD_Dimension>
       </msr:axisDimensionProperties>
@@ -277,7 +277,7 @@
             <gco:Integer>2233</gco:Integer>
           </msr:dimensionSize>
           <msr:resolution>
-            <gco:Measure uom="http://schemas.opengis.net/iso/19139/20070417/resources/uom/gmxUom.xml#xpointer(//*[@gml:id='m'])">5.0</gco:Measure>
+            <gco:Measure uom="http://www.isotc211.org/2005/resources/uom/gmxUom.xml#xpointer(//*[@gml:id='m'])">5.0</gco:Measure>
           </msr:resolution>
         </msr:MD_Dimension>
       </msr:axisDimensionProperties>
@@ -440,7 +440,7 @@
       <mri:spatialResolution>
         <mri:MD_Resolution>
           <mri:distance>
-            <gco:Distance uom="http://schemas.opengis.net/iso/19139/20070417/resources/uom/gmxUom.xml#xpointer(//*[@gml:id='m'])">56777.0</gco:Distance>
+            <gco:Distance uom="http://www.isotc211.org/2005/resources/uom/gmxUom.xml#xpointer(//*[@gml:id='m'])">56777.0</gco:Distance>
           </mri:distance>
         </mri:MD_Resolution>
       </mri:spatialResolution>
@@ -719,7 +719,7 @@
           <mri:spatialResolution>
             <mri:MD_Resolution>
               <mri:distance>
-                <gco:Distance uom="http://schemas.opengis.net/iso/19139/20070417/resources/uom/gmxUom.xml#xpointer(//*[@gml:id='m'])">56777.0</gco:Distance>
+                <gco:Distance uom="http://www.isotc211.org/2005/resources/uom/gmxUom.xml#xpointer(//*[@gml:id='m'])">56777.0</gco:Distance>
               </mri:distance>
             </mri:MD_Resolution>
           </mri:spatialResolution>
diff --git a/core/sis-metadata/src/test/resources/org/apache/sis/metadata/xml/2016/Multiplicity.xml b/core/sis-metadata/src/test/resources/org/apache/sis/metadata/xml/2016/Multiplicity.xml
index 72fa62c..0acb517 100644
--- a/core/sis-metadata/src/test/resources/org/apache/sis/metadata/xml/2016/Multiplicity.xml
+++ b/core/sis-metadata/src/test/resources/org/apache/sis/metadata/xml/2016/Multiplicity.xml
@@ -21,7 +21,8 @@
 <gco:Multiplicity
     xmlns:gco          = "http://standards.iso.org/iso/19115/-3/gco/1.0"
     xmlns:xsi          = "http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation = "http://standards.iso.org/iso/19115/-3/gco/1.0  http://standards.iso.org/iso/19115/-3/gco/1.0/gco.xsd">
+    xsi:schemaLocation = "http://standards.iso.org/iso/19115/-3/gco/1.0
+                          https://standards.iso.org/iso/19115/-3/gco/1.0/gco.xsd">
 
   <!--
     We provide this file for completion and comparison purposes, but the tests do not use it
diff --git a/core/sis-metadata/src/test/resources/org/apache/sis/metadata/xml/2016/PositionalAccuracy.xml b/core/sis-metadata/src/test/resources/org/apache/sis/metadata/xml/2016/PositionalAccuracy.xml
index bd72dd2..ec8d6b7 100644
--- a/core/sis-metadata/src/test/resources/org/apache/sis/metadata/xml/2016/PositionalAccuracy.xml
+++ b/core/sis-metadata/src/test/resources/org/apache/sis/metadata/xml/2016/PositionalAccuracy.xml
@@ -25,8 +25,8 @@
     xmlns:lan="http://standards.iso.org/iso/19115/-3/lan/1.0"
     xmlns:gco="http://standards.iso.org/iso/19115/-3/gco/1.0"
     xmlns:xsi = "http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation = "http://standards.iso.org/iso/19157/-2/mdq/1.0 http://standards.iso.org/iso/19157/-2/mdq/1.0/mdq.xsd
-                          http://standards.iso.org/iso/19115/-3/lan/1.0 http://standards.iso.org/iso/19115/-3/lan/1.0/lan.xsd">
+    xsi:schemaLocation = "http://standards.iso.org/iso/19157/-2/mdq/1.0 https://standards.iso.org/iso/19157/-2/mdq/1.0/mdq.xsd
+                          http://standards.iso.org/iso/19115/-3/lan/1.0 https://standards.iso.org/iso/19115/-3/lan/1.0/lan.xsd">
 
   <!--
     The <measure> element below is the main purpose of MetadataMarshallingTest.testPositionalAccuracy().
@@ -67,7 +67,7 @@
                 <gco:DateTime>2009-08-12T19:40:17.653+02:00</gco:DateTime>
               </cit:date>
               <cit:dateType>
-                <cit:CI_DateTypeCode codeList="http://schemas.opengis.net/iso/19139/20070417/resources/Codelist/gmxCodelists.xml#CI_DateTypeCode" codeListValue="creation">Creation</cit:CI_DateTypeCode>
+                <cit:CI_DateTypeCode codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#CI_DateTypeCode" codeListValue="creation">Creation</cit:CI_DateTypeCode>
               </cit:dateType>
             </cit:CI_Date>
           </cit:date>
diff --git a/core/sis-metadata/src/test/resources/org/apache/sis/metadata/xml/2016/ProcessStep.xml b/core/sis-metadata/src/test/resources/org/apache/sis/metadata/xml/2016/ProcessStep.xml
index c700b2b..7345e38 100644
--- a/core/sis-metadata/src/test/resources/org/apache/sis/metadata/xml/2016/ProcessStep.xml
+++ b/core/sis-metadata/src/test/resources/org/apache/sis/metadata/xml/2016/ProcessStep.xml
@@ -24,7 +24,7 @@
     xmlns:gco = "http://standards.iso.org/iso/19115/-3/gco/1.0"
     xmlns:xsi = "http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation = "http://standards.iso.org/iso/19115/-3/mrl/1.0
-                          http://standards.iso.org/iso/19115/-3/mrl/1.0/mrl.xsd">
+                          https://standards.iso.org/iso/19115/-3/mrl/1.0/mrl.xsd">
 
   <mrl:description>
     <gco:CharacterString>Some process step.</gco:CharacterString>
diff --git a/core/sis-metadata/src/test/resources/org/apache/sis/metadata/xml/2016/ServiceIdentification.xml b/core/sis-metadata/src/test/resources/org/apache/sis/metadata/xml/2016/ServiceIdentification.xml
index 8b8954e..8dcd11d 100644
--- a/core/sis-metadata/src/test/resources/org/apache/sis/metadata/xml/2016/ServiceIdentification.xml
+++ b/core/sis-metadata/src/test/resources/org/apache/sis/metadata/xml/2016/ServiceIdentification.xml
@@ -25,7 +25,7 @@
     xmlns:gco = "http://standards.iso.org/iso/19115/-3/gco/1.0"
     xmlns:xsi = "http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation = "http://standards.iso.org/iso/19115/-3/srv/2.0
-                          http://standards.iso.org/iso/19115/-3/srv/2.0/srv.xsd">
+                          https://standards.iso.org/iso/19115/-3/srv/2.0/srv.xsd">
 
   <mri:citation gco:nilReason="missing"/>
   <mri:abstract>
diff --git a/core/sis-referencing/src/test/resources/org/apache/sis/test/integration/Metadata with vertical CRS.xml b/core/sis-referencing/src/test/resources/org/apache/sis/test/integration/Metadata with vertical CRS.xml
index 848cb2a..f093216 100644
--- a/core/sis-referencing/src/test/resources/org/apache/sis/test/integration/Metadata with vertical CRS.xml	
+++ b/core/sis-referencing/src/test/resources/org/apache/sis/test/integration/Metadata with vertical CRS.xml	
@@ -24,15 +24,15 @@
         xmlns:gml = "http://www.opengis.net/gml/3.2"
         xmlns:xsi = "http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation = "http://www.opengis.net/gml/3.2   http://schemas.opengis.net/gml/3.2.1/datums.xsd
-                              http://www.isotc211.org/2005/gmd http://schemas.opengis.net/iso/19139/20070417/gmd/gmd.xsd">
+                              http://www.isotc211.org/2005/gmd https://www.isotc211.org/2005/gmd/gmd.xsd">
   <gmd:fileIdentifier>
     <gco:CharacterString>20090901</gco:CharacterString>
   </gmd:fileIdentifier>
   <gmd:language>
-    <gmd:LanguageCode codeList="http://schemas.opengis.net/iso/19139/20070417/resources/Codelist/gmxCodelists.xml#LanguageCode" codeListValue="eng">English</gmd:LanguageCode>
+    <gmd:LanguageCode codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#LanguageCode" codeListValue="eng">English</gmd:LanguageCode>
   </gmd:language>
   <gmd:characterSet>
-    <gmd:MD_CharacterSetCode codeList="http://schemas.opengis.net/iso/19139/20070417/resources/Codelist/gmxCodelists.xml#MD_CharacterSetCode" codeListValue="utf8">UTF-8</gmd:MD_CharacterSetCode>
+    <gmd:MD_CharacterSetCode codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#MD_CharacterSetCode" codeListValue="utf8">UTF-8</gmd:MD_CharacterSetCode>
   </gmd:characterSet>
   <gmd:contact>
     <gmd:CI_ResponsibleParty>
@@ -47,14 +47,14 @@
                 <gmd:URL>http://sis.apache.org</gmd:URL>
               </gmd:linkage>
               <gmd:function>
-                <gmd:CI_OnLineFunctionCode codeList="http://schemas.opengis.net/iso/19139/20070417/resources/Codelist/gmxCodelists.xml#CI_OnLineFunctionCode" codeListValue="information" codeSpace="eng">Information</gmd:CI_OnLineFunctionCode>
+                <gmd:CI_OnLineFunctionCode codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#CI_OnLineFunctionCode" codeListValue="information" codeSpace="eng">Information</gmd:CI_OnLineFunctionCode>
               </gmd:function>
             </gmd:CI_OnlineResource>
           </gmd:onlineResource>
         </gmd:CI_Contact>
       </gmd:contactInfo>
       <gmd:role>
-        <gmd:CI_RoleCode codeList="http://schemas.opengis.net/iso/19139/20070417/resources/Codelist/gmxCodelists.xml#CI_RoleCode" codeListValue="principalInvestigator">Principal investigator</gmd:CI_RoleCode>
+        <gmd:CI_RoleCode codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#CI_RoleCode" codeListValue="principalInvestigator">Principal investigator</gmd:CI_RoleCode>
       </gmd:role>
     </gmd:CI_ResponsibleParty>
   </gmd:contact>
@@ -66,7 +66,7 @@
       <gmd:geometricObjects>
         <gmd:MD_GeometricObjects>
           <gmd:geometricObjectType>
-            <gmd:MD_GeometricObjectTypeCode codeList="http://schemas.opengis.net/iso/19139/20070417/resources/Codelist/gmxCodelists.xml#MD_GeometricObjectTypeCode" codeListValue="point">Point</gmd:MD_GeometricObjectTypeCode>
+            <gmd:MD_GeometricObjectTypeCode codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#MD_GeometricObjectTypeCode" codeListValue="point">Point</gmd:MD_GeometricObjectTypeCode>
           </gmd:geometricObjectType>
         </gmd:MD_GeometricObjects>
       </gmd:geometricObjects>
@@ -93,7 +93,7 @@
         <gco:CharacterString>SIS test</gco:CharacterString>
       </gmd:abstract>
       <gmd:language>
-        <gmd:LanguageCode codeList="http://schemas.opengis.net/iso/19139/20070417/resources/Codelist/gmxCodelists.xml#LanguageCode" codeListValue="eng">English</gmd:LanguageCode>
+        <gmd:LanguageCode codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#LanguageCode" codeListValue="eng">English</gmd:LanguageCode>
       </gmd:language>
       <gmd:extent>
         <gmd:EX_Extent>
diff --git a/core/sis-referencing/src/test/resources/org/apache/sis/test/integration/Metadata.xml b/core/sis-referencing/src/test/resources/org/apache/sis/test/integration/Metadata.xml
index 17932c7..c4c29fb 100644
--- a/core/sis-referencing/src/test/resources/org/apache/sis/test/integration/Metadata.xml
+++ b/core/sis-referencing/src/test/resources/org/apache/sis/test/integration/Metadata.xml
@@ -25,20 +25,20 @@
     xmlns:gco   = "http://www.isotc211.org/2005/gco"
     xmlns:xsi   = "http://www.w3.org/2001/XMLSchema-instance"
     xmlns:xlink = "http://www.w3.org/1999/xlink"
-    xsi:schemaLocation = "http://www.isotc211.org/2005/gmd http://schemas.opengis.net/iso/19139/20070417/gmd/gmd.xsd
-                          http://www.isotc211.org/2005/gmx http://schemas.opengis.net/iso/19139/20070417/gmx/gmx.xsd">
+    xsi:schemaLocation = "http://www.isotc211.org/2005/gmd https://www.isotc211.org/2005/gmd/gmd.xsd
+                          http://www.isotc211.org/2005/gmx https://www.isotc211.org/2005/gmx/gmx.xsd">
 
   <gmd:fileIdentifier>
     <gco:CharacterString>test/Metadata.xml</gco:CharacterString>
   </gmd:fileIdentifier>
   <gmd:language>
-    <gmd:LanguageCode codeListValue="eng" codeList="http://schemas.opengis.net/iso/19139/20070417/resources/Codelist/gmxCodelists.xml#LanguageCode">English</gmd:LanguageCode>
+    <gmd:LanguageCode codeListValue="eng" codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#LanguageCode">English</gmd:LanguageCode>
   </gmd:language>
   <gmd:characterSet>
-    <gmd:MD_CharacterSetCode codeListValue="utf8" codeList="http://schemas.opengis.net/iso/19139/20070417/resources/Codelist/gmxCodelists.xml#MD_CharacterSetCode">UTF-8</gmd:MD_CharacterSetCode>
+    <gmd:MD_CharacterSetCode codeListValue="utf8" codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#MD_CharacterSetCode">UTF-8</gmd:MD_CharacterSetCode>
   </gmd:characterSet>
   <gmd:hierarchyLevel>
-    <gmd:MD_ScopeCode codeSpace="eng" codeListValue="dataset" codeList="http://schemas.opengis.net/iso/19139/20070417/resources/Codelist/gmxCodelists.xml#MD_ScopeCode">Dataset</gmd:MD_ScopeCode>
+    <gmd:MD_ScopeCode codeSpace="eng" codeListValue="dataset" codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#MD_ScopeCode">Dataset</gmd:MD_ScopeCode>
   </gmd:hierarchyLevel>
   <gmd:hierarchyLevelName>
     <gmx:Anchor xlink:href="SDN:L231:3:CDI">Pseudo Common Data Index record</gmx:Anchor>
@@ -97,7 +97,7 @@
       <!-- End of section to be referenced later. -->
 
       <gmd:role>
-        <gmd:CI_RoleCode codeListValue="author" codeList="http://schemas.opengis.net/iso/19139/20070417/resources/Codelist/gmxCodelists.xml#CI_RoleCode">Author</gmd:CI_RoleCode>
+        <gmd:CI_RoleCode codeListValue="author" codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#CI_RoleCode">Author</gmd:CI_RoleCode>
       </gmd:role>
     </gmd:CI_ResponsibleParty>
   </gmd:contact>
@@ -109,7 +109,7 @@
       <gmd:geometricObjects>
         <gmd:MD_GeometricObjects>
           <gmd:geometricObjectType>
-            <gmd:MD_GeometricObjectTypeCode codeListValue="point" codeList="http://schemas.opengis.net/iso/19139/20070417/resources/Codelist/gmxCodelists.xml#MD_GeometricObjectTypeCode">Point</gmd:MD_GeometricObjectTypeCode>
+            <gmd:MD_GeometricObjectTypeCode codeListValue="point" codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#MD_GeometricObjectTypeCode">Point</gmd:MD_GeometricObjectTypeCode>
           </gmd:geometricObjectType>
         </gmd:MD_GeometricObjects>
       </gmd:geometricObjects>
@@ -160,7 +160,7 @@
             <gco:CharacterString>European Directory of Marine Organisations</gco:CharacterString>
           </gmd:definition>
           <gmd:dataType>
-            <gmd:MD_DatatypeCode codeListValue="codelist" codeList="http://schemas.opengis.net/iso/19139/20070417/resources/Codelist/gmxCodelists.xml#MD_DatatypeCode">Codelist</gmd:MD_DatatypeCode>
+            <gmd:MD_DatatypeCode codeListValue="codelist" codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#MD_DatatypeCode">Codelist</gmd:MD_DatatypeCode>
           </gmd:dataType>
           <gmd:parentEntity>
             <gco:CharacterString>SeaDataNet</gco:CharacterString>
@@ -189,7 +189,7 @@
                 <gco:Date>1990-06-05</gco:Date>
               </gmd:date>
               <gmd:dateType>
-                <gmd:CI_DateTypeCode codeSpace="eng" codeListValue="revision" codeList="http://schemas.opengis.net/iso/19139/20070417/resources/Codelist/gmxCodelists.xml#CI_DateTypeCode">Revision</gmd:CI_DateTypeCode>
+                <gmd:CI_DateTypeCode codeSpace="eng" codeListValue="revision" codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#CI_DateTypeCode">Revision</gmd:CI_DateTypeCode>
               </gmd:dateType>
             </gmd:CI_Date>
           </gmd:date>
@@ -199,7 +199,7 @@
                 <gco:Date>1979-08-03</gco:Date>
               </gmd:date>
               <gmd:dateType>
-                <gmd:CI_DateTypeCode codeSpace="eng" codeListValue="creation" codeList="http://schemas.opengis.net/iso/19139/20070417/resources/Codelist/gmxCodelists.xml#CI_DateTypeCode">Creation</gmd:CI_DateTypeCode>
+                <gmd:CI_DateTypeCode codeSpace="eng" codeListValue="creation" codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#CI_DateTypeCode">Creation</gmd:CI_DateTypeCode>
               </gmd:dateType>
             </gmd:CI_Date>
           </gmd:date>
@@ -249,7 +249,7 @@
                 </gmd:CI_Contact>
               </gmd:contactInfo>
               <gmd:role>
-                <gmd:CI_RoleCode codeListValue="originator" codeList="http://schemas.opengis.net/iso/19139/20070417/resources/Codelist/gmxCodelists.xml#CI_RoleCode">Originator</gmd:CI_RoleCode>
+                <gmd:CI_RoleCode codeListValue="originator" codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#CI_RoleCode">Originator</gmd:CI_RoleCode>
               </gmd:role>
             </gmd:CI_ResponsibleParty>
           </gmd:citedResponsibleParty>
@@ -265,7 +265,7 @@
           </gmd:organisationName>
           <gmd:contactInfo xlink:href="#IFREMER"/>
           <gmd:role>
-            <gmd:CI_RoleCode codeListValue="custodian" codeList="http://schemas.opengis.net/iso/19139/20070417/resources/Codelist/gmxCodelists.xml#CI_RoleCode">Custodian</gmd:CI_RoleCode>
+            <gmd:CI_RoleCode codeListValue="custodian" codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#CI_RoleCode">Custodian</gmd:CI_RoleCode>
           </gmd:role>
         </gmd:CI_ResponsibleParty>
       </gmd:pointOfContact>
@@ -285,7 +285,7 @@
             <gmx:Anchor xlink:href="SDN:P021:35:ATTN">Transmittance and attenuance of the water column</gmx:Anchor>
           </gmd:keyword>
           <gmd:type>
-            <gmd:MD_KeywordTypeCode codeListValue="theme" codeList="http://schemas.opengis.net/iso/19139/20070417/resources/Codelist/gmxCodelists.xml#MD_KeywordTypeCode">Theme</gmd:MD_KeywordTypeCode>
+            <gmd:MD_KeywordTypeCode codeListValue="theme" codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#MD_KeywordTypeCode">Theme</gmd:MD_KeywordTypeCode>
           </gmd:type>
           <gmd:thesaurusName>
             <gmd:CI_Citation>
@@ -301,7 +301,7 @@
                     <gco:Date>2008-11-26</gco:Date>
                   </gmd:date>
                   <gmd:dateType>
-                    <gmd:CI_DateTypeCode codeSpace="eng" codeListValue="revision" codeList="http://schemas.opengis.net/iso/19139/20070417/resources/Codelist/gmxCodelists.xml#CI_DateTypeCode">Revision</gmd:CI_DateTypeCode>
+                    <gmd:CI_DateTypeCode codeSpace="eng" codeListValue="revision" codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#CI_DateTypeCode">Revision</gmd:CI_DateTypeCode>
                   </gmd:dateType>
                 </gmd:CI_Date>
               </gmd:date>
@@ -322,7 +322,7 @@
       <gmd:resourceConstraints>
         <gmd:MD_LegalConstraints>
           <gmd:accessConstraints>
-            <gmd:MD_RestrictionCode codeListValue="license" codeList="http://schemas.opengis.net/iso/19139/20070417/resources/Codelist/gmxCodelists.xml#MD_RestrictionCode">Licence</gmd:MD_RestrictionCode>
+            <gmd:MD_RestrictionCode codeListValue="license" codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#MD_RestrictionCode">Licence</gmd:MD_RestrictionCode>
           </gmd:accessConstraints>
         </gmd:MD_LegalConstraints>
       </gmd:resourceConstraints>
@@ -342,22 +342,22 @@
                     <gco:Date>1990-06-05</gco:Date>
                   </gmd:date>
                   <gmd:dateType>
-                    <gmd:CI_DateTypeCode codeSpace="eng" codeListValue="revision" codeList="http://schemas.opengis.net/iso/19139/20070417/resources/Codelist/gmxCodelists.xml#CI_DateTypeCode">Revision</gmd:CI_DateTypeCode>
+                    <gmd:CI_DateTypeCode codeSpace="eng" codeListValue="revision" codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#CI_DateTypeCode">Revision</gmd:CI_DateTypeCode>
                   </gmd:dateType>
                 </gmd:CI_Date>
               </gmd:date>
             </gmd:CI_Citation>
           </gmd:aggregateDataSetName>
           <gmd:associationType>
-            <gmd:DS_AssociationTypeCode codeListValue="largerWorkCitation" codeList="http://schemas.opengis.net/iso/19139/20070417/resources/Codelist/gmxCodelists.xml#DS_AssociationTypeCode">Larger work citation</gmd:DS_AssociationTypeCode>
+            <gmd:DS_AssociationTypeCode codeListValue="largerWorkCitation" codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#DS_AssociationTypeCode">Larger work citation</gmd:DS_AssociationTypeCode>
           </gmd:associationType>
           <gmd:initiativeType>
-            <gmd:DS_InitiativeTypeCode codeListValue="campaign" codeList="http://schemas.opengis.net/iso/19139/20070417/resources/Codelist/gmxCodelists.xml#DS_InitiativeTypeCode">Campaign</gmd:DS_InitiativeTypeCode>
+            <gmd:DS_InitiativeTypeCode codeListValue="campaign" codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#DS_InitiativeTypeCode">Campaign</gmd:DS_InitiativeTypeCode>
           </gmd:initiativeType>
         </gmd:MD_AggregateInformation>
       </gmd:aggregationInfo>
       <gmd:language>
-        <gmd:LanguageCode codeListValue="eng" codeList="http://schemas.opengis.net/iso/19139/20070417/resources/Codelist/gmxCodelists.xml#LanguageCode">English</gmd:LanguageCode>
+        <gmd:LanguageCode codeListValue="eng" codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#LanguageCode">English</gmd:LanguageCode>
       </gmd:language>
       <gmd:topicCategory>
         <gmd:MD_TopicCategoryCode>oceans</gmd:MD_TopicCategoryCode>
@@ -465,7 +465,7 @@
               </gmd:organisationName>
               <gmd:contactInfo xlink:href="#IFREMER"/>
               <gmd:role>
-                <gmd:CI_RoleCode codeListValue="distributor" codeList="http://schemas.opengis.net/iso/19139/20070417/resources/Codelist/gmxCodelists.xml#CI_RoleCode">Distributor</gmd:CI_RoleCode>
+                <gmd:CI_RoleCode codeListValue="distributor" codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#CI_RoleCode">Distributor</gmd:CI_RoleCode>
               </gmd:role>
             </gmd:CI_ResponsibleParty>
           </gmd:distributorContact>
@@ -488,7 +488,7 @@
                 <gco:CharacterString>Dummy download link</gco:CharacterString>
               </gmd:description>
               <gmd:function>
-                <gmd:CI_OnLineFunctionCode codeSpace="eng" codeListValue="download" codeList="http://schemas.opengis.net/iso/19139/20070417/resources/Codelist/gmxCodelists.xml#CI_OnLineFunctionCode">Download</gmd:CI_OnLineFunctionCode>
+                <gmd:CI_OnLineFunctionCode codeSpace="eng" codeListValue="download" codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#CI_OnLineFunctionCode">Download</gmd:CI_OnLineFunctionCode>
               </gmd:function>
             </gmd:CI_OnlineResource>
           </gmd:onLine>
diff --git a/core/sis-utility/src/main/java/org/apache/sis/internal/util/XPaths.java b/core/sis-utility/src/main/java/org/apache/sis/internal/util/XPaths.java
index 1716279..a1d1dca 100644
--- a/core/sis-utility/src/main/java/org/apache/sis/internal/util/XPaths.java
+++ b/core/sis-utility/src/main/java/org/apache/sis/internal/util/XPaths.java
@@ -43,7 +43,7 @@ public final class XPaths extends Static {
      * Examples:
      * <ul>
      *   <li>{@code "urn:ogc:def:uom:EPSG::9001"}</li>
-     *   <li>{@code "http://schemas.opengis.net/iso/19139/20070417/resources/uom/gmxUom.xml#xpointer(//*[@gml:id='m'])"}</li>
+     *   <li>{@code "http://www.isotc211.org/2005/resources/uom/gmxUom.xml#xpointer(//*[@gml:id='m'])"}</li>
      * </ul>
      *
      * @param  uri     the URI candidate to verify.
@@ -88,7 +88,7 @@ scan:   while (offset < length) {
      *
      * <ul>
      *   <li>{@code uom} for Unit Of Measurement (example:
-     *       {@code "http://schemas.opengis.net/iso/19139/20070417/resources/uom/gmxUom.xml#xpointer(//*[@gml:id='m'])"})</li>
+     *       {@code "http://www.isotc211.org/2005/resources/uom/gmxUom.xml#xpointer(//*[@gml:id='m'])"})</li>
      * </ul>
      *
      * @param  type  the object type.
diff --git a/core/sis-utility/src/main/java/org/apache/sis/measure/UnitFormat.java b/core/sis-utility/src/main/java/org/apache/sis/measure/UnitFormat.java
index 81c3ac7..002cf2f 100644
--- a/core/sis-utility/src/main/java/org/apache/sis/measure/UnitFormat.java
+++ b/core/sis-utility/src/main/java/org/apache/sis/measure/UnitFormat.java
@@ -1138,7 +1138,7 @@ appPow: if (unit == null) {
             }
             /*
              * Not an EPSG code. Maybe it is a URI like this example:
-             * http://schemas.opengis.net/iso/19139/20070417/resources/uom/gmxUom.xml#xpointer(//*[@gml:id='m'])
+             * http://www.isotc211.org/2005/resources/uom/gmxUom.xml#xpointer(//*[@gml:id='m'])
              *
              * If we find such 'uom' value, we could replace 'symbols' by that 'uom'. But it would cause a wrong
              * error index to be reported in case of parsing failure. We will rather try to adjust the indices
diff --git a/core/sis-utility/src/test/java/org/apache/sis/internal/util/DefinitionURITest.java b/core/sis-utility/src/test/java/org/apache/sis/internal/util/DefinitionURITest.java
index 68f46a9..22965fa 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/internal/util/DefinitionURITest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/internal/util/DefinitionURITest.java
@@ -230,6 +230,7 @@ public final strictfp class DefinitionURITest extends TestCase {
         assertEquals("4326", DefinitionURI.codeOf("crs", "EPSG", "http://www.opengis.net/gml/srs/epsg.xml#4326"));
         assertNull  (        DefinitionURI.codeOf("crs", "OGC",  "http://www.opengis.net/gml/srs/epsg.xml#4326"));
         assertNull  (        DefinitionURI.codeOf("uom", "EPSG", "http://www.opengis.net/gml/srs/epsg.xml#4326"));
+        assertNull  (        DefinitionURI.codeOf("uom", "EPSG", "http://www.isotc211.org/2005/resources/uom/gmxUom.xml#xpointer(//*[@gml:id='m'])"));
         assertNull  (        DefinitionURI.codeOf("uom", "EPSG", "http://schemas.opengis.net/iso/19139/20070417/resources/uom/gmxUom.xml#xpointer(//*[@gml:id='m'])"));
     }
 }
diff --git a/core/sis-utility/src/test/java/org/apache/sis/internal/util/XPathsTest.java b/core/sis-utility/src/test/java/org/apache/sis/internal/util/XPathsTest.java
index 4e25076..4f29043 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/internal/util/XPathsTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/internal/util/XPathsTest.java
@@ -27,7 +27,7 @@ import static org.junit.Assert.*;
  * Tests {@link XPaths}.
  *
  * @author  Martin Desruisseaux (Geomatys)
- * @version 0.8
+ * @version 1.1
  * @since   0.4
  * @module
  */
@@ -40,6 +40,7 @@ public final strictfp class XPathsTest extends TestCase {
     @Test
     public void testEndOfURI() {
         assertEquals(26, XPaths.endOfURI("urn:ogc:def:uom:EPSG::9001", 0));
+        assertEquals(80, XPaths.endOfURI("http://www.isotc211.org/2005/resources/uom/gmxUom.xml#xpointer(//*[@gml:id='m'])", 0));
         assertEquals(97, XPaths.endOfURI("http://schemas.opengis.net/iso/19139/20070417/resources/uom/gmxUom.xml#xpointer(//*[@gml:id='m'])", 0));
         assertEquals(-1, XPaths.endOfURI("m/s", 0));
         assertEquals(-1, XPaths.endOfURI("m.s", 0));
@@ -51,8 +52,8 @@ public final strictfp class XPathsTest extends TestCase {
      */
     @Test
     public void testXPointer() {
-        assertEquals("m", XPaths.xpointer("uom", "http://schemas.opengis.net/iso/19139/20070417/resources/uom/gmxUom.xml#m"));
-        assertEquals("m", XPaths.xpointer("uom", "http://schemas.opengis.net/iso/19139/20070417/resources/uom/gmxUom.xml#xpointer(//*[@gml:id='m'])"));
+        assertEquals("m", XPaths.xpointer("uom", "http://www.isotc211.org/2005/resources/uom/gmxUom.xml#m"));
+        assertEquals("m", XPaths.xpointer("uom", "http://www.isotc211.org/2005/resources/uom/gmxUom.xml#xpointer(//*[@gml:id='m'])"));
         assertEquals("m", XPaths.xpointer("uom", "http://standards.iso.org/ittf/PubliclyAvailableStandards/ISO_19139_Schemas/resources/uom/ML_gmxUom.xml#xpointer(//*[@gml:id='m'])"));
         assertEquals("m", XPaths.xpointer("uom", "../uom/ML_gmxUom.xml#xpointer(//*[@gml:id='m'])"));
     }
diff --git a/core/sis-utility/src/test/java/org/apache/sis/measure/UnitFormatTest.java b/core/sis-utility/src/test/java/org/apache/sis/measure/UnitFormatTest.java
index af2b8e7..df8b7bc 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/measure/UnitFormatTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/measure/UnitFormatTest.java
@@ -427,7 +427,7 @@ public final strictfp class UnitFormatTest extends TestCase {
         final UnitFormat f = new UnitFormat(Locale.UK);
         assertSame(Units.METRE,             f.parse("urn:ogc:def:uom:EPSG::9001"));
         assertSame(Units.METRES_PER_SECOND, f.parse("urn:ogc:def:uom:EPSG::1026"));
-        assertSame(Units.METRE, f.parse("http://schemas.opengis.net/iso/19139/20070417/resources/uom/gmxUom.xml#xpointer(//*[@gml:id='m'])"));
+        assertSame(Units.METRE, f.parse("http://www.isotc211.org/2005/resources/uom/gmxUom.xml#xpointer(//*[@gml:id='m'])"));
     }
 
     /**
diff --git a/core/sis-utility/src/test/java/org/apache/sis/measure/UnitsTest.java b/core/sis-utility/src/test/java/org/apache/sis/measure/UnitsTest.java
index f2747b3..9e277b3 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/measure/UnitsTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/measure/UnitsTest.java
@@ -364,7 +364,7 @@ public final strictfp class UnitsTest extends TestCase {
         assertSame(METRE,  valueOf("EPSG:9001"));
         assertSame(DEGREE, valueOf(" epsg : 9102"));
         assertSame(DEGREE, valueOf("urn:ogc:def:uom:EPSG::9102"));
-        assertSame(METRE,  valueOf("http://schemas.opengis.net/iso/19139/20070417/resources/uom/gmxUom.xml#xpointer(//*[@gml:id='m'])"));
+        assertSame(METRE,  valueOf("http://www.isotc211.org/2005/resources/uom/gmxUom.xml#xpointer(//*[@gml:id='m'])"));
         assertSame(METRE,  valueOf("gmxUom.xml#m"));
 
         assertSame(TROPICAL_YEAR,                   valueOfEPSG(1029));
diff --git a/profiles/sis-french-profile/src/test/resources/org/apache/sis/internal/profile/fra/DirectReferenceSystem.xml b/profiles/sis-french-profile/src/test/resources/org/apache/sis/internal/profile/fra/DirectReferenceSystem.xml
index b284eb4..9e1c0ed 100644
--- a/profiles/sis-french-profile/src/test/resources/org/apache/sis/internal/profile/fra/DirectReferenceSystem.xml
+++ b/profiles/sis-french-profile/src/test/resources/org/apache/sis/internal/profile/fra/DirectReferenceSystem.xml
@@ -51,14 +51,14 @@
                             <gmd:URL>http://www.epsg.org</gmd:URL>
                           </gmd:linkage>
                           <gmd:function>
-                            <gmd:CI_OnLineFunctionCode codeList="http://schemas.opengis.net/iso/19139/20070417/resources/Codelist/gmxCodelists.xml#CI_OnLineFunctionCode" codeListValue="information">Information</gmd:CI_OnLineFunctionCode>
+                            <gmd:CI_OnLineFunctionCode codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#CI_OnLineFunctionCode" codeListValue="information">Information</gmd:CI_OnLineFunctionCode>
                           </gmd:function>
                         </gmd:CI_OnlineResource>
                       </gmd:onlineResource>
                     </gmd:CI_Contact>
                   </gmd:contactInfo>
                   <gmd:role>
-                    <gmd:CI_RoleCode codeList="http://schemas.opengis.net/iso/19139/20070417/resources/Codelist/gmxCodelists.xml#CI_RoleCode" codeListValue="principalInvestigator">Principal investigator</gmd:CI_RoleCode>
+                    <gmd:CI_RoleCode codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#CI_RoleCode" codeListValue="principalInvestigator">Principal investigator</gmd:CI_RoleCode>
                   </gmd:role>
                 </gmd:CI_ResponsibleParty>
               </gmd:citedResponsibleParty>
diff --git a/src/main/javadoc/sis.css b/src/main/javadoc/sis.css
index 1710847..e9f2278 100644
--- a/src/main/javadoc/sis.css
+++ b/src/main/javadoc/sis.css
@@ -64,12 +64,7 @@ table.sis tr td {
 /*
  * Optionally add a line or column separator.
  */
-table.sis tr th.hsep {
-  border-top-width: 1px;
-  border-top-style: solid;
-  border-top-color: darkgray;
-}
-
+table.sis tr th.hsep,
 table.sis tr td.hsep {
   border-top-width: 1px;
   border-top-style: solid;


Mime
View raw message