hg: amber/amber/jaxp: Automatic merge with default

[maurizio.cimadamore at oracle.com]

Changeset: 33e5e472d010
Author:    langtools at sthdev02.uk.oracle.com
Date:      2017-06-23 00:02 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jaxp/rev/33e5e472d010

Automatic merge with default

- src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XMLCatalogResolver.java
- src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/Catalog.java
- src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/CatalogEntry.java
- src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/CatalogException.java
- src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/CatalogManager.java
- src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/Resolver.java
- src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/helpers/BootstrapResolver.java
- src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/helpers/Debug.java
- src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/helpers/FileURL.java
- src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/helpers/Namespaces.java
- src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/helpers/PublicId.java
- src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/readers/CatalogReader.java
- src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/readers/DOMCatalogParser.java
- src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/readers/DOMCatalogReader.java
- src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/readers/ExtendedXMLCatalogReader.java
- src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/readers/OASISXMLCatalogReader.java
- src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/readers/SAXCatalogParser.java
- src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/readers/SAXCatalogReader.java
- src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/readers/SAXParserHandler.java
- src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/readers/TR9401CatalogReader.java
- src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/readers/TextCatalogReader.java
- src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/readers/XCatalogReader.java
- src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/tools/CatalogResolver.java
- src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/tools/ResolvingParser.java
- src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/tools/ResolvingXMLFilter.java
- src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/tools/ResolvingXMLReader.java