+ * The new Catalog API is supported throughout the JDK XML Processors, which allows + * the use of Catalog by simply setting a path to a Catalog file as a property. + * * @author Michael Glavassevich, IBM * */ +@Deprecated(since="9", forRemoval=true) public class XMLCatalogResolver implements XMLEntityResolver, EntityResolver2, LSResourceResolver { diff -r 4be275431d47 -r b3a710767ce0 jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/Catalog.java --- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/Catalog.java Thu Sep 15 17:15:53 2016 +0000 +++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/Catalog.java Thu Sep 15 21:08:30 2016 +0000 @@ -178,6 +178,14 @@ * * @see CatalogReader * @see CatalogEntry + * @deprecated The JDK internal Catalog API in package + * {@code com.sun.org.apache.xml.internal.resolver} + * is encapsulated in JDK 9. The entire implementation under the package is now + * deprecated and subject to removal in a future release. Users of the API + * should migrate to the {@linkplain javax.xml.catalog new public API}. + *
+ * The new Catalog API is supported throughout the JDK XML Processors, which allows + * the use of Catalog by simply setting a path to a Catalog file as a property. * * @author Norman Walsh * Norman.Walsh@Sun.COM @@ -187,6 +195,7 @@ *
Derived from public domain code originally published by Arbortext, * Inc.
*/ +@Deprecated(since="9", forRemoval=true) public class Catalog { /** The BASE Catalog Entry type. */ public static final int BASE = CatalogEntry.addEntryType("BASE", 1); diff -r 4be275431d47 -r b3a710767ce0 jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/CatalogManager.java --- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/CatalogManager.java Thu Sep 15 17:15:53 2016 +0000 +++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/CatalogManager.java Thu Sep 15 21:08:30 2016 +0000 @@ -110,13 +110,21 @@ * * * @see Catalog + * @deprecated The JDK internal Catalog API in package + * {@code com.sun.org.apache.xml.internal.resolver} + * is encapsulated in JDK 9. The entire implementation under the package is now + * deprecated and subject to removal in a future release. Users of the API + * should migrate to the {@linkplain javax.xml.catalog new public API}. + *+ * The new Catalog API is supported throughout the JDK XML Processors, which allows + * the use of Catalog by simply setting a path to a Catalog file as a property. * * @author Norman Walsh * Norman.Walsh@Sun.COM * * @version 1.0 */ - +@Deprecated(since="9", forRemoval=true) public class CatalogManager { private static final String pFiles = "xml.catalog.files"; private static final String pVerbosity = "xml.catalog.verbosity"; diff -r 4be275431d47 -r b3a710767ce0 jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/Resolver.java --- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/Resolver.java Thu Sep 15 17:15:53 2016 +0000 +++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/Resolver.java Thu Sep 15 21:08:30 2016 +0000 @@ -37,12 +37,21 @@ * suffix-based matching and an external RFC2483 resolver. * * @see Catalog + * @deprecated The JDK internal Catalog API in package + * {@code com.sun.org.apache.xml.internal.resolver} + * is encapsulated in JDK 9. The entire implementation under the package is now + * deprecated and subject to removal in a future release. Users of the API + * should migrate to the {@linkplain javax.xml.catalog new public API}. + *
+ * The new Catalog API is supported throughout the JDK XML Processors, which allows + * the use of Catalog by simply setting a path to a Catalog file as a property. * * @author Norman Walsh * Norman.Walsh@Sun.COM * * @version 1.0 */ +@Deprecated(since="9", forRemoval=true) public class Resolver extends Catalog { /** * The URISUFFIX Catalog Entry type. diff -r 4be275431d47 -r b3a710767ce0 jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/tools/CatalogResolver.java --- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/tools/CatalogResolver.java Thu Sep 15 17:15:53 2016 +0000 +++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/tools/CatalogResolver.java Thu Sep 15 21:08:30 2016 +0000 @@ -52,12 +52,21 @@ * @see Catalog * @see org.xml.sax.EntityResolver * @see javax.xml.transform.URIResolver + * @deprecated The JDK internal Catalog API in package + * {@code com.sun.org.apache.xml.internal.resolver} + * is encapsulated in JDK 9. The entire implementation under the package is now + * deprecated and subject to removal in a future release. Users of the API + * should migrate to the {@linkplain javax.xml.catalog new public API}. + *
+ * The new Catalog API is supported throughout the JDK XML Processors, which allows + * the use of Catalog by simply setting a path to a Catalog file as a property. * * @author Norman Walsh * Norman.Walsh@Sun.COM * * @version 1.0 */ +@Deprecated(since="9", forRemoval=true) public class CatalogResolver implements EntityResolver, URIResolver { /** Make the parser Namespace aware? */ public boolean namespaceAware = true;