Skip to content

Commit 361f8c0

Browse files
committed
8351969: Add Public Identifiers to the JDK built-in Catalog
Reviewed-by: rriggs, lancea, iris, naoto
1 parent 0dff037 commit 361f8c0

File tree

4 files changed

+143
-234
lines changed

4 files changed

+143
-234
lines changed

src/java.xml/share/classes/jdk/xml/internal/jdkcatalog/JDKCatalog.xml

+10-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
/*
4-
* Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
4+
* Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
55
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
66
*
77
* This code is free software; you can redistribute it and/or modify it
@@ -38,9 +38,10 @@
3838
<system systemId="http://java.sun.com/dtd/preferences.dtd" uri="preferences.dtd"/>
3939
<system systemId="http://java.sun.com/dtd/properties.dtd" uri="properties.dtd"/>
4040
</group>
41-
41+
4242
<!-- W3C DTDs -->
4343
<group id="xhtml11" prefer = "system" xml:base = "w3c/dtd/xhtml11/">
44+
<public publicId="-//W3C//DTD XHTML 1.1//EN" uri="xhtml11.dtd"/>
4445
<system systemId="http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd" uri="xhtml11.dtd"/>
4546
<systemSuffix systemIdSuffix="xhtml-attribs-1.mod" uri="xhtml-attribs-1.mod"/>
4647
<systemSuffix systemIdSuffix="xhtml-base-1.mod" uri="xhtml-base-1.mod"/>
@@ -81,8 +82,11 @@
8182
<systemSuffix systemIdSuffix="xhtml-text-1.mod" uri="xhtml-text-1.mod"/>
8283
<systemSuffix systemIdSuffix="xhtml11-model-1.mod" uri="xhtml11-model-1.mod"/>
8384
</group>
84-
85+
8586
<group id="xhtml1" prefer = "system" xml:base = "w3c/dtd/xhtml10/">
87+
<public publicId="-//W3C//DTD XHTML 1.0 Strict//EN" uri="xhtml1-strict.dtd"/>
88+
<public publicId="-//W3C//DTD XHTML 1.0 Transitional//EN" uri="xhtml1-transitional.dtd"/>
89+
<public publicId="-//W3C//DTD XHTML 1.0 Frameset//EN" uri="xhtml1-frameset.dtd"/>
8690
<systemSuffix systemIdSuffix="xhtml1-strict.dtd" uri="xhtml1-strict.dtd"/>
8791
<systemSuffix systemIdSuffix="xhtml1-transitional.dtd" uri="xhtml1-transitional.dtd"/>
8892
<systemSuffix systemIdSuffix="xhtml1-frameset.dtd" uri="xhtml1-frameset.dtd"/>
@@ -97,11 +101,12 @@
97101
<public publicId="datatypes" uri="datatypes.dtd"/>
98102
<public publicId="-//W3C//DTD XMLSCHEMA 200102//EN" uri="XMLSchema.dtd"/>
99103
</group>
100-
104+
101105
<group id="xmlspec" prefer = "system" xml:base = "w3c/dtd/">
106+
<public publicId="-//W3C//DTD Specification V2.10//EN" uri="xmlspec2_10/xmlspec.dtd"/>
102107
<system systemId="http://www.w3.org/2002/xmlspec/dtd/2.10/xmlspec.dtd" uri="xmlspec2_10/xmlspec.dtd"/>
103108
</group>
104-
109+
105110
<!-- W3C XSDs -->
106111
<group id="w3cxsd" prefer = "system" xml:base = "w3c/xsd/">
107112
<systemSuffix systemIdSuffix="XMLSchema.xsd" uri="schema10/XMLSchema.xsd"/>

0 commit comments

Comments
 (0)