RFR: 8306055: Add a built-in Catalog to JDK XML module [v2]

[Joe Wang]

On Mon, 20 Nov 2023 16:48:51 GMT, Lance Andersen <lancea at openjdk.org> wrote:

> Hi Joe,
> 
> Thank you for all of your hard work and perseverance to drive this project as I realize it was a lot of work and iterations based on feedback from the team.
> 
> Overall looks good. A couple of minor comments below

Thanks Lance for your help with all that iterations and feedbacks. I really appreciate it!
I'm glad we were able to split the project into smaller/more manageable tasks. Changeset this size feels a lot easier to handle.

> src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java line 1084:
> 
>> 1082:             String publicId, String systemId) {
>> 1083:         InputSource is = resolveWithCatalog(cr, cFile, publicId, systemId);
>> 1084: //        if (is != null && !is.isEmpty()) {
> 
> Probably can delete this

Changed to a note, as a reminder that empty source isn't considered resolved in this case.

> src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java line 1101:
> 
>> 1099:                 return cr.resolveEntity(publicId, systemId);
>> 1100:             } catch (CatalogException e) {
>> 1101:                 fErrorReporter.reportError(XMLMessageFormatter.XML_DOMAIN,"CatalogException",
> 
> Alignment looks like it needs to be sanity checked here

Fixed.

-------------

PR Comment: https://git.openjdk.org/jdk/pull/16719#issuecomment-1819538297
PR Review Comment: https://git.openjdk.org/jdk/pull/16719#discussion_r1399549063
PR Review Comment: https://git.openjdk.org/jdk/pull/16719#discussion_r1399549587