test/javax/xml/jaxp/functional/catalog/DelegateUriTest.java

*** 25,36 ****
  
  import static catalog.CatalogTestUtils.catalogUriResolver;
  import static catalog.ResolutionChecker.checkUriResolution;
  import static catalog.ResolutionChecker.expectExceptionOnUri;
  
  import javax.xml.catalog.CatalogException;
- import javax.xml.catalog.CatalogUriResolver;
  
  import org.testng.annotations.DataProvider;
  import org.testng.annotations.Listeners;
  import org.testng.annotations.Test;
  
--- 25,36 ----
  
  import static catalog.CatalogTestUtils.catalogUriResolver;
  import static catalog.ResolutionChecker.checkUriResolution;
  import static catalog.ResolutionChecker.expectExceptionOnUri;
  
+ import javax.xml.catalog.CatalogResolver;
  import javax.xml.catalog.CatalogException;
  
  import org.testng.annotations.DataProvider;
  import org.testng.annotations.Listeners;
  import org.testng.annotations.Test;
  
*** 93,102 ****
                  // catalog structure. That should raise a CatalogException.
                  { "http://ghost/xml/dtd/ghost/docGhostDS.dtd",
                          CatalogException.class } };
      }
  
!     private CatalogUriResolver createResolver() {
          return catalogUriResolver("delegateUri.xml");
      }
  }
- 
--- 93,101 ----
                  // catalog structure. That should raise a CatalogException.
                  { "http://ghost/xml/dtd/ghost/docGhostDS.dtd",
                          CatalogException.class } };
      }
  
!     private CatalogResolver createResolver() {
          return catalogUriResolver("delegateUri.xml");
      }
  }