test/javax/xml/jaxp/isolatedjdk/catalog/PropertiesTest.java

*** 1,7 ****
  /*
!  * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
--- 1,7 ----
  /*
!  * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
*** 40,50 ****
  import java.io.IOException;
  import java.util.HashMap;
  import java.util.Map;
  
  import javax.xml.catalog.CatalogResolver;
- import javax.xml.catalog.CatalogUriResolver;
  
  /*
   * This case tests if the properties FILES, DEFER, PREFER, RESOLVE in
   * jaxp.properties and system properties could be cared.
   */
--- 40,49 ----
*** 94,104 ****
                  entityResolver.resolveEntity("-//REMOTE//DTD DOC XML//EN",
                          "http://remote/dtd/doc.dtd").getSystemId());
      }
  
      private static void testPropertiesOnUriResolver() {
!         CatalogUriResolver uriResolver = catalogUriResolver((String[]) null);
          uriResolver.resolve("http://remote/uri/dtd/docDummy.dtd", null);
          "http://local/base/dtd/docURI.dtd".equals(uriResolver.resolve(
                  "http://remote/dtd/doc.dtd", null).getSystemId());
      }
  
--- 93,103 ----
                  entityResolver.resolveEntity("-//REMOTE//DTD DOC XML//EN",
                          "http://remote/dtd/doc.dtd").getSystemId());
      }
  
      private static void testPropertiesOnUriResolver() {
!         CatalogResolver uriResolver = catalogUriResolver((String[]) null);
          uriResolver.resolve("http://remote/uri/dtd/docDummy.dtd", null);
          "http://local/base/dtd/docURI.dtd".equals(uriResolver.resolve(
                  "http://remote/dtd/doc.dtd", null).getSystemId());
      }