Skip to content

Commit 0c09122

Browse files
authored
Merge pull request #20 from ndw/fix-xsd-dtds
Fix W3C XML Schema dtd issues
2 parents b9530d2 + c7cc6dc commit 0c09122

File tree

5 files changed

+10
-8
lines changed

5 files changed

+10
-8
lines changed

gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
version = 1.1.0
2-
relVersion = 1.1.0
1+
version = 1.2.0
2+
relVersion = 1.2.0

src/data/manifest.xml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -123,10 +123,10 @@
123123
<purpose>http://www.rddl.org/purposes#validation</purpose>
124124
<nature>http://www.w3.org/2001/XMLSchema</nature>
125125
</entry>
126-
<entry uri="root/www.w3.org/2001/datatypes.xsd">
126+
<entry uri="root/www.w3.org/2001/datatypes.dtd">
127127
<public>-//W3C//DTD XSD 1.0 Datatypes//EN</public>
128128
<public>datatypes</public>
129-
<system>https://www.w3.org/2001/datatypes.xsd</system>
129+
<system>https://www.w3.org/2001/datatypes.dtd</system>
130130
</entry>
131131
<entry uri="root/www.w3.org/2001/xml.xsd">
132132
<uri>https://www.w3.org/2001/xml.xsd</uri>
@@ -349,10 +349,14 @@
349349
<entry uri="root/www.w3.org/2009/XMLSchema/XMLSchema.dtd">
350350
<public>-//W3C//DTD XSD 1.1//EN</public>
351351
<system>https://www.w3.org/2009/XMLSchema/XMLSchema.dtd</system>
352+
<system>https://www.w3.org/TR/xmlschema11-1/XMLSchema.dtd</system>
353+
<system>https://www.w3.org/TR/xmlschema11-2/XMLSchema.dtd</system>
352354
</entry>
353-
<entry uri="root/www.w3.org/2009/XMLSchema/datatypes.xsd">
355+
<entry uri="root/www.w3.org/2009/XMLSchema/datatypes.dtd">
354356
<public>-//W3C//DTD XSD 1.1 Datatypes//EN</public>
355-
<system>https://www.w3.org/2009/XMLSchema/datatypes.xsd</system>
357+
<system>https://www.w3.org/2009/XMLSchema/datatypes.dtd</system>
358+
<system>https://www.w3.org/TR/xmlschema11-1/datatypes.dtd</system>
359+
<system>https://www.w3.org/TR/xmlschema11-2/datatypes.dtd</system>
356360
</entry>
357361
<entry uri="root/www.w3.org/Graphics/SVG/1.1/DTD/svg-animation.mod">
358362
<public>-//W3C//ELEMENTS SVG 1.1 Animation//EN</public>

src/data/www.w3.org/TR/xmlschema-2/datatypes.xsd

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
<!ATTLIST xs:union id ID #IMPLIED>
3636
]>
3737

38-
<?xml version='1.0'?>
3938
<xs:schema xmlns:hfp="http://www.w3.org/2001/XMLSchema-hasFacetAndProperty"
4039
xmlns:xs="http://www.w3.org/2001/XMLSchema" blockDefault="#all"
4140
elementFormDefault="qualified" xml:lang="en"
@@ -1114,4 +1113,3 @@
11141113
</xs:complexType>
11151114
</xs:element>
11161115
</xs:schema>
1117-

0 commit comments

Comments
 (0)