You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sis.apache.org by de...@apache.org on 2022/10/14 09:36:33 UTC
[sis] branch geoapi-4.0 updated: Replace "https://standards.iso.org/iso/" URL by "https://schemas.isotc211.org/" for downloading XSD files. This change does not impact namespaces of elements in XML files, which stay on "standards.iso.org". The ISO/TC 211 URL seems more stable and is advised as the official schema repository for TC 211.
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
The following commit(s) were added to refs/heads/geoapi-4.0 by this push:
new 8a0a390a7b Replace "https://standards.iso.org/iso/" URL by "https://schemas.isotc211.org/" for downloading XSD files. This change does not impact namespaces of elements in XML files, which stay on "standards.iso.org". The ISO/TC 211 URL seems more stable and is advised as the official schema repository for TC 211.
8a0a390a7b is described below
commit 8a0a390a7bcfe9435d64a2c61c2fdae8c623ec34
Author: Martin Desruisseaux <ma...@geomatys.com>
AuthorDate: Fri Oct 14 11:34:04 2022 +0200
Replace "https://standards.iso.org/iso/" URL by "https://schemas.isotc211.org/" for downloading XSD files.
This change does not impact namespaces of elements in XML files, which stay on "standards.iso.org".
The ISO/TC 211 URL seems more stable and is advised as the official schema repository for TC 211.
---
.../apache/sis/internal/jaxb/cat/CodeListUID.java | 10 +++-
.../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 +-
.../main/java/org/apache/sis/xml/Namespaces.java | 68 +++++++++++-----------
.../internal/jaxb/cat/CodeListMarshallingTest.java | 2 +-
.../sis/metadata/xml/SchemaComplianceTest.java | 4 +-
.../org/apache/sis/test/xml/PackageVerifier.java | 10 ++--
.../org/apache/sis/test/xml/SchemaCompliance.java | 2 +-
.../apache/sis/metadata/xml/2007/ProcessStep.xml | 2 +-
.../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 | 20 +++----
.../apache/sis/metadata/xml/2016/Multiplicity.xml | 2 +-
.../apache/sis/metadata/xml/2016/ProcessStep.xml | 2 +-
.../metadata/xml/2016/ServiceIdentification.xml | 2 +-
.../apache/sis/internal/system/DataDirectory.java | 2 +-
.../org/apache/sis/internal/util/Constants.java | 7 +--
pom.xml | 2 +-
29 files changed, 84 insertions(+), 83 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 398fa94226..12ea227d48 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
@@ -83,8 +83,14 @@ import org.apache.sis.internal.jaxb.Context;
@XmlType(name = "CodeList", propOrder = {"codeList", "codeListValue", "codeSpace"})
public final class CodeListUID {
/**
- * The root directory of ISO 19115 metadata schemas.
- * This is the schema used by default in Apache SIS.
+ * The namespace root of ISO 19115 objects.
+ * This is the namespace used by default in Apache SIS.
+ *
+ * <h4>Historical note</h4>
+ * The XSD files can be downloaded from that URL as well, but we sometime experiment unexpected end of file.
+ * The same files can be downloaded from <a href="https://schemas.isotc211.org/">ISO/TC 211 repository</a>,
+ * which seems more stable. The TC 211 repository is used for downloads, while the standard ISO URL is sill
+ * used for namespaces.
*/
public static final String METADATA_ROOT = "http://standards.iso.org/iso/19115/";
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 1db697b4ed..45efc76b17 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="https://standards.iso.org/iso/19115/-3/mac/1.0/mac.xsd",
+@XmlSchema(location="https://schemas.isotc211.org/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 9d4e0fbffa..3770ab1656 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="https://standards.iso.org/iso/19115/-3/cit/1.0/cit.xsd",
+@XmlSchema(location="https://schemas.isotc211.org/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 a048dab94a..2a2bb7ce9a 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="https://standards.iso.org/iso/19115/-3/mco/1.0/mco.xsd",
+@XmlSchema(location="https://schemas.isotc211.org/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 38cccd3697..f52eb5f3c3 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="https://standards.iso.org/iso/19115/-3/mrc/1.0/mrc.xsd",
+@XmlSchema(location="https://schemas.isotc211.org/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 f391908375..45e5ffc676 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="https://standards.iso.org/iso/19115/-3/mrd/1.0/mrd.xsd",
+@XmlSchema(location="https://schemas.isotc211.org/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 3f83535df4..522677e968 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="https://standards.iso.org/iso/19115/-3/gex/1.0/gex.xsd",
+@XmlSchema(location="https://schemas.isotc211.org/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 61e0ecc9b4..59ecd6080a 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="https://standards.iso.org/iso/19115/-3/mri/1.0/mri.xsd",
+@XmlSchema(location="https://schemas.isotc211.org/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 78181f9e1f..6f4f1ac4bf 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="https://standards.iso.org/iso/19115/-3/mrl/1.0/mrl.xsd",
+@XmlSchema(location="https://schemas.isotc211.org/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 30b4edbc56..a5ec98b428 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="https://standards.iso.org/iso/19115/-3/mmi/1.0/mmi.xsd",
+@XmlSchema(location="https://schemas.isotc211.org/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 8fb34867ad..ca91955ed4 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="https://standards.iso.org/iso/19115/-3/mdb/1.0/mdb.xsd",
+@XmlSchema(location="https://schemas.isotc211.org/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 4e287027e8..0650db257b 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
@@ -44,7 +44,7 @@
* @since 0.3
* @module
*/
-@XmlSchema(location="https://standards.iso.org/iso/19157/-2/mdq/1.0/mdq.xsd",
+@XmlSchema(location="https://schemas.isotc211.org/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 bd643c8fa6..4ef118f9d9 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="https://standards.iso.org/iso/19115/-3/msr/1.0/msr.xsd",
+@XmlSchema(location="https://schemas.isotc211.org/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/Namespaces.java b/core/sis-metadata/src/main/java/org/apache/sis/xml/Namespaces.java
index 46c7417140..338b2e0427 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/xml/Namespaces.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/xml/Namespaces.java
@@ -102,7 +102,7 @@ public final class Namespaces extends Static {
/**
* The <code>{@value}</code> URL. This is the namespace of
- * <a href="http://standards.iso.org/iso/19115/-3/lan/1.0/index.html">Language localization (LAN) version 1.0</a>.
+ * <a href="https://schemas.isotc211.org/19115/-3/lan/1.0/index.html">Language localization (LAN) version 1.0</a>.
* The usual prefix for this namespace is {@code "lan"}.
*
* @category ISO
@@ -112,7 +112,7 @@ public final class Namespaces extends Static {
/**
* The <code>{@value}</code> URL. This is the namespace of
- * <a href="http://standards.iso.org/iso/19115/-3/gco/1.0/index.html">Geographic COmmon (GCO) version 1.0</a>.
+ * <a href="https://schemas.isotc211.org/19115/-3/gco/1.0/index.html">Geographic COmmon (GCO) version 1.0</a>.
* The usual prefix for this namespace is {@code "gco"}.
*
* <p>History</p>
@@ -129,7 +129,7 @@ public final class Namespaces extends Static {
/**
* The <code>{@value}</code> URL. This is the namespace of
- * <a href="http://standards.iso.org/iso/19115/-3/mcc/1.0/index.html">Metadata Common Classes (MCC) version 1.0</a>.
+ * <a href="https://schemas.isotc211.org/19115/-3/mcc/1.0/index.html">Metadata Common Classes (MCC) version 1.0</a>.
* The usual prefix for this namespace is {@code "mcc"}.
*
* @category ISO
@@ -139,7 +139,7 @@ public final class Namespaces extends Static {
/**
* The <code>{@value}</code> URL. This is the namespace of
- * <a href="http://standards.iso.org/iso/19110/fcc/1.0/index.html">Feature Catalog Common (FCC) version 1.0</a>.
+ * <a href="https://schemas.isotc211.org/19110/fcc/1.0/index.html">Feature Catalog Common (FCC) version 1.0</a>.
* The usual prefix for this namespace is {@code "fcc"}.
*
* @category ISO
@@ -149,7 +149,7 @@ public final class Namespaces extends Static {
/**
* The <code>{@value}</code> URL. This is the namespace of
- * <a href="http://standards.iso.org/iso/19110/gfc/1.1/index.html">General Feature Catalog (GFC) version 1.1</a>.
+ * <a href="https://schemas.isotc211.org/19110/gfc/1.1/index.html">General Feature Catalog (GFC) version 1.1</a>.
* The usual prefix for this namespace is {@code "gfc"}.
*
* <p>History</p>
@@ -166,7 +166,7 @@ public final class Namespaces extends Static {
/**
* The <code>{@value}</code> URL. This is the namespace of
- * <a href="http://standards.iso.org/iso/19115/-3/cat/1.0/index.html">CATalogue (CAT) version 1.0</a>.
+ * <a href="https://schemas.isotc211.org/19115/-3/cat/1.0/index.html">CATalogue (CAT) version 1.0</a>.
* The usual prefix for this namespace is {@code "cat"}.
*
* @category ISO
@@ -176,7 +176,7 @@ public final class Namespaces extends Static {
/**
* The <code>{@value}</code> URL. This is the namespace of
- * <a href="http://standards.iso.org/iso/19115/-3/mdb/1.0/index.html">Metadata Base (MDB) version 1.0</a>.
+ * <a href="https://schemas.isotc211.org/19115/-3/mdb/1.0/index.html">Metadata Base (MDB) version 1.0</a>.
* The usual prefix for this namespace is {@code "mdb"}.
*
* @category ISO
@@ -186,7 +186,7 @@ public final class Namespaces extends Static {
/**
* The <code>{@value}</code> URL. This is the namespace of
- * <a href="http://standards.iso.org/iso/19115/-3/cit/1.0/index.html">Citation and responsible party information (CIT) version 1.0</a>.
+ * <a href="https://schemas.isotc211.org/19115/-3/cit/1.0/index.html">Citation and responsible party information (CIT) version 1.0</a>.
* The usual prefix for this namespace is {@code "cit"}.
*
* @category ISO
@@ -196,7 +196,7 @@ public final class Namespaces extends Static {
/**
* The <code>{@value}</code> URL. This is the namespace of
- * <a href="http://standards.iso.org/iso/19115/-3/gex/1.0/index.html">Geospatial EXtent (GEX) version 1.0</a>.
+ * <a href="https://schemas.isotc211.org/19115/-3/gex/1.0/index.html">Geospatial EXtent (GEX) version 1.0</a>.
* The usual prefix for this namespace is {@code "gex"}.
*
* @category ISO
@@ -206,7 +206,7 @@ public final class Namespaces extends Static {
/**
* The <code>{@value}</code> URL. This is the namespace of
- * <a href="http://standards.iso.org/iso/19115/-3/mrs/1.0/index.html">Metadata for Reference System (MRS) version 1.0</a>.
+ * <a href="https://schemas.isotc211.org/19115/-3/mrs/1.0/index.html">Metadata for Reference System (MRS) version 1.0</a>.
* The usual prefix for this namespace is {@code "mrs"}.
*
* @category ISO
@@ -216,7 +216,7 @@ public final class Namespaces extends Static {
/**
* The <code>{@value}</code> URL. This is the namespace of
- * <a href="http://standards.iso.org/iso/19111/rce/1.0/index.html">Referencing By Coordinates Common (RCE) version 1.0</a>.
+ * <a href="https://schemas.isotc211.org/19111/rce/1.0/index.html">Referencing By Coordinates Common (RCE) version 1.0</a>.
* The usual prefix for this namespace is {@code "rce"}.
*
* @category ISO
@@ -226,7 +226,7 @@ public final class Namespaces extends Static {
/**
* The <code>{@value}</code> URL. This is the namespace of
- * <a href="http://standards.iso.org/iso/19115/-3/msr/1.0/index.html">Metadata for Spatial Representation (MSR) version 1.0</a>.
+ * <a href="https://schemas.isotc211.org/19115/-3/msr/1.0/index.html">Metadata for Spatial Representation (MSR) version 1.0</a>.
* The usual prefix for this namespace is {@code "msr"}.
*
* @category ISO
@@ -236,7 +236,7 @@ public final class Namespaces extends Static {
/**
* The <code>{@value}</code> URL. This is the namespace of
- * <a href="http://standards.iso.org/iso/19115/-3/mrc/1.0/index.html">Metadata for Resource Content (MRC) version 1.0</a>.
+ * <a href="https://schemas.isotc211.org/19115/-3/mrc/1.0/index.html">Metadata for Resource Content (MRC) version 1.0</a>.
* The usual prefix for this namespace is {@code "mrc"}.
*
* @category ISO
@@ -246,7 +246,7 @@ public final class Namespaces extends Static {
/**
* The <code>{@value}</code> URL. This is the namespace of
- * <a href="http://standards.iso.org/iso/19115/-3/mri/1.0/index.html">Metadata for Resource Identification (MRI) version 1.0</a>.
+ * <a href="https://schemas.isotc211.org/19115/-3/mri/1.0/index.html">Metadata for Resource Identification (MRI) version 1.0</a>.
* The usual prefix for this namespace is {@code "mri"}.
*
* @category ISO
@@ -256,7 +256,7 @@ public final class Namespaces extends Static {
/**
* The <code>{@value}</code> URL. This is the namespace of
- * <a href="http://standards.iso.org/iso/19115/-3/mrd/1.0/index.html">Metadata for Resource Distribution (MRD) version 1.0</a>.
+ * <a href="https://schemas.isotc211.org/19115/-3/mrd/1.0/index.html">Metadata for Resource Distribution (MRD) version 1.0</a>.
* The usual prefix for this namespace is {@code "mrd"}.
*
* @category ISO
@@ -266,7 +266,7 @@ public final class Namespaces extends Static {
/**
* The <code>{@value}</code> URL. This is the namespace of
- * <a href="http://standards.iso.org/iso/19115/-3/mdt/1.0/index.html">Metadata for Data Transfer (MDT) version 1.0</a>.
+ * <a href="https://schemas.isotc211.org/19115/-3/mdt/1.0/index.html">Metadata for Data Transfer (MDT) version 1.0</a>.
* The usual prefix for this namespace is {@code "mdt"}.
*
* @category ISO
@@ -276,7 +276,7 @@ public final class Namespaces extends Static {
/**
* The <code>{@value}</code> URL. This is the namespace of
- * <a href="http://standards.iso.org/iso/19115/-3/mco/1.0/index.html">Metadata for Constraints (MCO) version 1.0</a>.
+ * <a href="https://schemas.isotc211.org/19115/-3/mco/1.0/index.html">Metadata for Constraints (MCO) version 1.0</a>.
* The usual prefix for this namespace is {@code "mco"}.
*
* @category ISO
@@ -286,7 +286,7 @@ public final class Namespaces extends Static {
/**
* The <code>{@value}</code> URL. This is the namespace of
- * <a href="http://standards.iso.org/iso/19115/-3/mac/1.0/index.html">Metadata for Acquisition (MAC) version 1.0</a>.
+ * <a href="https://schemas.isotc211.org/19115/-3/mac/1.0/index.html">Metadata for Acquisition (MAC) version 1.0</a>.
* The usual prefix for this namespace is {@code "mac"}.
*
* @category ISO
@@ -296,7 +296,7 @@ public final class Namespaces extends Static {
/**
* The <code>{@value}</code> URL. This is the namespace of
- * <a href="http://standards.iso.org/iso/19115/-3/mrl/1.0/index.html">Metadata for Resource Lineage (MRL) version 1.0</a>.
+ * <a href="https://schemas.isotc211.org/19115/-3/mrl/1.0/index.html">Metadata for Resource Lineage (MRL) version 1.0</a>.
* The usual prefix for this namespace is {@code "mrl"}.
*
* @category ISO
@@ -306,7 +306,7 @@ public final class Namespaces extends Static {
/**
* The <code>{@value}</code> URL. This is the namespace of
- * <a href="http://standards.iso.org/iso/19115/-3/mmi/1.0/index.html">Metadata for Maintenance Information (MMI) version 1.0</a>.
+ * <a href="https://schemas.isotc211.org/19115/-3/mmi/1.0/index.html">Metadata for Maintenance Information (MMI) version 1.0</a>.
* The usual prefix for this namespace is {@code "mmi"}.
*
* @category ISO
@@ -316,7 +316,7 @@ public final class Namespaces extends Static {
/**
* The <code>{@value}</code> URL. This is the namespace of
- * <a href="http://standards.iso.org/iso/19157/-2/dqc/1.0/index.html">Data Quality Common Classes (DQC) version 1.0</a>.
+ * <a href="https://schemas.isotc211.org/19157/-2/dqc/1.0/index.html">Data Quality Common Classes (DQC) version 1.0</a>.
* The usual prefix for this namespace is {@code "dqc"}.
*
* @category ISO
@@ -326,7 +326,7 @@ public final class Namespaces extends Static {
/**
* The <code>{@value}</code> URL. This is the namespace of
- * <a href="http://standards.iso.org/iso/19157/-2/mdq/1.0/index.html">Metadata for Data Quality (MDQ) version 1.0</a>.
+ * <a href="https://schemas.isotc211.org/19157/-2/mdq/1.0/index.html">Metadata for Data Quality (MDQ) version 1.0</a>.
* The usual prefix for this namespace is {@code "mdq"}.
*
* @category ISO
@@ -336,7 +336,7 @@ public final class Namespaces extends Static {
/**
* The <code>{@value}</code> URL. This is the namespace of
- * <a href="http://standards.iso.org/iso/19157/-2/dqm/1.0/index.html">Data Quality Measures (DQM) version 1.0</a>.
+ * <a href="https://schemas.isotc211.org/19157/-2/dqm/1.0/index.html">Data Quality Measures (DQM) version 1.0</a>.
* The usual prefix for this namespace is {@code "dqm"}.
*
* @category ISO
@@ -346,7 +346,7 @@ public final class Namespaces extends Static {
/**
* The <code>{@value}</code> URL. This is the namespace of
- * <a href="http://standards.iso.org/iso/19115/-3/mds/1.0/index.html">Metadata for Data and Services (MDS) version 1.0</a>.
+ * <a href="https://schemas.isotc211.org/19115/-3/mds/1.0/index.html">Metadata for Data and Services (MDS) version 1.0</a>.
* The usual prefix for this namespace is {@code "mds"}.
*
* @category ISO
@@ -356,7 +356,7 @@ public final class Namespaces extends Static {
/**
* The <code>{@value}</code> URL. This is the namespace of
- * <a href="http://standards.iso.org/iso/19115/-3/srv/2.0/index.html">Metadata for Services (SRV) version 2.0</a>.
+ * <a href="https://schemas.isotc211.org/19115/-3/srv/2.0/index.html">Metadata for Services (SRV) version 2.0</a>.
* The usual prefix for this namespace is {@code "srv"}.
*
* <p>History</p>
@@ -374,7 +374,7 @@ public final class Namespaces extends Static {
/**
* The <code>{@value}</code> URL. This is the namespace of
- * <a href="http://standards.iso.org/iso/19115/-3/mpc/1.0/index.html">Metadata for Portrayal Catalog (MPC) version 1.0</a>.
+ * <a href="https://schemas.isotc211.org/19115/-3/mpc/1.0/index.html">Metadata for Portrayal Catalog (MPC) version 1.0</a>.
* The usual prefix for this namespace is {@code "mpc"}.
*
* @category ISO
@@ -384,7 +384,7 @@ public final class Namespaces extends Static {
/**
* The <code>{@value}</code> URL. This is the namespace of
- * <a href="http://standards.iso.org/iso/19115/-3/mda/1.0/index.html">MetaData Application (MDA) version 1.0</a>.
+ * <a href="https://schemas.isotc211.org/19115/-3/mda/1.0/index.html">MetaData Application (MDA) version 1.0</a>.
* The usual prefix for this namespace is {@code "mda"}.
*
* @category ISO
@@ -394,7 +394,7 @@ public final class Namespaces extends Static {
/**
* The <code>{@value}</code> URL. This is the namespace of
- * <a href="http://standards.iso.org/iso/19115/-3/mas/1.0/index.html">Metadata for Application Schema (MAS) version 1.0</a>.
+ * <a href="https://schemas.isotc211.org/19115/-3/mas/1.0/index.html">Metadata for Application Schema (MAS) version 1.0</a>.
* The usual prefix for this namespace is {@code "mas"}.
*
* @category ISO
@@ -404,7 +404,7 @@ public final class Namespaces extends Static {
/**
* The <code>{@value}</code> URL. This is the namespace of
- * <a href="http://standards.iso.org/iso/19115/-3/mex/1.0/index.html">Metadata with Schema Extensions (MEX) version 1.0</a>.
+ * <a href="https://schemas.isotc211.org/19115/-3/mex/1.0/index.html">Metadata with Schema Extensions (MEX) version 1.0</a>.
* The usual prefix for this namespace is {@code "mex"}.
*
* @category ISO
@@ -414,7 +414,7 @@ public final class Namespaces extends Static {
/**
* The <code>{@value}</code> URL. This is the namespace of
- * <a href="http://standards.iso.org/iso/19115/-3/gcx/1.0/index.html">Geospatial Common eXtension (GCX) version 1.0</a>.
+ * <a href="https://schemas.isotc211.org/19115/-3/gcx/1.0/index.html">Geospatial Common eXtension (GCX) version 1.0</a>.
* The usual prefix for this namespace is {@code "gcx"}.
*
* @category ISO
@@ -424,7 +424,7 @@ public final class Namespaces extends Static {
/**
* The <code>{@value}</code> URL. This is the namespace of
- * <a href="http://standards.iso.org/iso/19115/-3/md1/1.0/index.html">Metadata for Data and Services with Geospatial Common Extensions (MD1) version 1.0</a>.
+ * <a href="https://schemas.isotc211.org/19115/-3/md1/1.0/index.html">Metadata for Data and Services with Geospatial Common Extensions (MD1) version 1.0</a>.
* The usual prefix for this namespace is {@code "md1"}.
*
* @category ISO
@@ -434,7 +434,7 @@ public final class Namespaces extends Static {
/**
* The <code>{@value}</code> URL. This is the namespace of
- * <a href="http://standards.iso.org/iso/19115/-3/md2/1.0/index.html">Metadata for Data and Services with Geospatial Common Extensions (MD2) version 1.0</a>.
+ * <a href="https://schemas.isotc211.org/19115/-3/md2/1.0/index.html">Metadata for Data and Services with Geospatial Common Extensions (MD2) version 1.0</a>.
* The usual prefix for this namespace is {@code "md2"}.
*
* @category ISO
@@ -444,7 +444,7 @@ public final class Namespaces extends Static {
/**
* The <code>{@value}</code> URL. This is the namespace of
- * <a href="http://standards.iso.org/iso/19115/-3/gmw/1.0/index.html">Geographic Markup Wrappers (GMW) version 1.0</a>.
+ * <a href="https://schemas.isotc211.org/19115/-3/gmw/1.0/index.html">Geographic Markup Wrappers (GMW) version 1.0</a>.
* The usual prefix for this namespace is {@code "gmw"}.
*
* @category ISO
@@ -516,7 +516,7 @@ public final class Namespaces extends Static {
public static final String XLINK = "http://www.w3.org/1999/xlink";
/**
- * URLs for which the prefix to use directly follows them.
+ * URLs for which the XML prefix to use directly follows an URL starts given in this array.
*/
private static final String[] GENERIC_URLS = {
"http://standards.iso.org/iso/19115/-3/",
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/cat/CodeListMarshallingTest.java b/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/cat/CodeListMarshallingTest.java
index 2ea86e834c..45b64a9a21 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/cat/CodeListMarshallingTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/cat/CodeListMarshallingTest.java
@@ -116,7 +116,7 @@ public final strictfp class CodeListMarshallingTest extends TestCase {
*
* @throws JAXBException if an error occurred while marshalling the XML.
*
- * @see <a href="https://standards.iso.org/iso/19115/-3/">ISO schemas</a>
+ * @see <a href="https://schemas.isotc211.org/19115/">ISO schemas for metadata</a>
*/
@Test
public void testLegacyISO_URL() throws JAXBException {
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/xml/SchemaComplianceTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/xml/SchemaComplianceTest.java
index e03a2ac975..8af857c695 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/xml/SchemaComplianceTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/xml/SchemaComplianceTest.java
@@ -32,7 +32,7 @@ import static org.junit.Assume.*;
* Tests conformance of JAXB annotations with XML schemas if those schemas are available.
* This tests requires the {@code $SIS_DATA/Schemas/iso/19115/-3} directory to exists.
* Those files must be installed manually; they are not distributed with Apache SIS for licensing reasons.
- * Content can be downloaded as ZIP files from <a href="https://standards.iso.org/iso/19115/">ISO portal</a>.
+ * Content can be downloaded as ZIP files from <a href="https://schemas.isotc211.org/19115/">ISO portal</a>.
*
* @author Martin Desruisseaux (Geomatys)
* @version 1.1
@@ -45,7 +45,7 @@ public final strictfp class SchemaComplianceTest extends TestCase {
*
* @throws Exception if an error occurred while checking the schema.
*
- * @see <a href="https://standards.iso.org/iso/19115/-3/">ISO schemas for metadata</a>
+ * @see <a href="https://schemas.isotc211.org/19115/">ISO schemas for metadata</a>
*/
@Test
public void verifyMetadata() throws Exception {
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 7150ec3806..261c52dd4f 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
@@ -42,10 +42,11 @@ import org.opengis.geoapi.SchemaException;
import org.opengis.geoapi.SchemaInformation;
import org.apache.sis.util.Classes;
import org.apache.sis.internal.system.Modules;
-import org.apache.sis.internal.util.Constants;
import org.apache.sis.internal.xml.LegacyNamespaces;
import org.apache.sis.xml.Namespaces;
+import static org.opengis.geoapi.SchemaInformation.ROOT_NAMESPACE;
+import static org.opengis.geoapi.SchemaInformation.SCHEMA_ROOT_URL;
import static org.apache.sis.test.TestCase.PENDING_FUTURE_SIS_VERSION;
@@ -54,7 +55,7 @@ import static org.apache.sis.test.TestCase.PENDING_FUTURE_SIS_VERSION;
* {@link SchemaCompliance#verify(java.nio.file.Path)} for each Java package to be verified.
*
* @author Martin Desruisseaux (Geomatys)
- * @version 1.1
+ * @version 1.3
* @since 1.0
* @module
*/
@@ -173,9 +174,8 @@ final strictfp class PackageVerifier {
String location = schema.location();
if (!XmlSchema.NO_LOCATION.equals(location)) {
String expected = location;
- if (expected.startsWith(Constants.HTTPS)) {
- // Replace "https" (used for schema location) by "http" (used for namespace).
- expected = Constants.HTTP + expected.substring(Constants.HTTPS.length());
+ if (expected.startsWith(SCHEMA_ROOT_URL)) {
+ expected = ROOT_NAMESPACE + expected.substring(SCHEMA_ROOT_URL.length());
}
if (!expected.startsWith(schema.namespace())) {
throw new SchemaException("XML schema location inconsistent with namespace in package " + name);
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/test/xml/SchemaCompliance.java b/core/sis-metadata/src/test/java/org/apache/sis/test/xml/SchemaCompliance.java
index 2372c71526..0351d9b90a 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/test/xml/SchemaCompliance.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/test/xml/SchemaCompliance.java
@@ -37,7 +37,7 @@ import org.apache.sis.util.StringBuilders;
/**
* Compares JAXB annotations against the ISO 19115 schemas. This test requires a connection to
- * <a href="https://standards.iso.org/iso/19115/-3/">https://standards.iso.org/iso/19115/-3/</a>.
+ * <a href="https://schemas.isotc211.org/19115/">https://schemas.isotc211.org/19115/</a>.
* All classes in a given directory are scanned.
*
* <h2>Limitations</h2>
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 059d237bc6..2ce1c479f2 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
- https://standards.iso.org/iso/19115/-2/gmi/1.0/gmi.xsd">
+ https://schemas.isotc211.org/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/2016/Citation.xml b/core/sis-metadata/src/test/resources/org/apache/sis/metadata/xml/2016/Citation.xml
index d6a43ba19e..87f25e480e 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 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">
+ xsi:schemaLocation = "http://standards.iso.org/iso/19115/-3/cit/1.0 https://schemas.isotc211.org/19115/-3/cit/1.0/cit.xsd
+ http://standards.iso.org/iso/19115/-3/gcx/1.0 https://schemas.isotc211.org/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 f8dcf3f2b0..e359175b3b 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
- https://standards.iso.org/iso/19115/-3/gex/1.0/gex.xsd">
+ https://schemas.isotc211.org/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 53eb7bba93..dd365e8412 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
- https://standards.iso.org/iso/19115/-3/mdb/1.0/mdb.xsd">
+ https://schemas.isotc211.org/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 0a1d3f91a7..a159fdd58c 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 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">
+ "http://standards.iso.org/iso/19115/-3/mdb/1.0 https://schemas.isotc211.org/19115/-3/mdb/1.0/mdb.xsd
+ http://standards.iso.org/iso/19115/-3/mrs/1.0 https://schemas.isotc211.org/19115/-3/mrs/1.0/mrs.xsd
+ http://standards.iso.org/iso/19115/-3/msr/1.0 https://schemas.isotc211.org/19115/-3/msr/1.0/msr.xsd
+ http://standards.iso.org/iso/19115/-3/mrc/1.0 https://schemas.isotc211.org/19115/-3/mrc/1.0/mrc.xsd
+ http://standards.iso.org/iso/19115/-3/mrd/1.0 https://schemas.isotc211.org/19115/-3/mrd/1.0/mrd.xsd
+ http://standards.iso.org/iso/19115/-3/mco/1.0 https://schemas.isotc211.org/19115/-3/mco/1.0/mco.xsd
+ http://standards.iso.org/iso/19115/-3/mmi/1.0 https://schemas.isotc211.org/19115/-3/mmi/1.0/mmi.xsd
+ http://standards.iso.org/iso/19115/-3/mex/1.0 https://schemas.isotc211.org/19115/-3/mex/1.0/mex.xsd
+ http://standards.iso.org/iso/19115/-3/gcx/1.0 https://schemas.isotc211.org/19115/-3/gcx/1.0/gcx.xsd
+ http://standards.iso.org/iso/19115/-3/srv/2.0 https://schemas.isotc211.org/19115/-3/srv/2.0/srv.xsd">
<!--
WARNING: this file is not yet compliant with ISO schema.
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 0acb517c00..c79af5c6d0 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
@@ -22,7 +22,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/gco/1.0
- https://standards.iso.org/iso/19115/-3/gco/1.0/gco.xsd">
+ https://schemas.isotc211.org/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/ProcessStep.xml b/core/sis-metadata/src/test/resources/org/apache/sis/metadata/xml/2016/ProcessStep.xml
index 7345e38e19..519f963d18 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
- https://standards.iso.org/iso/19115/-3/mrl/1.0/mrl.xsd">
+ https://schemas.isotc211.org/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 8dcd11dc27..6ee13679d3 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
- https://standards.iso.org/iso/19115/-3/srv/2.0/srv.xsd">
+ https://schemas.isotc211.org/19115/-3/srv/2.0/srv.xsd">
<mri:citation gco:nilReason="missing"/>
<mri:abstract>
diff --git a/core/sis-utility/src/main/java/org/apache/sis/internal/system/DataDirectory.java b/core/sis-utility/src/main/java/org/apache/sis/internal/system/DataDirectory.java
index 3634957ea6..f3103d3c0d 100644
--- a/core/sis-utility/src/main/java/org/apache/sis/internal/system/DataDirectory.java
+++ b/core/sis-utility/src/main/java/org/apache/sis/internal/system/DataDirectory.java
@@ -61,7 +61,7 @@ public enum DataDirectory {
* This directory contains XML schemas published by ISO. If this directory is present,
* it should contain a {@code "iso/19115/-3"} sub-directory among others.
*
- * @see <a href="https://standards.iso.org/iso/19115/-3/">ISO schemas for metadata</a>
+ * @see <a href="https://schemas.isotc211.org/19115/">ISO schemas for metadata</a>
*/
SCHEMAS,
diff --git a/core/sis-utility/src/main/java/org/apache/sis/internal/util/Constants.java b/core/sis-utility/src/main/java/org/apache/sis/internal/util/Constants.java
index 0ae272c746..4112083f1a 100644
--- a/core/sis-utility/src/main/java/org/apache/sis/internal/util/Constants.java
+++ b/core/sis-utility/src/main/java/org/apache/sis/internal/util/Constants.java
@@ -53,15 +53,10 @@ public final class Constants extends Static {
public static final byte DEFAULT_INDENTATION = 2;
/**
- * The {@value} protocol.
+ * The {@value} protocol. Used in XML namespaces.
*/
public static final String HTTP = "http:";
- /**
- * The {@value} protocol.
- */
- public static final String HTTPS = "https:";
-
/**
* The {@value} code space.
*/
diff --git a/pom.xml b/pom.xml
index 9f9979cbb3..779b938e60 100644
--- a/pom.xml
+++ b/pom.xml
@@ -987,7 +987,7 @@
<pluginRepository>
<id>apache.snapshots</id>
<name>Apache Snapshot Repository</name>
- <url>http://repository.apache.org/snapshots</url>
+ <url>https://repository.apache.org/snapshots</url>
<releases>
<enabled>false</enabled>
</releases>