From 71cfc341f3b661e5facf14b9446f038d1492fc5c Mon Sep 17 00:00:00 2001
From: git <tdnorbra@nps.edu>
Date: Thu, 12 Sep 2024 20:03:00 -0700
Subject: [PATCH] [Terry N.] updates
---
DFDL/attribution/XMLCatalog.xml | 20 +++++++++-----------
1 file changed, 9 insertions(+), 11 deletions(-)
diff --git a/DFDL/attribution/XMLCatalog.xml b/DFDL/attribution/XMLCatalog.xml
index 5855948..3d0748f 100644
--- a/DFDL/attribution/XMLCatalog.xml
+++ b/DFDL/attribution/XMLCatalog.xml
@@ -15,9 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!DOCTYPE catalog
- PUBLIC "-//OASIS//DTD XML Catalogs V1.0//EN"
- "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
+<!DOCTYPE catalog PUBLIC "-//OASIS//DTD XML Catalogs V1.0//EN" "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
<!--
It would be good to not have this xmlns in here, because eclipse
@@ -26,21 +24,21 @@
-->
<uri name="http://www.ibm.com/xmlns/dfdl/testData"
uri="org/apache/daffodil/xsd/tdml.xsd" />
- <uri name="http://www.ogf.org/dfdl/dfdl-1.0/" uri="org/apache/daffodil/xsd/DFDL_part3_model.xsd" />
- <uri name="http://www.ogf.org/dfdl/dfdl-1.0/extensions" uri="org/apache/daffodil/xsd/dfdlx.xsd" />
- <!-- <uri name="http://www.ogf.org/dfdl/dfdl-1.0/XMLSchemaSubset"
- uri="org/apache/daffodil/xsd/DFDLSubsetOfXMLSchema_v1_036.xsd" /> -->
+ <uri name="http://www.ogf.org/dfdl/dfdl-1.0/"
+ uri="org/apache/daffodil/xsd/DFDL_part3_model.xsd" />
+ <uri name="http://www.ogf.org/dfdl/dfdl-1.0/extensions"
+ uri="org/apache/daffodil/xsd/dfdlx.xsd" />
<uri name="http://www.w3.org/2001/XMLSchema"
uri="org/apache/daffodil/xsd/XMLSchema_for_DFDL.xsd" />
<uri name="http://www.w3.org/XML/1998/namespace"
uri="org/apache/daffodil/xsd/xml.xsd" />
<!--
- Seems the format of catalogs doesn't allow spaces in the publicId.
- I don't know if one can replace them with escape %20 stuff or not. -->
+ Seems the format of catalogs doesn't allow spaces in the publicId.
+ I don't know if one can replace them with escape %20 stuff or not.
<public publicId="-//W3C//DTD XMLSCHEMA 200102//EN"
- uri="org/apache/daffodil/xsd/XMLSchema.dtd" />
+ uri="org/apache/daffodil/xsd/XMLSchema.dtd" /> -->
<public publicId="datatypes"
- uri="org/apache/daffodil/xsd/datatypes.dtd" />
+ uri="org/apache/daffodil/xsd/datatypes.dtd" />
<uri name="urn:ogf:dfdl:2013:imp:daffodil.apache.org:2018:int"
uri="org/apache/daffodil/xsd/dafint.xsd"/>
<uri name="urn:ogf:dfdl:2013:imp:daffodil.apache.org:2018:ext"
--
GitLab