Modify DTD and XML Schema URLs for Unidata switch to "schemas" hostname for these URLS, from "www/schemas/".

ethanrd · ethanrd · commit 4994962d8088 · 2021-10-28T13:23:23.000-06:00
diff --git a/cdm-test/src/test/data/thredds/cataloggen/config/test1CatGenConfig1.0.xml b/cdm-test/src/test/data/thredds/cataloggen/config/test1CatGenConfig1.0.xml
@@ -7,7 +7,7 @@
   xmlns="http://www.unidata.ucar.edu/namespaces/thredds/InvCatalog/v1.0"
   xmlns:catGen="http://www.unidata.ucar.edu/namespaces/thredds/CatalogGenConfig/v0.5"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.unidata.ucar.edu/namespaces/thredds/InvCatalog/v1.0 http://www.unidata.ucar.edu/schemas/thredds/InvCatalog.1.0.xsd"
+  xsi:schemaLocation="http://www.unidata.ucar.edu/namespaces/thredds/InvCatalog/v1.0 https://schemas.unidata.ucar.edu/thredds/InvCatalog.1.0.xsd"
   >
   <dataset name="THREDDS CatalogGen test config file">
     <dataset name="NCEP Eta 80km CONUS model data">
diff --git a/cdm-test/src/test/data/thredds/cataloggen/config/test1CatGenConfigNew1.0.xml b/cdm-test/src/test/data/thredds/cataloggen/config/test1CatGenConfigNew1.0.xml
@@ -7,8 +7,8 @@
          xmlns="http://www.unidata.ucar.edu/namespaces/thredds/InvCatalog/v1.0"
          xmlns:catGen="http://www.unidata.ucar.edu/namespaces/thredds/CatalogGenConfig/v1.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://www.unidata.ucar.edu/namespaces/thredds/InvCatalog/v1.0 http://www.unidata.ucar.edu/schemas/thredds/InvCatalog.1.0.xsd
-                      http://www.unidata.ucar.edu/namespaces/thredds/CatalogGenConfig/v1.0 http://www.unidata.ucar.edu/schemas/thredds/CatalogGenConfig.1.0.xsd"
+         xsi:schemaLocation="http://www.unidata.ucar.edu/namespaces/thredds/InvCatalog/v1.0 https://schemas.unidata.ucar.edu/thredds/InvCatalog.1.0.xsd
+                      http://www.unidata.ucar.edu/namespaces/thredds/CatalogGenConfig/v1.0 https://schemas.unidata.ucar.edu/thredds/CatalogGenConfig.1.0.xsd"
   >
   <service name="mlode" serviceType="DODS" base="http://localhost:8080/thredds/cataloggen/"/>
   <dataset name="THREDDS CatalogGen test config file">
diff --git a/cdm-test/src/test/data/thredds/cataloggen/testCatGen.badAccessPoint.xml b/cdm-test/src/test/data/thredds/cataloggen/testCatGen.badAccessPoint.xml
@@ -3,10 +3,10 @@
   xmlns="http://www.unidata.ucar.edu/namespaces/thredds/InvCatalog/v1.0"
   xmlns:catGen="http://www.unidata.ucar.edu/namespaces/thredds/CatalogGenConfig/v0.5"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.unidata.ucar.edu/namespaces/thredds/InvCatalog/v1.0 http://www.unidata.ucar.edu/schemas/thredds/InvCatalog.1.0.xsd"
+  xsi:schemaLocation="http://www.unidata.ucar.edu/namespaces/thredds/InvCatalog/v1.0 https://schemas.unidata.ucar.edu/thredds/InvCatalog.1.0.xsd"
 >
 <!--?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE catalog SYSTEM "http://www.unidata.ucar.edu/schemas/thredds/CatalogGenConfig.0.5.dtd"-->
+<!DOCTYPE catalog SYSTEM "https://schemas.unidata.ucar.edu/thredds/CatalogGenConfig.0.5.dtd"-->
   <dataset name="CatGen Test for Bad Access Points">
       <metadata inherited="true">
           <serviceName>testServer</serviceName>
diff --git a/cdm-test/src/test/data/thredds/cataloggen/testCatGen.uahRadarLevelII.xml b/cdm-test/src/test/data/thredds/cataloggen/testCatGen.uahRadarLevelII.xml
@@ -3,10 +3,10 @@
   xmlns="http://www.unidata.ucar.edu/namespaces/thredds/InvCatalog/v1.0"
   xmlns:catGen="http://www.unidata.ucar.edu/namespaces/thredds/CatalogGenConfig/v0.5"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.unidata.ucar.edu/namespaces/thredds/InvCatalog/v1.0 http://www.unidata.ucar.edu/schemas/thredds/InvCatalog.1.0.xsd"
+  xsi:schemaLocation="http://www.unidata.ucar.edu/namespaces/thredds/InvCatalog/v1.0 https://schemas.unidata.ucar.edu/thredds/InvCatalog.1.0.xsd"
 >
 <!--?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE catalog SYSTEM "http://www.unidata.ucar.edu/schemas/thredds/CatalogGenConfig.0.5.dtd"-->
+<!DOCTYPE catalog SYSTEM "https://schemas.unidata.ucar.edu/thredds/CatalogGenConfig.0.5.dtd"-->
   <dataset name="UAH/ITSC Data Pool NEXRAD Level 2">
       <metadata inherited="true">
           <serviceName>Data Pool server</serviceName>
diff --git a/cdm/core/src/main/java/ucar/nc2/ncml/NcMLGWriter.java b/cdm/core/src/main/java/ucar/nc2/ncml/NcMLGWriter.java
@@ -31,7 +31,7 @@
 @Deprecated
 public class NcMLGWriter {
   private static Logger logger = LoggerFactory.getLogger(NcMLGWriter.class);
-  protected static final String schemaLocation = "http://www.unidata.ucar.edu/schemas/netcdf-cs.xsd";
+  protected static final String schemaLocation = "https://schemas.unidata.ucar.edu/netcdf-cs.xsd";
 
   /**
    * Write a NetcdfDataset as an NcML-G document to the specified stream.
diff --git a/cdm/core/src/main/resources/resources/thredds/schemas/InvCatalog.1.0.7.xsd b/cdm/core/src/main/resources/resources/thredds/schemas/InvCatalog.1.0.7.xsd
@@ -10,8 +10,8 @@
     version="1.0.7">
 
   <!-- import other namespaces -->
-  <xsd:import namespace="http://www.w3.org/1999/xlink" schemaLocation="http://www.unidata.ucar.edu/schemas/other/xlink.xsd"/>
-  <xsd:import namespace="http://www.unidata.ucar.edu/namespaces/netcdf/ncml-2.2" schemaLocation="http://www.unidata.ucar.edu/schemas/netcdf/ncml-2.2.xsd"/>
+  <xsd:import namespace="http://www.w3.org/1999/xlink" schemaLocation="https://schemas.unidata.ucar.edu/other/xlink.xsd"/>
+  <xsd:import namespace="http://www.unidata.ucar.edu/namespaces/netcdf/ncml-2.2" schemaLocation="https://schemas.unidata.ucar.edu/netcdf/ncml-2.2.xsd"/>
 
   <!-- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx -->
   <!-- Catalog element -->
diff --git a/cdm/core/src/main/resources/resources/thredds/schemas/InvCatalog.1.2.xsd b/cdm/core/src/main/resources/resources/thredds/schemas/InvCatalog.1.2.xsd
@@ -10,8 +10,8 @@
     version="1.2">
 
   <!-- import other namespaces -->
-  <xsd:import namespace="http://www.w3.org/1999/xlink" schemaLocation="http://www.unidata.ucar.edu/schemas/other/xlink.xsd"/>
-  <xsd:import namespace="http://www.unidata.ucar.edu/namespaces/netcdf/ncml-2.2" schemaLocation="http://www.unidata.ucar.edu/schemas/netcdf/ncml-2.2.xsd"/>
+  <xsd:import namespace="http://www.w3.org/1999/xlink" schemaLocation="https://schemas.unidata.ucar.edu/other/xlink.xsd"/>
+  <xsd:import namespace="http://www.unidata.ucar.edu/namespaces/netcdf/ncml-2.2" schemaLocation="https://schemas.unidata.ucar.edu/netcdf/ncml-2.2.xsd"/>
 
   <!-- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx -->
   <!-- Catalog element -->
diff --git a/cdm/core/src/test/data/thredds/catalog/DifTest.xml b/cdm/core/src/test/data/thredds/catalog/DifTest.xml
@@ -2,7 +2,7 @@
 <metadata  xmlns="http://www.unidata.ucar.edu/namespaces/thredds/InvCatalog/v1.0" 
   xmlns:xlink="http://www.w3.org/1999/xlink"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.unidata.ucar.edu/namespaces/thredds/InvCatalog/v1.0 http://www.unidata.ucar.edu/schemas/thredds/InvCatalog.1.0.xsd">
+  xsi:schemaLocation="http://www.unidata.ucar.edu/namespaces/thredds/InvCatalog/v1.0 https://schemas.unidata.ucar.edu/thredds/InvCatalog.1.0.xsd">
   
   <contributor role="Investigator">Mashor Mashnor</contributor>
           
diff --git a/cdm/core/src/test/data/thredds/catalog/MetadataLink.xml b/cdm/core/src/test/data/thredds/catalog/MetadataLink.xml
@@ -3,7 +3,7 @@
     xmlns="http://www.unidata.ucar.edu/namespaces/thredds/InvCatalog/v1.0" 
     xmlns:xlink="http://www.w3.org/1999/xlink"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-    xsi:schemaLocation="http://www.unidata.ucar.edu/namespaces/thredds/InvCatalog/v1.0  http://www.unidata.ucar.edu/schemas/thredds/InvCatalog.1.0.xsd" 
+    xsi:schemaLocation="http://www.unidata.ucar.edu/namespaces/thredds/InvCatalog/v1.0  https://schemas.unidata.ucar.edu/thredds/InvCatalog.1.0.xsd"
     >
  
     <documentation type="summary"> The SAGE III Ozone Loss and Validation Experiment (SOLVE) was a measurement campaign designed to examine the     processes controlling ozone levels at mid- to high latitudes. Measurements were made in the Arctic high-latitude region in winter using the NASA     DC-8 and ER-2 aircraft, as well as balloon platforms and ground-based instruments. The mission also acquired correlative data needed to     validate the Stratospheric Aerosol and Gas Experiment (SAGE) III satellite measurements that will be used to quantitatively assess high-latitude     ozone loss. SOLVE is co-sponsored by the Upper Atmosphere Research Program (UARP), Atmospheric Effects of Aviation Project (AEAP),     Atmospheric Chemistry Modeling and Analysis Program (ACMAP), and Earth Observing System (EOS) of NASA's Earth Science Enterprise     (ESE) as part of the validation program for the SAGE III instrument. 
diff --git a/cdm/core/src/test/data/thredds/catalog/MissingGCProblem.xml b/cdm/core/src/test/data/thredds/catalog/MissingGCProblem.xml
@@ -3,7 +3,7 @@
   xmlns="http://www.unidata.ucar.edu/namespaces/thredds/InvCatalog/v1.0" 
   xmlns:xlink="http://www.w3.org/1999/xlink"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-  xsi:schemaLocation="http://www.unidata.ucar.edu/namespaces/thredds/InvCatalog/v1.0  http://www.unidata.ucar.edu/schemas/thredds/InvCatalog.1.0.xsd">
+  xsi:schemaLocation="http://www.unidata.ucar.edu/namespaces/thredds/InvCatalog/v1.0  https://schemas.unidata.ucar.edu/thredds/InvCatalog.1.0.xsd">
   
   <service name="this" serviceType="OpenDAP" base=""/>
   
diff --git a/cdm/core/src/test/data/thredds/catalog/TestHarvest.xml b/cdm/core/src/test/data/thredds/catalog/TestHarvest.xml
@@ -3,7 +3,7 @@
     xmlns="http://www.unidata.ucar.edu/namespaces/thredds/InvCatalog/v1.0" 
     xmlns:xlink="http://www.w3.org/1999/xlink"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-    xsi:schemaLocation="http://www.unidata.ucar.edu/namespaces/thredds/InvCatalog/v1.0  http://www.unidata.ucar.edu/schemas/thredds/InvCatalog.1.0.xsd" 
+    xsi:schemaLocation="http://www.unidata.ucar.edu/namespaces/thredds/InvCatalog/v1.0  https://schemas.unidata.ucar.edu/thredds/InvCatalog.1.0.xsd"
     expires="6 days since 1999-01-01 12:00:02"
   >
  
diff --git a/cdm/core/src/test/data/thredds/catalog/TestTimeCoverage.xml b/cdm/core/src/test/data/thredds/catalog/TestTimeCoverage.xml
@@ -2,7 +2,7 @@
 <catalog xmlns="http://www.unidata.ucar.edu/namespaces/thredds/InvCatalog/v1.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://www.unidata.ucar.edu/namespaces/thredds/InvCatalog/v1.0
-    http://www.unidata.ucar.edu/schemas/thredds/InvCatalog.1.2.xsd">
+    https://schemas.unidata.ucar.edu/thredds/InvCatalog.1.2.xsd">
 
   <service base="http://acd.ucar.edu/models/MOZART/DATA_COMP/datasets_nc/solve1/" serviceType="HTTP" name="disk"/>
 
diff --git a/cdm/core/src/test/data/thredds/catalog/ZoneMetadata.xml b/cdm/core/src/test/data/thredds/catalog/ZoneMetadata.xml
@@ -2,7 +2,7 @@
 <metadata  xmlns="http://www.unidata.ucar.edu/namespaces/thredds/InvCatalog/v1.0" 
   xmlns:xlink="http://www.w3.org/1999/xlink"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.unidata.ucar.edu/namespaces/thredds/InvCatalog/v1.0 http://www.unidata.ucar.edu/schemas/thredds/InvCatalog.1.0.xsd">
+  xsi:schemaLocation="http://www.unidata.ucar.edu/namespaces/thredds/InvCatalog/v1.0 https://schemas.unidata.ucar.edu/thredds/InvCatalog.1.0.xsd">
   
 <documentation type="summary"> The SAGE III Ozone Loss and Validation Experiment (SOLVE) was a measurement campaign 
  designed to examine the processes controlling ozone levels at mid- to high latitudes. Measurements 
diff --git a/cdm/core/src/test/data/thredds/catalog/catalogDev.xml b/cdm/core/src/test/data/thredds/catalog/catalogDev.xml
@@ -3,7 +3,7 @@
     xmlns="http://www.unidata.ucar.edu/namespaces/thredds/InvCatalog/v1.0" 
     xmlns:xlink="http://www.w3.org/1999/xlink"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-    xsi:schemaLocation="http://www.unidata.ucar.edu/namespaces/thredds/InvCatalog/v1.0  http://www.unidata.ucar.edu/schemas/thredds/InvCatalog.1.0.xsd">
+    xsi:schemaLocation="http://www.unidata.ucar.edu/namespaces/thredds/InvCatalog/v1.0  https://schemas.unidata.ucar.edu/thredds/InvCatalog.1.0.xsd">
 
   <service name="this" serviceType="QueryCapability" base=""/>
   
diff --git a/cdm/core/src/test/data/thredds/catalog/catgen1.0.xml b/cdm/core/src/test/data/thredds/catalog/catgen1.0.xml
@@ -2,7 +2,7 @@
     xmlns="http://www.unidata.ucar.edu/namespaces/thredds/InvCatalog/v1.0" 
     xmlns:xlink="http://www.w3.org/1999/xlink"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-    xsi:schemaLocation="http://www.unidata.ucar.edu/namespaces/thredds/InvCatalog/v1.0  http://www.unidata.ucar.edu/schemas/thredds/InvCatalog.1.0.xsd" 
+    xsi:schemaLocation="http://www.unidata.ucar.edu/namespaces/thredds/InvCatalog/v1.0  https://schemas.unidata.ucar.edu/thredds/InvCatalog.1.0.xsd"
   >
 
     <service name="latest" serviceType="Resolver"
diff --git a/cdm/core/src/test/data/thredds/catalog/dif/metar.thredds.xml b/cdm/core/src/test/data/thredds/catalog/dif/metar.thredds.xml
@@ -3,7 +3,7 @@
 <cat:metadata xmlns:cat="http://www.unidata.ucar.edu/namespaces/thredds/InvCatalog/v1.0" 
   xmlns="http://gcmd.gsfc.nasa.gov/"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-  xsi:schemaLocation="http://www.unidata.ucar.edu/namespaces/thredds/InvCatalog/v1.0 http://www.unidata.ucar.edu/schemas/thredds/InvCatalog.1.0.xsd
+  xsi:schemaLocation="http://www.unidata.ucar.edu/namespaces/thredds/InvCatalog/v1.0 https://schemas.unidata.ucar.edu/thredds/InvCatalog.1.0.xsd
                                         http://gcmd.gsfc.nasa.gov/  file://P:/schemas/other/gcmd/dif.xsd"
   >
 
diff --git a/cdm/core/src/test/data/thredds/catalog/test2.xml b/cdm/core/src/test/data/thredds/catalog/test2.xml
@@ -4,7 +4,7 @@
     xmlns:xlink="http://www.w3.org/1999/xlink"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
     xsi:schemaLocation="http://www.unidata.ucar.edu/namespaces/thredds/InvCatalog/v1.0                          
-              http://www.unidata.ucar.edu/schemas/thredds/InvCatalog.1.0.xsd"
+              https://schemas.unidata.ucar.edu/thredds/InvCatalog.1.0.xsd"
     expires="6 days since 1999-01-01 12:00:02"
     >
  
diff --git a/cdm/core/src/test/data/thredds/catalog/testMetadata.xml b/cdm/core/src/test/data/thredds/catalog/testMetadata.xml
@@ -3,7 +3,7 @@
     xmlns="http://www.unidata.ucar.edu/namespaces/thredds/InvCatalog/v1.0" 
     xmlns:xlink="http://www.w3.org/1999/xlink"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-    xsi:schemaLocation="http://www.unidata.ucar.edu/namespaces/thredds/InvCatalog/v1.0  http://www.unidata.ucar.edu/schemas/thredds/InvCatalog.1.0.xsd" 
+    xsi:schemaLocation="http://www.unidata.ucar.edu/namespaces/thredds/InvCatalog/v1.0  https://schemas.unidata.ucar.edu/thredds/InvCatalog.1.0.xsd"
   >
  
   <service base="http://acd.ucar.edu/models/MOZART/DATA_COMP/datasets_nc/solve1/" serviceType="HTTP" name="disk"/>
diff --git a/docs/src/site/pages/netcdfJava/NcmlOverview.md b/docs/src/site/pages/netcdfJava/NcmlOverview.md
@@ -64,7 +64,7 @@ A more advanced use is to modify existing NetCDF files, as well as to create "vi
 * [Aggregation](ncml_aggregation.html)
 * [Cookbook Examples](ncml_cookbook.html)
 * [Annotated Schema for Netcdf-Java 4](annotated_ncml_schema.html)
-* [ncml-2.2.xsd](https://www.unidata.ucar.edu/schemas/netcdf/ncml-2.2.xsd)
+* [ncml-2.2.xsd](https://schemas.unidata.ucar.edu/netcdf/ncml-2.2.xsd)
 
 ### Acknowledgments and History
 
diff --git a/legacy/src/main/java/thredds/catalog/XMLEntityResolver.java b/legacy/src/main/java/thredds/catalog/XMLEntityResolver.java
@@ -160,7 +160,7 @@ public class XMLEntityResolver implements org.xml.sax.EntityResolver {
   public static final String CATALOG_NAMESPACE_10 = "http://www.unidata.ucar.edu/namespaces/thredds/InvCatalog/v1.0";
 
   // dqc namespaces (still referenced in legacy)
-  // static public final String DQC_NAMESPACE_02 = "http://www.unidata.ucar.edu/schemas/thredds/queryCapability";
+  // static public final String DQC_NAMESPACE_02 = "http://www.unidata.ucar.edu/namespaces/thredds/queryCapability/v0.2";
   // static public final String DQC_NAMESPACE_03 =
   // "http://www.unidata.ucar.edu/namespaces/thredds/queryCapability/v0.3";
   public static final String DQC_NAMESPACE_04 = "http://www.unidata.ucar.edu/namespaces/thredds/queryCapability/v0.4";
@@ -210,36 +210,36 @@ public class XMLEntityResolver implements org.xml.sax.EntityResolver {
 
     // catalog 1.0 schema
     initEntity(CATALOG_NAMESPACE_10, "/resources/thredds/schemas/InvCatalog.1.2.xsd",
-        "http://www.unidata.ucar.edu/schemas/thredds/InvCatalog.1.2.xsd");
+        "https://schemas.unidata.ucar.edu/thredds/InvCatalog.1.2.xsd");
 
     /*
      * catalog 0.6 schema
      * initEntity( CATALOG_NAMESPACE_06,
      * "/resources/thredds/schemas/InvCatalog.0.6.xsd",
-     * "http://www.unidata.ucar.edu/schemas/thredds/InvCatalog.0.6.xsd");
+     * "https://schemas.unidata.ucar.edu/thredds/InvCatalog.0.6.xsd");
      * 
      * // DQC schema 0.2
      * initEntity( DQC_NAMESPACE_02,
      * "/resources/thredds/schemas/queryCapability.0.2.xsd",
-     * "http://www.unidata.ucar.edu/schemas/thredds/queryCapability.0.2.xsd");
+     * "https://schemas.unidata.ucar.edu/thredds/queryCapability.0.2.xsd");
      * 
      * // DQC schema 0.3
      * initEntity( DQC_NAMESPACE_03,
      * "/resources/thredds/schemas/queryCapability.0.3.xsd",
-     * "http://www.unidata.ucar.edu/schemas/thredds/queryCapability.0.3.xsd");
+     * "https://schemas.unidata.ucar.edu/thredds/queryCapability.0.3.xsd");
      */
 
     // DQC schema 0.4
     initEntity(DQC_NAMESPACE_04, "/resources/thredds/schemas/queryCapability.0.4.xsd",
-        "http://www.unidata.ucar.edu/schemas/thredds/queryCapability.0.4.xsd");
+        "https://schemas.unidata.ucar.edu/thredds/queryCapability.0.4.xsd");
 
     // nj22 schema
     initEntity(NJ22_NAMESPACE, "/resources/nj22/schemas/ncml-2.2.xsd",
-        "http://www.unidata.ucar.edu/schemas/netcdf/ncml-2.2.xsd");
+        "https://schemas.unidata.ucar.edu/netcdf/ncml-2.2.xsd");
 
     // XLink schema
     initEntity(XLINK_NAMESPACE, "/resources/thredds/schemas/xlink.xsd",
-        "http://www.unidata.ucar.edu/schemas/other/xlink.xsd");
+        "https://schemas.unidata.ucar.edu/other/xlink.xsd");
 
     /*
      * catgen 0.5 dtd
@@ -257,15 +257,15 @@ public class XMLEntityResolver implements org.xml.sax.EntityResolver {
   public static String getExternalSchemas() {
     if (externalSchemas == null) {
       externalSchemas = XMLEntityResolver.CATALOG_NAMESPACE_10 + " "
-          + "http://www.unidata.ucar.edu/schemas/thredds/InvCatalog.1.0.7.xsd" + " " + XMLEntityResolver.NJ22_NAMESPACE
-          + " " + "http://www.unidata.ucar.edu/schemas/netcdf/ncml-2.2.xsd" + " " + XMLEntityResolver.DQC_NAMESPACE_04
-          + " " + "http://www.unidata.ucar.edu/schemas/thredds/queryCapability.0.4.xsd" + " "
+          + "https://schemas.unidata.ucar.edu/thredds/InvCatalog.1.0.7.xsd" + " " + XMLEntityResolver.NJ22_NAMESPACE
+          + " " + "https://schemas.unidata.ucar.edu/netcdf/ncml-2.2.xsd" + " " + XMLEntityResolver.DQC_NAMESPACE_04
+          + " " + "https://schemas.unidata.ucar.edu/thredds/queryCapability.0.4.xsd" + " "
       /*
        * + XMLEntityResolver.DQC_NAMESPACE_03 + " " +
-       * "http://www.unidata.ucar.edu/schemas/thredds/queryCapability.0.3.xsd" +" " +
+       * "https://schemas.unidata.ucar.edu/thredds/queryCapability.0.3.xsd" +" " +
        * XMLEntityResolver.DQC_NAMESPACE_02 + " " +
-       * "http://www.unidata.ucar.edu/schemas/thredds/queryCapability.0.2.xsd" +" " +
-       * XMLEntityResolver.CATALOG_NAMESPACE_06 + " " + "http://www.unidata.ucar.edu/schemas/thredds/InvCatalog.0.6.xsd"
+       * "https://schemas.unidata.ucar.edu/thredds/queryCapability.0.2.xsd" +" " +
+       * XMLEntityResolver.CATALOG_NAMESPACE_06 + " " + "https://schemas.unidata.ucar.edu/thredds/InvCatalog.0.6.xsd"
        */;
     }
     return externalSchemas;
@@ -440,7 +440,7 @@ public org.xml.sax.InputSource resolveEntity(String publicId, String systemId) t
     }
 
     if (systemId.contains("InvCatalog.0.6.dtd")) {
-      entity = entityHash.get("http://www.unidata.ucar.edu/schemas/thredds/InvCatalog.0.6.dtd");
+      entity = entityHash.get("https://schemas.unidata.ucar.edu/thredds/InvCatalog.0.6.dtd");
       if (entity != null) {
         logger.debug(" *** resolved2 with local copy");
         return new MyInputSource(entity);
diff --git a/legacy/src/main/java/thredds/catalog/dl/DCWriter.java b/legacy/src/main/java/thredds/catalog/dl/DCWriter.java
@@ -17,7 +17,7 @@
 
 public class DCWriter {
   private static final Namespace defNS = Namespace.getNamespace("http://purl.org/dc/elements/1.1/");
-  private static final String schemaLocation = defNS.getURI() + " http://www.unidata.ucar.edu/schemas/other/dc/dc.xsd";
+  private static final String schemaLocation = defNS.getURI() + " https://schemas.unidata.ucar.edu/other/dc/dc.xsd";
   private static final String threddsServerURL = "http://localhost:8080/thredds/subset.html";
 
   private InvCatalog cat;

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`xmlns="http://www.unidata.ucar.edu/namespaces/thredds/InvCatalog/v1.0"`
`8`	`8`	`xmlns:catGen="http://www.unidata.ucar.edu/namespaces/thredds/CatalogGenConfig/v0.5"`
`9`	`9`	`xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"`
`10`		`- xsi:schemaLocation="http://www.unidata.ucar.edu/namespaces/thredds/InvCatalog/v1.0 http://www.unidata.ucar.edu/schemas/thredds/InvCatalog.1.0.xsd"`
	`10`	`+ xsi:schemaLocation="http://www.unidata.ucar.edu/namespaces/thredds/InvCatalog/v1.0 https://schemas.unidata.ucar.edu/thredds/InvCatalog.1.0.xsd"`
`11`	`11`	`>`
`12`	`12`	`<dataset name="THREDDS CatalogGen test config file">`
`13`	`13`	`<dataset name="NCEP Eta 80km CONUS model data">`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`xmlns="http://www.unidata.ucar.edu/namespaces/thredds/InvCatalog/v1.0"`
`4`	`4`	`xmlns:xlink="http://www.w3.org/1999/xlink"`
`5`	`5`	`xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"`
`6`		`- xsi:schemaLocation="http://www.unidata.ucar.edu/namespaces/thredds/InvCatalog/v1.0 http://www.unidata.ucar.edu/schemas/thredds/InvCatalog.1.0.xsd"`
	`6`	`+ xsi:schemaLocation="http://www.unidata.ucar.edu/namespaces/thredds/InvCatalog/v1.0 https://schemas.unidata.ucar.edu/thredds/InvCatalog.1.0.xsd"`
`7`	`7`	`>`
`8`	`8`
`9`	`9`	<documentation type="summary"> The SAGE III Ozone Loss and Validation Experiment (SOLVE) was a measurement campaign designed to examine the processes controlling ozone levels at mid- to high latitudes. Measurements were made in the Arctic high-latitude region in winter using the NASA DC-8 and ER-2 aircraft, as well as balloon platforms and ground-based instruments. The mission also acquired correlative data needed to validate the Stratospheric Aerosol and Gas Experiment (SAGE) III satellite measurements that will be used to quantitatively assess high-latitude ozone loss. SOLVE is co-sponsored by the Upper Atmosphere Research Program (UARP), Atmospheric Effects of Aviation Project (AEAP), Atmospheric Chemistry Modeling and Analysis Program (ACMAP), and Earth Observing System (EOS) of NASA's Earth Science Enterprise (ESE) as part of the validation program for the SAGE III instrument.