Skip to content
Permalink
Browse files
Don't suppress TDML load warnings.
Modified a test to verify bug fix.

Removed schemaLocations.

Both xsi:schemaLocations and the schemaLocation attributes on xs:import are unnecessary for all the schema files that are in the daffodil-built-in-catalog.xml.

Removing these gets rid of a lot of warnings, as many of these schema locations were wrong and so were causing warnings (for xsi:schemaLocation anyway.)

DAFFODIL-2340
  • Loading branch information
mbeckerle committed May 13, 2020
1 parent f5d8d71 commit b8c15895e0eb6c7dba7eb7a9f57415313e46fa65
Show file tree
Hide file tree
Showing 27 changed files with 332 additions and 340 deletions.
@@ -18,9 +18,7 @@

<xsd:schema xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/"
xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.ogf.org/dfdl/dfdl-1.0/ xsd/DFDL_part3_model.xsd
http://www.w3.org/2001/XMLSchema xsd/XMLSchema_for_DFDL.xsd">
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

<!--
7.1.3.2 Representation Property Binding Syntax: Element Form spec v.40
@@ -19,9 +19,7 @@
<xsd:schema xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.ogf.org/dfdl/dfdl-1.0/ xsd/DFDL_part3_model.xsd
http://www.w3.org/2001/XMLSchema xsd/XMLSchema_for_DFDL.xsd">
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

<!--
7.1.3.2 Representation Property Binding Syntax: Element Form spec v.40
@@ -21,9 +21,7 @@
xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ex="http://example.com"
xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://example.com"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:fn="http://www.w3.org/2005/xpath-functions"
xsi:schemaLocation="http://www.ogf.org/dfdl/dfdl-1.0/ xsd/DFDL_part3_model.xsd
http://www.w3.org/2001/XMLSchema xsd/XMLSchema_for_DFDL.xsd">
xmlns:fn="http://www.w3.org/2005/xpath-functions">

<xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>

@@ -20,9 +20,7 @@
xmlns="http://www.w3.org/2001/XMLSchema" xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/"
xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ex="http://example.com"
xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://example.com"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.ogf.org/dfdl/dfdl-1.0/ xsd/DFDL_part3_model.xsd
http://www.w3.org/2001/XMLSchema xsd/XMLSchema_for_DFDL.xsd">
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

<annotation>
<documentation>

0 comments on commit b8c1589

Please sign in to comment.