src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaLoader.java

*** 74,83 ****
--- 74,84 ----
  import java.util.Locale;
  import java.util.Map;
  import java.util.StringTokenizer;
  import java.util.WeakHashMap;
  import javax.xml.XMLConstants;
+ import jdk.xml.internal.JdkXmlUtils;
  import org.w3c.dom.DOMConfiguration;
  import org.w3c.dom.DOMError;
  import org.w3c.dom.DOMErrorHandler;
  import org.w3c.dom.DOMException;
  import org.w3c.dom.DOMStringList;
*** 171,181 ****
          GENERATE_SYNTHETIC_ANNOTATIONS,
          VALIDATE_ANNOTATIONS,
          HONOUR_ALL_SCHEMALOCATIONS,
          NAMESPACE_GROWTH,
          TOLERATE_DUPLICATES,
!         USE_SERVICE_MECHANISM
      };
  
      // property identifiers
  
      /** Property identifier: symbol table. */
--- 172,183 ----
          GENERATE_SYNTHETIC_ANNOTATIONS,
          VALIDATE_ANNOTATIONS,
          HONOUR_ALL_SCHEMALOCATIONS,
          NAMESPACE_GROWTH,
          TOLERATE_DUPLICATES,
!         USE_SERVICE_MECHANISM,
!         XMLConstants.USE_CATALOG
      };
  
      // property identifiers
  
      /** Property identifier: symbol table. */
*** 185,195 ****
      /** Property identifier: error reporter. */
      public static final String ERROR_REPORTER =
          Constants.XERCES_PROPERTY_PREFIX + Constants.ERROR_REPORTER_PROPERTY;
  
      /** Property identifier: error handler. */
!     protected static final String ERROR_HANDLER =
          Constants.XERCES_PROPERTY_PREFIX + Constants.ERROR_HANDLER_PROPERTY;
  
      /** Property identifier: entity resolver. */
      public static final String ENTITY_RESOLVER =
          Constants.XERCES_PROPERTY_PREFIX + Constants.ENTITY_RESOLVER_PROPERTY;
--- 187,197 ----
      /** Property identifier: error reporter. */
      public static final String ERROR_REPORTER =
          Constants.XERCES_PROPERTY_PREFIX + Constants.ERROR_REPORTER_PROPERTY;
  
      /** Property identifier: error handler. */
!     public static final String ERROR_HANDLER =
          Constants.XERCES_PROPERTY_PREFIX + Constants.ERROR_HANDLER_PROPERTY;
  
      /** Property identifier: entity resolver. */
      public static final String ENTITY_RESOLVER =
          Constants.XERCES_PROPERTY_PREFIX + Constants.ENTITY_RESOLVER_PROPERTY;
*** 242,252 ****
          SCHEMA_NONS_LOCATION,
          JAXP_SCHEMA_SOURCE,
          SECURITY_MANAGER,
          LOCALE,
          SCHEMA_DV_FACTORY,
!         XML_SECURITY_PROPERTY_MANAGER
      };
  
      // Data
  
      // features and properties
--- 244,258 ----
          SCHEMA_NONS_LOCATION,
          JAXP_SCHEMA_SOURCE,
          SECURITY_MANAGER,
          LOCALE,
          SCHEMA_DV_FACTORY,
!         XML_SECURITY_PROPERTY_MANAGER,
!         JdkXmlUtils.CATALOG_DEFER,
!         JdkXmlUtils.CATALOG_FILES,
!         JdkXmlUtils.CATALOG_PREFER,
!         JdkXmlUtils.CATALOG_RESOLVE
      };
  
      // Data
  
      // features and properties
*** 811,821 ****
  
          // JAXP spec. allow []s of type String, File, InputStream,
          // InputSource also, apart from [] of type Object.
          Object[] objArr = (Object[]) fJAXPSource;
          // make local array for storing target namespaces of schemasources specified in object arrays.
!         ArrayList jaxpSchemaSourceNamespaces = new ArrayList();
          for (int i = 0; i < objArr.length; i++) {
              if (objArr[i] instanceof InputStream ||
                      objArr[i] instanceof InputSource) {
                  SchemaGrammar g = (SchemaGrammar)fJAXPCache.get(objArr[i]);
                  if (g != null) {
--- 817,827 ----
  
          // JAXP spec. allow []s of type String, File, InputStream,
          // InputSource also, apart from [] of type Object.
          Object[] objArr = (Object[]) fJAXPSource;
          // make local array for storing target namespaces of schemasources specified in object arrays.
!         ArrayList<String> jaxpSchemaSourceNamespaces = new ArrayList<>();
          for (int i = 0; i < objArr.length; i++) {
              if (objArr[i] instanceof InputStream ||
                      objArr[i] instanceof InputSource) {
                  SchemaGrammar g = (SchemaGrammar)fJAXPCache.get(objArr[i]);
                  if (g != null) {
*** 1278,1288 ****
      /* (non-Javadoc)
       * @see DOMConfiguration#getParameterNames()
       */
      public DOMStringList getParameterNames() {
          if (fRecognizedParameters == null){
!             ArrayList v = new ArrayList();
              v.add(Constants.DOM_VALIDATE);
              v.add(Constants.DOM_ERROR_HANDLER);
              v.add(Constants.DOM_RESOURCE_RESOLVER);
              v.add(SYMBOL_TABLE);
              v.add(ERROR_REPORTER);
--- 1284,1294 ----
      /* (non-Javadoc)
       * @see DOMConfiguration#getParameterNames()
       */
      public DOMStringList getParameterNames() {
          if (fRecognizedParameters == null){
!             ArrayList<String> v = new ArrayList<>();
              v.add(Constants.DOM_VALIDATE);
              v.add(Constants.DOM_ERROR_HANDLER);
              v.add(Constants.DOM_RESOURCE_RESOLVER);
              v.add(SYMBOL_TABLE);
              v.add(ERROR_REPORTER);