changeset 1170:f29a6bd39711

Merge
author lana
date Thu, 15 Sep 2016 21:08:30 +0000
parents cad105430cf5 3f32c0ee4f8d
children a8d5fe567ae7
files
diffstat 5 files changed, 46 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XMLCatalogResolver.java	Thu Sep 15 17:15:53 2016 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XMLCatalogResolver.java	Thu Sep 15 21:08:30 2016 +0000
@@ -61,9 +61,19 @@
  * catalog resolution outside of a parsing context. It may be shared
  * between several parsers and the application.</p>
  *
+ * @deprecated This class and 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}.
+ * <p>
+ * 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 {
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/Catalog.java	Thu Sep 15 17:15:53 2016 +0000
+++ b/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}.
+ * <p>
+ * 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
  * <a href="mailto:Norman.Walsh@Sun.COM">Norman.Walsh@Sun.COM</a>
@@ -187,6 +195,7 @@
  * <p>Derived from public domain code originally published by Arbortext,
  * Inc.</p>
  */
+@Deprecated(since="9", forRemoval=true)
 public class Catalog {
   /** The BASE Catalog Entry type. */
   public static final int BASE     = CatalogEntry.addEntryType("BASE", 1);
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/CatalogManager.java	Thu Sep 15 17:15:53 2016 +0000
+++ b/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 @@
  * </table>
  *
  * @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}.
+ * <p>
+ * 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
  * <a href="mailto:Norman.Walsh@Sun.COM">Norman.Walsh@Sun.COM</a>
  *
  * @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";
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/Resolver.java	Thu Sep 15 17:15:53 2016 +0000
+++ b/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}.
+ * <p>
+ * 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
  * <a href="mailto:Norman.Walsh@Sun.COM">Norman.Walsh@Sun.COM</a>
  *
  * @version 1.0
  */
+@Deprecated(since="9", forRemoval=true)
 public class Resolver extends Catalog {
   /**
    * The URISUFFIX Catalog Entry type.
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/tools/CatalogResolver.java	Thu Sep 15 17:15:53 2016 +0000
+++ b/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}.
+ * <p>
+ * 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
  * <a href="mailto:Norman.Walsh@Sun.COM">Norman.Walsh@Sun.COM</a>
  *
  * @version 1.0
  */
+@Deprecated(since="9", forRemoval=true)
 public class CatalogResolver implements EntityResolver, URIResolver {
   /** Make the parser Namespace aware? */
   public boolean namespaceAware = true;