hg: jdk9/dev/jaxp: 8163232: Catalog API: Consolidating CatalogResolver to support all XML Resolvers

[huizhe.wang at oracle.com]

Changeset: 1c6c21d87aa4
Author:    joehw
Date:      2016-08-26 14:50 -0700
URL:       http://hg.openjdk.java.net/jdk9/dev/jaxp/rev/1c6c21d87aa4

8163232: Catalog API: Consolidating CatalogResolver to support all XML Resolvers
Reviewed-by: dfuchs, lancea

! src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages.java
! src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMsg.java
! src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerFactoryImpl.java
! src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerImpl.java
! src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java
! src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages.properties
! src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/EntityResolverWrapper.java
! src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xinclude/XIncludeHandler.java
! src/java.xml/share/classes/com/sun/xml/internal/stream/StaxEntityResolverWrapper.java
! src/java.xml/share/classes/javax/xml/catalog/Catalog.java
! src/java.xml/share/classes/javax/xml/catalog/CatalogManager.java
! src/java.xml/share/classes/javax/xml/catalog/CatalogResolver.java
! src/java.xml/share/classes/javax/xml/catalog/CatalogResolverImpl.java
- src/java.xml/share/classes/javax/xml/catalog/CatalogUriResolver.java
- src/java.xml/share/classes/javax/xml/catalog/CatalogUriResolverImpl.java
! src/java.xml/share/classes/javax/xml/catalog/Util.java
! test/javax/xml/jaxp/functional/catalog/CatalogReferCircularityTest.java
! test/javax/xml/jaxp/functional/catalog/DefaultFeaturesTest.java
! test/javax/xml/jaxp/functional/catalog/DeferFeatureTest.java
! test/javax/xml/jaxp/functional/catalog/DelegatePublicTest.java
! test/javax/xml/jaxp/functional/catalog/DelegateSystemTest.java
! test/javax/xml/jaxp/functional/catalog/DelegateUriTest.java
! test/javax/xml/jaxp/functional/catalog/GroupTest.java
! test/javax/xml/jaxp/functional/catalog/LoadCatalogTest.java
! test/javax/xml/jaxp/functional/catalog/NextCatalogTest.java
! test/javax/xml/jaxp/functional/catalog/NormalizationTest.java
! test/javax/xml/jaxp/functional/catalog/PreferFeatureTest.java
! test/javax/xml/jaxp/functional/catalog/PreferTest.java
! test/javax/xml/jaxp/functional/catalog/PublicFamilyTest.java
! test/javax/xml/jaxp/functional/catalog/PublicTest.java
! test/javax/xml/jaxp/functional/catalog/ResolveFeatureTest.java
! test/javax/xml/jaxp/functional/catalog/RewriteSystemTest.java
! test/javax/xml/jaxp/functional/catalog/RewriteUriTest.java
! test/javax/xml/jaxp/functional/catalog/SpecifyCatalogTest.java
! test/javax/xml/jaxp/functional/catalog/SystemFamilyTest.java
! test/javax/xml/jaxp/functional/catalog/SystemSuffixTest.java
! test/javax/xml/jaxp/functional/catalog/SystemTest.java
! test/javax/xml/jaxp/functional/catalog/UriFamilyTest.java
! test/javax/xml/jaxp/functional/catalog/UriSuffixTest.java
! test/javax/xml/jaxp/functional/catalog/UriTest.java
! test/javax/xml/jaxp/functional/catalog/UrnUnwrappingTest.java
! test/javax/xml/jaxp/functional/catalog/ValidateCatalogTest.java
! test/javax/xml/jaxp/functional/catalog/catalogFiles/deferFeature.xml
! test/javax/xml/jaxp/functional/catalog/catalogFiles/uri.xml
! test/javax/xml/jaxp/functional/catalog/catalogFiles/uriFamily.xml
! test/javax/xml/jaxp/isolatedjdk/catalog/PropertiesTest.java
! test/javax/xml/jaxp/libs/catalog/CatalogTestUtils.java
! test/javax/xml/jaxp/libs/catalog/ResolutionChecker.java
! test/javax/xml/jaxp/unittest/catalog/CatalogSupport.java
! test/javax/xml/jaxp/unittest/catalog/CatalogSupport.xml
! test/javax/xml/jaxp/unittest/catalog/CatalogSupport1.java
! test/javax/xml/jaxp/unittest/catalog/CatalogSupport2.java
! test/javax/xml/jaxp/unittest/catalog/CatalogSupport3.java
! test/javax/xml/jaxp/unittest/catalog/CatalogSupport4.java
+ test/javax/xml/jaxp/unittest/catalog/CatalogSupport5.java
! test/javax/xml/jaxp/unittest/catalog/CatalogSupportBase.java
+ test/javax/xml/jaxp/unittest/catalog/CatalogSupport_uri.xml
! test/javax/xml/jaxp/unittest/catalog/CatalogTest.java
! test/javax/xml/jaxp/unittest/catalog/catalog.xml
+ test/javax/xml/jaxp/unittest/catalog/catalog_uri.xml
+ test/javax/xml/jaxp/unittest/catalog/delegateuri.xml
! test/javax/xml/jaxp/unittest/catalog/files/delegatecatalog.xml
+ test/javax/xml/jaxp/unittest/catalog/files/delegatecatalog_uri.xml
+ test/javax/xml/jaxp/unittest/catalog/files/delegateuri.dtd
! test/javax/xml/jaxp/unittest/catalog/system.xml