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

*** 1,15 ****
  /*
!  * reserved comment block
!  * DO NOT REMOVE OR ALTER!
   */
  /*
!  * Copyright 2001-2004 The Apache Software Foundation.
!  *
!  * Licensed under the Apache License, Version 2.0 (the "License");
!  * you may not use this file except in compliance with the License.
!  * You may obtain a copy of the License at
   *
   *      http://www.apache.org/licenses/LICENSE-2.0
   *
   * Unless required by applicable law or agreed to in writing, software
   * distributed under the License is distributed on an "AS IS" BASIS,
--- 1,15 ----
  /*
!  * Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
   */
  /*
!  * Licensed to the Apache Software Foundation (ASF) under one or more
!  * contributor license agreements.  See the NOTICE file distributed with
!  * this work for additional information regarding copyright ownership.
!  * The ASF licenses this file to You under the Apache License, Version 2.0
!  * (the "License"); you may not use this file except in compliance with
!  * the License.  You may obtain a copy of the License at
   *
   *      http://www.apache.org/licenses/LICENSE-2.0
   *
   * Unless required by applicable law or agreed to in writing, software
   * distributed under the License is distributed on an "AS IS" BASIS,
*** 37,47 ****
  import com.sun.org.apache.xerces.internal.impl.validation.ValidationManager;
  import com.sun.org.apache.xerces.internal.impl.xs.XSMessageFormatter;
  import com.sun.org.apache.xerces.internal.parsers.BasicParserConfiguration;
  import com.sun.org.apache.xerces.internal.util.FeatureState;
  import com.sun.org.apache.xerces.internal.util.PropertyState;
- import com.sun.org.apache.xerces.internal.util.Status;
  import com.sun.org.apache.xerces.internal.util.SymbolTable;
  import com.sun.org.apache.xerces.internal.xni.XMLLocator;
  import com.sun.org.apache.xerces.internal.xni.XNIException;
  import com.sun.org.apache.xerces.internal.xni.grammars.XMLGrammarPool;
  import com.sun.org.apache.xerces.internal.xni.parser.XMLComponent;
--- 37,46 ----
*** 49,58 ****
--- 48,60 ----
  import com.sun.org.apache.xerces.internal.xni.parser.XMLConfigurationException;
  import com.sun.org.apache.xerces.internal.xni.parser.XMLDTDScanner;
  import com.sun.org.apache.xerces.internal.xni.parser.XMLDocumentScanner;
  import com.sun.org.apache.xerces.internal.xni.parser.XMLInputSource;
  import com.sun.org.apache.xerces.internal.xni.parser.XMLPullParserConfiguration;
+ import javax.xml.XMLConstants;
+ import jdk.xml.internal.JdkXmlUtils;
+ import jdk.xml.internal.SecuritySupport;
  
  /**
   * @xerces.internal
   *
   * @author Rahul Srivastava, Sun Microsystems Inc.
*** 299,309 ****
          // add default recognized features
          final String[] recognizedFeatures = {
              PARSER_SETTINGS, WARN_ON_DUPLICATE_ATTDEF,   WARN_ON_UNDECLARED_ELEMDEF,
              ALLOW_JAVA_ENCODINGS,       CONTINUE_AFTER_FATAL_ERROR,
              LOAD_EXTERNAL_DTD,          NOTIFY_BUILTIN_REFS,
!             NOTIFY_CHAR_REFS, GENERATE_SYNTHETIC_ANNOTATIONS
          };
          addRecognizedFeatures(recognizedFeatures);
          fFeatures.put(PARSER_SETTINGS, Boolean.TRUE);
          // set state for default features
          fFeatures.put(WARN_ON_DUPLICATE_ATTDEF, Boolean.FALSE);
--- 301,312 ----
          // add default recognized features
          final String[] recognizedFeatures = {
              PARSER_SETTINGS, WARN_ON_DUPLICATE_ATTDEF,   WARN_ON_UNDECLARED_ELEMDEF,
              ALLOW_JAVA_ENCODINGS,       CONTINUE_AFTER_FATAL_ERROR,
              LOAD_EXTERNAL_DTD,          NOTIFY_BUILTIN_REFS,
!             NOTIFY_CHAR_REFS, GENERATE_SYNTHETIC_ANNOTATIONS,
!             XMLConstants.USE_CATALOG
          };
          addRecognizedFeatures(recognizedFeatures);
          fFeatures.put(PARSER_SETTINGS, Boolean.TRUE);
          // set state for default features
          fFeatures.put(WARN_ON_DUPLICATE_ATTDEF, Boolean.FALSE);
*** 313,322 ****
--- 316,326 ----
          fFeatures.put(CONTINUE_AFTER_FATAL_ERROR, Boolean.FALSE);
          fFeatures.put(LOAD_EXTERNAL_DTD, Boolean.TRUE);
          fFeatures.put(NOTIFY_BUILTIN_REFS, Boolean.FALSE);
          fFeatures.put(NOTIFY_CHAR_REFS, Boolean.FALSE);
          fFeatures.put(GENERATE_SYNTHETIC_ANNOTATIONS, Boolean.FALSE);
+         fFeatures.put(XMLConstants.USE_CATALOG, JdkXmlUtils.USE_CATALOG_DEFAULT);
  
          // add default recognized properties
          final String[] recognizedProperties = {
              ERROR_REPORTER,
              ENTITY_MANAGER,
*** 326,336 ****
              NAMESPACE_BINDER,
              XMLGRAMMAR_POOL,
              DATATYPE_VALIDATOR_FACTORY,
              VALIDATION_MANAGER,
              GENERATE_SYNTHETIC_ANNOTATIONS,
!             LOCALE
          };
          addRecognizedProperties(recognizedProperties);
  
          fGrammarPool = grammarPool;
          if (fGrammarPool != null) {
--- 330,344 ----
              NAMESPACE_BINDER,
              XMLGRAMMAR_POOL,
              DATATYPE_VALIDATOR_FACTORY,
              VALIDATION_MANAGER,
              GENERATE_SYNTHETIC_ANNOTATIONS,
!             LOCALE,
!             JdkXmlUtils.CATALOG_DEFER,
!             JdkXmlUtils.CATALOG_FILES,
!             JdkXmlUtils.CATALOG_PREFER,
!             JdkXmlUtils.CATALOG_RESOLVE
          };
          addRecognizedProperties(recognizedProperties);
  
          fGrammarPool = grammarPool;
          if (fGrammarPool != null) {