jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/Options.java

*** 179,191 ****
       * {@link JPackage#addResourceFile(JResourceFile)}.
       */
      public File targetDir = new File(".");
  
      /**
!      * Actually stores {@link CatalogResolver}, but the field
!      * type is made to {@link EntityResolver} so that XJC can be
!      * used even if resolver.jar is not available in the classpath.
       */
      public EntityResolver entityResolver = null;
  
      /**
       * Type of input schema language. One of the {@code SCHEMA_XXX}
--- 179,189 ----
       * {@link JPackage#addResourceFile(JResourceFile)}.
       */
      public File targetDir = new File(".");
  
      /**
!      * Stores {@link EntityResolver}.
       */
      public EntityResolver entityResolver = null;
  
      /**
       * Type of input schema language. One of the {@code SCHEMA_XXX}
*** 637,647 ****
          if (args[i].equals("-port")) {
              proxyPort = requireArgument("-port",args,++i);
              return 2;
          }
          if( args[i].equals("-catalog") ) {
!             // use javax.xml.catalog to resolve external entities.
  
              File catalogFile = new File(requireArgument("-catalog",args,++i));
              try {
                  addCatalog(catalogFile);
              } catch (IOException e) {
--- 635,647 ----
          if (args[i].equals("-port")) {
              proxyPort = requireArgument("-port",args,++i);
              return 2;
          }
          if( args[i].equals("-catalog") ) {
!             // use Sun's "XML Entity and URI Resolvers" by Norman Walsh
!             // to resolve external entities.
!             // https://xerces.apache.org/xml-commons/components/resolver/resolver-article.html
  
              File catalogFile = new File(requireArgument("-catalog",args,++i));
              try {
                  addCatalog(catalogFile);
              } catch (IOException e) {