changed IdResolver to URIResolver

29 files changed, 82 insertions, 92 deletions

diff --git a/bundles/org.eclipse.jst.jsp.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.jsp.core/META-INF/MANIFEST.MF
index d54a6fd7e7..c399df6fa1 100644
--- a/bundles/org.eclipse.jst.jsp.core/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.jst.jsp.core/META-INF/MANIFEST.MF
@@ -36,7 +36,6 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.wst.xml.core,
  org.eclipse.wst.sse.ui,
  org.eclipse.wst.sse.core,
- org.eclipse.wst.xml.uriresolver,
  org.eclipse.jdt.core,
  org.eclipse.text,
  org.eclipse.wst.common.uriresolver,
diff --git a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/modelquery/JSPModelQueryAdapterImpl.java b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/modelquery/JSPModelQueryAdapterImpl.java
index 193701f7e0..b3e02bf16b 100644
--- a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/modelquery/JSPModelQueryAdapterImpl.java
+++ b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/modelquery/JSPModelQueryAdapterImpl.java
@@ -12,14 +12,14 @@ package org.eclipse.jst.jsp.core.internal.modelquery;
 
 
 
+import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolver;
 import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery;
 import org.eclipse.wst.xml.core.internal.contentmodel.util.CMDocumentCache;
 import org.eclipse.wst.xml.core.internal.ssemodelquery.ModelQueryAdapterImpl;
-import org.eclipse.wst.xml.uriresolver.internal.util.IdResolver;
 
 
 public class JSPModelQueryAdapterImpl extends ModelQueryAdapterImpl {
-	public JSPModelQueryAdapterImpl(CMDocumentCache cmDocumentCache, ModelQuery modelQuery, IdResolver idResolver) {
+	public JSPModelQueryAdapterImpl(CMDocumentCache cmDocumentCache, ModelQuery modelQuery, URIResolver idResolver) {
 		super(cmDocumentCache, modelQuery, idResolver);
 	}
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/modelquery/JSPModelQueryImpl.java b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/modelquery/JSPModelQueryImpl.java
index a9a9c673df..d3f29d71fd 100644
--- a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/modelquery/JSPModelQueryImpl.java
+++ b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/modelquery/JSPModelQueryImpl.java
@@ -15,6 +15,7 @@ import java.util.HashMap;
 import java.util.List;
 
 import org.eclipse.jst.jsp.core.internal.document.PageDirectiveAdapter;
+import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolver;
 import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
 import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
@@ -24,7 +25,6 @@ import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
 import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery;
 import org.eclipse.wst.xml.core.internal.contentmodel.modelqueryimpl.ModelQueryImpl;
 import org.eclipse.wst.xml.core.internal.ssemodelquery.ModelQueryAdapter;
-import org.eclipse.wst.xml.uriresolver.internal.util.IdResolver;
 import org.w3c.dom.Attr;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
@@ -33,7 +33,7 @@ public class JSPModelQueryImpl extends ModelQueryImpl {
 
 	protected IStructuredModel jspModel = null;
 	private HashMap embeddedModelQueries = new HashMap();
-	public JSPModelQueryImpl(IStructuredModel model, IdResolver resolver) {
+	public JSPModelQueryImpl(IStructuredModel model, URIResolver resolver) {
 		super(new JSPModelQueryAssociationProvider());
 		jspModel = model;
 	}
diff --git a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/modelquery/ModelQueryAdapterFactoryForJSP.java b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/modelquery/ModelQueryAdapterFactoryForJSP.java
index 35c35223e1..9d183f1778 100644
--- a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/modelquery/ModelQueryAdapterFactoryForJSP.java
+++ b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/modelquery/ModelQueryAdapterFactoryForJSP.java
@@ -16,6 +16,7 @@ import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.Path;
+import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolver;
 import org.eclipse.wst.sse.core.internal.provisional.AbstractAdapterFactory;
 import org.eclipse.wst.sse.core.internal.provisional.IModelStateListener;
 import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
@@ -28,7 +29,6 @@ import org.eclipse.wst.xml.core.internal.contentmodel.util.CMDocumentCache;
 import org.eclipse.wst.xml.core.internal.modelquery.XMLCatalogIdResolver;
 import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
 import org.eclipse.wst.xml.core.internal.ssemodelquery.ModelQueryAdapter;
-import org.eclipse.wst.xml.uriresolver.internal.util.IdResolver;
 
 public class ModelQueryAdapterFactoryForJSP extends AbstractAdapterFactory implements IModelStateListener {
 
@@ -87,7 +87,7 @@ public class ModelQueryAdapterFactoryForJSP extends AbstractAdapterFactory imple
 							baseLocation = derivedPath.toString();
 						}
 					}
-					IdResolver resolver = new XMLCatalogIdResolver(baseLocation, model.getResolver());
+					URIResolver resolver = new XMLCatalogIdResolver(baseLocation, model.getResolver());
 
 					ModelQuery modelQuery = new JSPModelQueryImpl(model, resolver);
 					modelQuery.setEditMode(ModelQuery.EDIT_MODE_UNCONSTRAINED);
diff --git a/bundles/org.eclipse.wst.dtd.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.dtd.core/META-INF/MANIFEST.MF
index 62a12fabf6..8bd7292171 100644
--- a/bundles/org.eclipse.wst.dtd.core/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.wst.dtd.core/META-INF/MANIFEST.MF
@@ -34,6 +34,5 @@ Require-Bundle: org.eclipse.core.resources,
  org.eclipse.wst.common.uriresolver,
  org.eclipse.wst.sse.core,
  org.eclipse.wst.validation,
- org.eclipse.wst.xml.core,
- org.eclipse.wst.xml.uriresolver
+ org.eclipse.wst.xml.core
 Eclipse-AutoStart: true
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/util/DTDModelBuilder.java b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/util/DTDModelBuilder.java
index 259547ef55..ff9aaac900 100644
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/util/DTDModelBuilder.java
+++ b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/util/DTDModelBuilder.java
@@ -19,6 +19,8 @@ import org.eclipse.emf.ecore.EEnumLiteral;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EcorePackage;
 import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolver;
+import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolverPlugin;
 import org.eclipse.wst.dtd.core.internal.DTDCoreMessages;
 import org.eclipse.wst.dtd.core.internal.emf.DTDAnyContent;
 import org.eclipse.wst.dtd.core.internal.emf.DTDAttribute;
@@ -59,8 +61,6 @@ import org.eclipse.wst.dtd.core.internal.saxparser.ElementDecl;
 import org.eclipse.wst.dtd.core.internal.saxparser.EntityDecl;
 import org.eclipse.wst.dtd.core.internal.saxparser.ErrorMessage;
 import org.eclipse.wst.dtd.core.internal.saxparser.NotationDecl;
-import org.eclipse.wst.xml.uriresolver.internal.util.IdResolver;
-import org.eclipse.wst.xml.uriresolver.internal.util.IdResolverImpl;
 
 public class DTDModelBuilder extends DTDSaxArtifactVisitor {
 	DTD dtd;
@@ -261,8 +261,8 @@ public class DTDModelBuilder extends DTDSaxArtifactVisitor {
 		String systemId = entityDecl.getSystemId();
 		String publicId = entityDecl.getPublicId();
 		if (systemId != null) {
-			IdResolver idResolver = new IdResolverImpl(dtd.getName());
-			String uri = idResolver.resolveId(publicId, systemId);
+			URIResolver idResolver = URIResolverPlugin.createResolver();
+			String uri = idResolver.resolve(dtd.getName(), publicId, systemId);
 			ExternalDTDModel ed = dtdUtil.getExternalDTDModel(resources, uri);
 			if (ed != null) {
 				DTDFile referenceDtdFile = ed.getExternalDTDFile();
diff --git a/bundles/org.eclipse.wst.dtd.core/saxparser/org/eclipse/wst/dtd/core/internal/saxparser/DTDParser.java b/bundles/org.eclipse.wst.dtd.core/saxparser/org/eclipse/wst/dtd/core/internal/saxparser/DTDParser.java
index 62bf1ff1be..a66028f3c0 100644
--- a/bundles/org.eclipse.wst.dtd.core/saxparser/org/eclipse/wst/dtd/core/internal/saxparser/DTDParser.java
+++ b/bundles/org.eclipse.wst.dtd.core/saxparser/org/eclipse/wst/dtd/core/internal/saxparser/DTDParser.java
@@ -22,9 +22,9 @@ import java.util.Vector;
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
 
+import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolver;
+import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolverPlugin;
 import org.eclipse.wst.common.uriresolver.internal.util.URIHelper;
-import org.eclipse.wst.xml.uriresolver.internal.util.IdResolver;
-import org.eclipse.wst.xml.uriresolver.internal.util.IdResolverImpl;
 import org.xml.sax.ContentHandler;
 import org.xml.sax.DTDHandler;
 import org.xml.sax.ErrorHandler;
@@ -350,8 +350,8 @@ public class DTDParser extends DefaultHandler implements ContentHandler, DTDHand
 					parsingExternalPEReference = false;
 				}
 				else {
-					IdResolver idResolver = new IdResolverImpl(currentDTD.getName());
-					String uri = idResolver.resolveId(publicId, systemId);
+					URIResolver idResolver = URIResolverPlugin.createResolver();
+					String uri = idResolver.resolve(currentDTD.getName(), publicId, systemId);
 					if (!isDTDLoaded(uri)) {
 						// not loaded
 						// out.println(" DTD not loaded .. create new DTD: "
@@ -667,8 +667,8 @@ public class DTDParser extends DefaultHandler implements ContentHandler, DTDHand
 
 	public InputSource resolveEntity(String publicId, String systemId) throws SAXException {
 		InputSource result = null;
-		IdResolver idResolver = new IdResolverImpl(currentDTD.getName());
-		String uri = idResolver.resolveId(publicId, systemId);
+		URIResolver idResolver = URIResolverPlugin.createResolver();
+		String uri = idResolver.resolve(currentDTD.getName(), publicId, systemId);
 		if(uri == null){
 			uri = systemId;
 		}
diff --git a/bundles/org.eclipse.wst.html.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.html.core/META-INF/MANIFEST.MF
index d8b99ca36c..23caaba51d 100644
--- a/bundles/org.eclipse.wst.html.core/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.wst.html.core/META-INF/MANIFEST.MF
@@ -29,7 +29,7 @@ Require-Bundle: org.eclipse.wst.css.core,
  org.eclipse.wst.sse.ui,
  org.eclipse.wst.sse.core,
  org.eclipse.wst.xml.core,
- org.eclipse.wst.xml.uriresolver,
+ org.eclipse.wst.common.uriresolver,
  org.eclipse.core.resources,
  org.eclipse.core.runtime
 Eclipse-AutoStart: true
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/HTMLModelQueryAssociationProvider.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/HTMLModelQueryAssociationProvider.java
index 4b1ddcbb19..e1a0d98f04 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/HTMLModelQueryAssociationProvider.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/HTMLModelQueryAssociationProvider.java
@@ -12,9 +12,9 @@ package org.eclipse.wst.html.core.internal.modelquery;
 
 
 
+import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolver;
 import org.eclipse.wst.xml.core.internal.contentmodel.modelqueryimpl.SimpleAssociationProvider;
 import org.eclipse.wst.xml.core.internal.contentmodel.util.CMDocumentCache;
-import org.eclipse.wst.xml.uriresolver.internal.util.IdResolver;
 
 /**
  */
@@ -23,7 +23,7 @@ public class HTMLModelQueryAssociationProvider extends SimpleAssociationProvider
 	/**
 	 * @param modelQueryCMProvider org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQueryCMProvider
 	 */
-	public HTMLModelQueryAssociationProvider(CMDocumentCache cache, IdResolver idResolver) {
+	public HTMLModelQueryAssociationProvider(CMDocumentCache cache, URIResolver idResolver) {
 		super(new HTMLModelQueryCMProvider(cache, idResolver));
 	}
 
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/HTMLModelQueryCMProvider.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/HTMLModelQueryCMProvider.java
index 824cf5ddab..53ac1d98f7 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/HTMLModelQueryCMProvider.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/HTMLModelQueryCMProvider.java
@@ -13,6 +13,7 @@ package org.eclipse.wst.html.core.internal.modelquery;
 
 import java.util.Hashtable;
 
+import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolver;
 import org.eclipse.wst.html.core.internal.contentmodel.HTMLCMDocumentFactory;
 import org.eclipse.wst.html.core.internal.document.HTMLDocumentTypeEntry;
 import org.eclipse.wst.html.core.internal.document.HTMLDocumentTypeRegistry;
@@ -21,7 +22,6 @@ import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQueryCMPro
 import org.eclipse.wst.xml.core.internal.contentmodel.util.CMDocumentCache;
 import org.eclipse.wst.xml.core.internal.provisional.contentmodel.CMDocType;
 import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
-import org.eclipse.wst.xml.uriresolver.internal.util.IdResolver;
 import org.w3c.dom.Document;
 import org.w3c.dom.DocumentType;
 import org.w3c.dom.Node;
@@ -39,7 +39,7 @@ public class HTMLModelQueryCMProvider implements ModelQueryCMProvider {
 
 	private XHTMLAssociationProvider xhtmlassoc = null;
 
-	public HTMLModelQueryCMProvider(CMDocumentCache cache, IdResolver idResolver) {
+	public HTMLModelQueryCMProvider(CMDocumentCache cache, URIResolver idResolver) {
 		super();
 		xhtmlassoc = new XHTMLAssociationProvider(cache, idResolver);
 	}
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/HTMLModelQueryImpl.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/HTMLModelQueryImpl.java
index 8fe47c8c61..8786484615 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/HTMLModelQueryImpl.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/HTMLModelQueryImpl.java
@@ -14,6 +14,7 @@ package org.eclipse.wst.html.core.internal.modelquery;
 import java.util.List;
 import java.util.Vector;
 
+import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolver;
 import org.eclipse.wst.html.core.internal.provisional.HTMLCMProperties;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
@@ -22,7 +23,6 @@ import org.eclipse.wst.xml.core.internal.contentmodel.modelqueryimpl.ModelQueryI
 import org.eclipse.wst.xml.core.internal.contentmodel.util.CMDocumentCache;
 import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
 import org.eclipse.wst.xml.core.internal.ssemodelquery.MovableModelQuery;
-import org.eclipse.wst.xml.uriresolver.internal.util.IdResolver;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 
@@ -31,7 +31,7 @@ public class HTMLModelQueryImpl extends ModelQueryImpl implements MovableModelQu
 
 	protected CMDocumentCache fCache = null;
 
-	public HTMLModelQueryImpl(CMDocumentCache cache, IdResolver idResolver) {
+	public HTMLModelQueryImpl(CMDocumentCache cache, URIResolver idResolver) {
 		super(new HTMLModelQueryAssociationProvider(cache, idResolver));
 		fCache = cache;
 	}
@@ -91,7 +91,7 @@ public class HTMLModelQueryImpl extends ModelQueryImpl implements MovableModelQu
 	/**
 	 * @see MovableModelQuery#setIdResolver(IdResolver)
 	 */
-	public void setIdResolver(IdResolver newIdResolver) {
+	public void setIdResolver(URIResolver newIdResolver) {
 		modelQueryAssociationProvider = new HTMLModelQueryAssociationProvider(fCache, newIdResolver);
 	}
 
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/ModelQueryAdapterFactoryForHTML.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/ModelQueryAdapterFactoryForHTML.java
index 3eb561d658..55d770356d 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/ModelQueryAdapterFactoryForHTML.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/ModelQueryAdapterFactoryForHTML.java
@@ -18,6 +18,7 @@ import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.Path;
+import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolver;
 import org.eclipse.wst.sse.core.internal.provisional.AbstractAdapterFactory;
 import org.eclipse.wst.sse.core.internal.provisional.IModelStateListener;
 import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
@@ -31,7 +32,6 @@ import org.eclipse.wst.xml.core.internal.modelquery.XMLCatalogIdResolver;
 import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
 import org.eclipse.wst.xml.core.internal.ssemodelquery.ModelQueryAdapter;
 import org.eclipse.wst.xml.core.internal.ssemodelquery.ModelQueryAdapterImpl;
-import org.eclipse.wst.xml.uriresolver.internal.util.IdResolver;
 
 /**
  * Creates a ModelQueryAdapter for HTML models
@@ -95,7 +95,7 @@ public class ModelQueryAdapterFactoryForHTML extends AbstractAdapterFactory impl
 					System.out.println("----------------ModelQueryAdapterFactoryForHTML... baseLocation : " + baseLocation); //$NON-NLS-1$
 
 				CMDocumentCache cmDocumentCache = new CMDocumentCache();
-				IdResolver idResolver = new XMLCatalogIdResolver(baseLocation, model.getResolver());
+				URIResolver idResolver = new XMLCatalogIdResolver(baseLocation, model.getResolver());
 				ModelQuery modelQuery = new HTMLModelQueryImpl(cmDocumentCache, idResolver);
 				modelQuery.setEditMode(ModelQuery.EDIT_MODE_UNCONSTRAINED);
 				modelQueryAdapterImpl = new ModelQueryAdapterImpl(cmDocumentCache, modelQuery, idResolver);
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/XHTMLAssociationProvider.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/XHTMLAssociationProvider.java
index ea52bbd3bd..f9d1e2f05d 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/XHTMLAssociationProvider.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/XHTMLAssociationProvider.java
@@ -11,10 +11,10 @@
 package org.eclipse.wst.html.core.internal.modelquery;
 
 
+import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolver;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument;
 import org.eclipse.wst.xml.core.internal.contentmodel.modelqueryimpl.XMLAssociationProvider;
 import org.eclipse.wst.xml.core.internal.contentmodel.util.CMDocumentCache;
-import org.eclipse.wst.xml.uriresolver.internal.util.IdResolver;
 import org.w3c.dom.Document;
 
 /**
@@ -26,13 +26,13 @@ import org.w3c.dom.Document;
  */
 class XHTMLAssociationProvider extends XMLAssociationProvider {
 
-	protected IdResolver idResolver = null;
+	protected URIResolver idResolver = null;
 	private String fCachedGrammerURI;
 	private String fCachedPublicID;
 	private String fCachedSystemID;
 	private static final boolean USE_QUICK_CACHE = true;
 
-	public XHTMLAssociationProvider(CMDocumentCache cache, IdResolver idResolver) {
+	public XHTMLAssociationProvider(CMDocumentCache cache, URIResolver idResolver) {
 		super(cache);
 		this.idResolver = idResolver;
 	}
@@ -56,14 +56,14 @@ class XHTMLAssociationProvider extends XMLAssociationProvider {
 				grammerURI = fCachedGrammerURI;
 			}
 			else {
-				grammerURI = idResolver.resolveId(publicId, systemId);
+				grammerURI = idResolver.resolve(null, publicId, systemId);
 				fCachedGrammerURI = grammerURI;
 				fCachedPublicID = publicId;
 				fCachedSystemID = systemId;
 			}
 		}
 		else {
-			grammerURI = idResolver.resolveId(publicId, systemId);
+			grammerURI = idResolver.resolve(null, publicId, systemId);
 		}
 
 		if (grammerURI == null)
@@ -84,6 +84,6 @@ class XHTMLAssociationProvider extends XMLAssociationProvider {
 	/**
 	 */
 	protected String resolveGrammarURI(Document document, String publicId, String systemId) {
-		return idResolver.resolveId(publicId, systemId);
+		return idResolver.resolve(null, publicId, systemId);
 	}
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.xml.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.xml.core/META-INF/MANIFEST.MF
index ba8f60db50..49abbd7985 100644
--- a/bundles/org.eclipse.wst.xml.core/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.wst.xml.core/META-INF/MANIFEST.MF
@@ -53,6 +53,5 @@ Require-Bundle: org.apache.xerces;visibility:=reexport,
  org.eclipse.core.filebuffers,
  org.eclipse.text,
  org.eclipse.wst.common.uriresolver,
- org.eclipse.wst.xml.uriresolver,
- org.eclipse.wst.xml.catalog
+ org.eclipse.wst.xml.catalog  
 Eclipse-AutoStart: true
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/modelquery/ModelQueryAdapterFactoryForXML.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/modelquery/ModelQueryAdapterFactoryForXML.java
index f1e2778571..8ed20ce188 100644
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/modelquery/ModelQueryAdapterFactoryForXML.java
+++ b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/modelquery/ModelQueryAdapterFactoryForXML.java
@@ -20,6 +20,7 @@ import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.Path;
+import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolver;
 import org.eclipse.wst.sse.core.internal.provisional.AbstractAdapterFactory;
 import org.eclipse.wst.sse.core.internal.provisional.IModelStateListener;
 import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
@@ -32,7 +33,6 @@ import org.eclipse.wst.xml.core.internal.contentmodel.util.CMDocumentCache;
 import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
 import org.eclipse.wst.xml.core.internal.ssemodelquery.ModelQueryAdapter;
 import org.eclipse.wst.xml.core.internal.ssemodelquery.ModelQueryAdapterImpl;
-import org.eclipse.wst.xml.uriresolver.internal.util.IdResolver;
 
 
 public class ModelQueryAdapterFactoryForXML extends AbstractAdapterFactory implements IModelStateListener {
@@ -109,7 +109,7 @@ public class ModelQueryAdapterFactoryForXML extends AbstractAdapterFactory imple
 
 				CMDocumentCache cmDocumentCache = new CMDocumentCache();
 				ModelQuery modelQuery = null;
-				IdResolver idResolver = null;
+				URIResolver idResolver = null;
 
 				if (org.eclipse.wst.sse.core.internal.util.Debug.displayInfo)
 					System.out.println("********XMLModelQueryImpl"); //$NON-NLS-1$
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/modelquery/ModelQueryUtil.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/modelquery/ModelQueryUtil.java
index 9fa7cc1d73..fd7572f1f3 100644
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/modelquery/ModelQueryUtil.java
+++ b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/modelquery/ModelQueryUtil.java
@@ -14,13 +14,13 @@ package org.eclipse.wst.xml.core.internal.modelquery;
 
 
 
+import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolver;
 import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
 import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
 import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery;
 import org.eclipse.wst.xml.core.internal.contentmodel.util.CMDocumentCache;
 import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
 import org.eclipse.wst.xml.core.internal.ssemodelquery.ModelQueryAdapter;
-import org.eclipse.wst.xml.uriresolver.internal.util.IdResolver;
 import org.w3c.dom.Document;
 
 
@@ -35,7 +35,7 @@ public class ModelQueryUtil {
 		return modelQueryAdapter != null ? modelQueryAdapter.getCMDocumentCache() : null;
 	}
 
-	public static IdResolver getIdResolver(Document node) {
+	public static URIResolver getIdResolver(Document node) {
 		ModelQueryAdapter modelQueryAdapter = getModelQueryAdapter(node);
 		return modelQueryAdapter != null ? modelQueryAdapter.getIdResolver() : null;
 	}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/modelquery/XMLCatalogIdResolver.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/modelquery/XMLCatalogIdResolver.java
index b3d4c46222..05f38ed2d5 100644
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/modelquery/XMLCatalogIdResolver.java
+++ b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/modelquery/XMLCatalogIdResolver.java
@@ -19,10 +19,10 @@ import org.eclipse.wst.common.uriresolver.internal.util.URIHelper;
 import org.eclipse.wst.sse.core.internal.util.URIResolver;
 import org.eclipse.wst.xml.catalog.internal.provisional.ICatalog;
 import org.eclipse.wst.xml.catalog.internal.provisional.XMLCatalogPlugin;
-import org.eclipse.wst.xml.uriresolver.internal.util.IdResolver;
 
 
-public class XMLCatalogIdResolver implements IdResolver {
+
+public class XMLCatalogIdResolver implements org.eclipse.wst.common.uriresolver.internal.provisional.URIResolver {
 	protected String resourceLocation;
 
 	protected URIResolver uriresolver;
@@ -51,14 +51,8 @@ public class XMLCatalogIdResolver implements IdResolver {
 		return location;
 	}
 
-	/**
-	 * @deprecated in superclass
-	 */
-	public String resolveId(String publicId, String systemId) {
-		return resolveId(getResourceLocation(), publicId, systemId);
-	}
 
-	public String resolveId(String base, String publicId, String systemId) {
+	public String resolve(String base, String publicId, String systemId) {
 		// first see if we can map the publicId to an alternative systemId
 		// note: should probably verify the mappedSystemId before ignoring the
 		// systemId
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/modelquery/XMLModelQueryAssociationProvider.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/modelquery/XMLModelQueryAssociationProvider.java
index 91ba9f3d1a..dce92c862c 100644
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/modelquery/XMLModelQueryAssociationProvider.java
+++ b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/modelquery/XMLModelQueryAssociationProvider.java
@@ -14,9 +14,9 @@ package org.eclipse.wst.xml.core.internal.modelquery;
 
 
 
+import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolver;
 import org.eclipse.wst.xml.core.internal.contentmodel.modelqueryimpl.XMLAssociationProvider;
 import org.eclipse.wst.xml.core.internal.contentmodel.util.CMDocumentCache;
-import org.eclipse.wst.xml.uriresolver.internal.util.IdResolver;
 import org.w3c.dom.Document;
 
 /**
@@ -24,14 +24,14 @@ import org.w3c.dom.Document;
  */
 class XMLModelQueryAssociationProvider extends XMLAssociationProvider {
 
-	protected IdResolver idResolver;
+	protected URIResolver idResolver;
 
-	public XMLModelQueryAssociationProvider(CMDocumentCache cache, IdResolver idResolver) {
+	public XMLModelQueryAssociationProvider(CMDocumentCache cache, URIResolver idResolver) {
 		super(cache);
 		this.idResolver = idResolver;
 	}
 
 	protected String resolveGrammarURI(Document document, String publicId, String systemId) {
-		return idResolver.resolveId(publicId, systemId);
+		return idResolver.resolve(null, publicId, systemId);
 	}
 }
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/modelquery/XMLModelQueryImpl.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/modelquery/XMLModelQueryImpl.java
index 7686d005bd..2992a799d6 100644
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/modelquery/XMLModelQueryImpl.java
+++ b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/modelquery/XMLModelQueryImpl.java
@@ -14,25 +14,25 @@ package org.eclipse.wst.xml.core.internal.modelquery;
 
 
 
+import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolver;
 import org.eclipse.wst.xml.core.internal.contentmodel.modelqueryimpl.ModelQueryImpl;
 import org.eclipse.wst.xml.core.internal.contentmodel.util.CMDocumentCache;
 import org.eclipse.wst.xml.core.internal.ssemodelquery.MovableModelQuery;
-import org.eclipse.wst.xml.uriresolver.internal.util.IdResolver;
 
 
 public class XMLModelQueryImpl extends ModelQueryImpl implements MovableModelQuery {
 
 	protected CMDocumentCache fCache = null;
 
-	public XMLModelQueryImpl(CMDocumentCache cache, IdResolver idResolver) {
+	public XMLModelQueryImpl(CMDocumentCache cache, URIResolver idResolver) {
 		super(new XMLModelQueryAssociationProvider(cache, idResolver));
 		fCache = cache;
 	}
 
 	/**
-	 * @see MovableModelQuery#setIdResolver(IdResolver)
+	 * @see MovableModelQuery#setIdResolver(URIResolver)
 	 */
-	public void setIdResolver(IdResolver newIdResolver) {
+	public void setIdResolver(URIResolver newIdResolver) {
 		modelQueryAssociationProvider = new XMLModelQueryAssociationProvider(fCache, newIdResolver);
 	}
 }
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/ssemodelquery/ModelQueryAdapter.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/ssemodelquery/ModelQueryAdapter.java
index 40383764d2..fc5465c018 100644
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/ssemodelquery/ModelQueryAdapter.java
+++ b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/ssemodelquery/ModelQueryAdapter.java
@@ -12,21 +12,20 @@
  *******************************************************************************/
 package org.eclipse.wst.xml.core.internal.ssemodelquery;
 
+import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolver;
 import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
 import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery;
 import org.eclipse.wst.xml.core.internal.contentmodel.util.CMDocumentCache;
-import org.eclipse.wst.xml.uriresolver.internal.util.IdResolver;
-
 
 public interface ModelQueryAdapter extends INodeAdapter {
 
 	public CMDocumentCache getCMDocumentCache();
 
-	public IdResolver getIdResolver();
+	public URIResolver getIdResolver();
 
 	public ModelQuery getModelQuery();
 
 	void release();
 
-	void setIdResolver(IdResolver newIdResolver);
+	void setIdResolver(URIResolver newIdResolver);
 }
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/ssemodelquery/ModelQueryAdapterImpl.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/ssemodelquery/ModelQueryAdapterImpl.java
index 59c93f9a13..26b00e6986 100644
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/ssemodelquery/ModelQueryAdapterImpl.java
+++ b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/ssemodelquery/ModelQueryAdapterImpl.java
@@ -14,19 +14,19 @@ package org.eclipse.wst.xml.core.internal.ssemodelquery;
 
 
 
+import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolver;
 import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
 import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery;
 import org.eclipse.wst.xml.core.internal.contentmodel.util.CMDocumentCache;
-import org.eclipse.wst.xml.uriresolver.internal.util.IdResolver;
 
 
 public class ModelQueryAdapterImpl implements ModelQueryAdapter {
 	protected CMDocumentCache cmDocumentCache;
-	protected IdResolver idResolver;
+	protected URIResolver idResolver;
 
 	protected ModelQuery modelQuery;
 
-	public ModelQueryAdapterImpl(CMDocumentCache cmDocumentCache, ModelQuery modelQuery, IdResolver idResolver) {
+	public ModelQueryAdapterImpl(CMDocumentCache cmDocumentCache, ModelQuery modelQuery, URIResolver idResolver) {
 		this.cmDocumentCache = cmDocumentCache;
 		this.modelQuery = modelQuery;
 		this.idResolver = idResolver;
@@ -36,7 +36,7 @@ public class ModelQueryAdapterImpl implements ModelQueryAdapter {
 		return cmDocumentCache;
 	}
 
-	public IdResolver getIdResolver() {
+	public URIResolver getIdResolver() {
 		return idResolver;
 	}
 
@@ -65,10 +65,10 @@ public class ModelQueryAdapterImpl implements ModelQueryAdapter {
 	}
 
 	/**
-	 * @see ModelQueryAdapter#setIdResolver(IdResolver)
+	 * @see ModelQueryAdapter#setIdResolver(URIResolver)
 	 */
 
-	public void setIdResolver(IdResolver newIdResolver) {
+	public void setIdResolver(URIResolver newIdResolver) {
 		idResolver = newIdResolver;
 		if (modelQuery instanceof MovableModelQuery)
 			((MovableModelQuery) modelQuery).setIdResolver(newIdResolver);
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/ssemodelquery/MovableModelQuery.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/ssemodelquery/MovableModelQuery.java
index 82af7b037f..7557efc8c5 100644
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/ssemodelquery/MovableModelQuery.java
+++ b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/ssemodelquery/MovableModelQuery.java
@@ -14,10 +14,10 @@ package org.eclipse.wst.xml.core.internal.ssemodelquery;
 
 
 
+import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolver;
 import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery;
-import org.eclipse.wst.xml.uriresolver.internal.util.IdResolver;
 
 public interface MovableModelQuery extends ModelQuery {
 
-	void setIdResolver(IdResolver newIdResolver);
+	void setIdResolver(URIResolver newURIResolver);
 }
diff --git a/bundles/org.eclipse.wst.xml.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.xml.ui/META-INF/MANIFEST.MF
index 43116a1785..68f4d57e32 100644
--- a/bundles/org.eclipse.wst.xml.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.wst.xml.ui/META-INF/MANIFEST.MF
@@ -46,7 +46,6 @@ Require-Bundle: org.eclipse.ui.ide,
  org.eclipse.core.resources,
  org.eclipse.core.runtime,
  org.eclipse.wst.common.uriresolver,
- org.eclipse.wst.xml.uriresolver,
  org.eclipse.wst.xml.catalog,
  org.eclipse.wst.xml.core,
  org.eclipse.wst.common.ui,
diff --git a/bundles/org.eclipse.wst.xml.ui/src-wizards/org/eclipse/wst/xml/ui/internal/wizards/NewXMLGenerator.java b/bundles/org.eclipse.wst.xml.ui/src-wizards/org/eclipse/wst/xml/ui/internal/wizards/NewXMLGenerator.java
index 694a67cae3..03aaf8c5cc 100644
--- a/bundles/org.eclipse.wst.xml.ui/src-wizards/org/eclipse/wst/xml/ui/internal/wizards/NewXMLGenerator.java
+++ b/bundles/org.eclipse.wst.xml.ui/src-wizards/org/eclipse/wst/xml/ui/internal/wizards/NewXMLGenerator.java
@@ -25,6 +25,8 @@ import javax.xml.parsers.DocumentBuilderFactory;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.runtime.Preferences;
 import org.eclipse.jface.util.Assert;
+import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolver;
+import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolverPlugin;
 import org.eclipse.wst.common.uriresolver.internal.util.URIHelper;
 import org.eclipse.wst.sse.core.internal.encoding.CommonEncodingPreferenceNames;
 import org.eclipse.wst.xml.catalog.internal.provisional.ICatalog;
@@ -39,8 +41,6 @@ import org.eclipse.wst.xml.core.internal.contentmodel.util.ContentBuilder;
 import org.eclipse.wst.xml.core.internal.contentmodel.util.DOMContentBuilderImpl;
 import org.eclipse.wst.xml.core.internal.contentmodel.util.DOMWriter;
 import org.eclipse.wst.xml.core.internal.contentmodel.util.NamespaceInfo;
-import org.eclipse.wst.xml.uriresolver.internal.util.IdResolver;
-import org.eclipse.wst.xml.uriresolver.internal.util.IdResolverImpl;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
@@ -324,11 +324,13 @@ public class NewXMLGenerator {
 
 	protected class MyExternalCMDocumentSupport implements DOMContentBuilderImpl.ExternalCMDocumentSupport {
 		protected List namespaceInfoList;
-		protected IdResolver idResolver;
+		protected URIResolver idResolver;
+		protected String resourceLocation;
 
 		protected MyExternalCMDocumentSupport(List namespaceInfoList, String resourceLocation) {
 			this.namespaceInfoList = namespaceInfoList;
-			idResolver = new IdResolverImpl(resourceLocation);
+			this.resourceLocation = resourceLocation;
+			idResolver = URIResolverPlugin.createResolver();
 		}
 
 		public CMDocument getCMDocument(Element element, String namespaceURI) {
@@ -343,7 +345,7 @@ public class NewXMLGenerator {
 					}
 				}
 				if (locationHint != null) {
-					grammarURI = idResolver.resolveId(locationHint, locationHint);
+					grammarURI = idResolver.resolve(resourceLocation, locationHint, locationHint);
 					result = ContentModelManager.getInstance().createCMDocument(getGrammarURI(), null);
 				}
 			}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/dialogs/EditNamespaceInfoDialog.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/dialogs/EditNamespaceInfoDialog.java
index 31f7ab333c..43b405db73 100644
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/dialogs/EditNamespaceInfoDialog.java
+++ b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/dialogs/EditNamespaceInfoDialog.java
@@ -34,13 +34,13 @@ import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Text;
+import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolver;
+import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolverPlugin;
 import org.eclipse.wst.common.uriresolver.internal.util.URIHelper;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument;
 import org.eclipse.wst.xml.core.internal.contentmodel.ContentModelManager;
 import org.eclipse.wst.xml.core.internal.contentmodel.util.NamespaceInfo;
 import org.eclipse.wst.xml.ui.internal.XMLUIMessages;
-import org.eclipse.wst.xml.uriresolver.internal.util.IdResolver;
-import org.eclipse.wst.xml.uriresolver.internal.util.IdResolverImpl;
 
 public class EditNamespaceInfoDialog extends Dialog {
 
@@ -206,8 +206,8 @@ public class EditNamespaceInfoDialog extends Dialog {
 				locationHintField.setText(uri);
 			} else if (id != null) {
 				locationHintField.setText(id);
-				IdResolver resolver = new IdResolverImpl(null);
-				grammarURI = resolver.resolveId(id, id);
+				URIResolver resolver = URIResolverPlugin.createResolver();
+				grammarURI = resolver.resolve(null, id, id);
 			}
 
 			try {
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/dialogs/NamespaceInfoErrorHelper.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/dialogs/NamespaceInfoErrorHelper.java
index fc31b0b9b6..ae360c3d74 100644
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/dialogs/NamespaceInfoErrorHelper.java
+++ b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/dialogs/NamespaceInfoErrorHelper.java
@@ -16,11 +16,11 @@ import java.util.Hashtable;
 import java.util.Iterator;
 import java.util.List;
 
+import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolver;
 import org.eclipse.wst.common.uriresolver.internal.util.URIHelper;
 import org.eclipse.wst.xml.core.internal.contentmodel.util.DOMNamespaceInfoManager;
 import org.eclipse.wst.xml.core.internal.contentmodel.util.NamespaceInfo;
 import org.eclipse.wst.xml.ui.internal.XMLUIMessages;
-import org.eclipse.wst.xml.uriresolver.internal.util.IdResolver;
 
 public class NamespaceInfoErrorHelper {
 
@@ -29,7 +29,7 @@ public class NamespaceInfoErrorHelper {
 	public NamespaceInfoErrorHelper() {
 	}
 
-	public String computeErrorMessage(List namespaceInfoList, IdResolver idResolver) {
+	public String computeErrorMessage(List namespaceInfoList, URIResolver idResolver) {
 		String result = null;
 		Hashtable prefixTable = new Hashtable();
 		Hashtable uriTable = new Hashtable();
@@ -65,7 +65,7 @@ public class NamespaceInfoErrorHelper {
 				}
 
 				if (nsInfo.locationHint != null && idResolver != null) {
-					String grammarURI = idResolver.resolveId(nsInfo.locationHint, nsInfo.locationHint);
+					String grammarURI = idResolver.resolve(null, nsInfo.locationHint, nsInfo.locationHint);
 					if (!URIHelper.isReadableURI(grammarURI, false)) {
 						result = XMLUIMessages._UI_WARNING_SCHEMA_CAN_NOT_BE_LOCATED + " '" + nsInfo.locationHint + "'"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 						break;
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/nsedit/CommonAddNamespacesControl.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/nsedit/CommonAddNamespacesControl.java
index 26420c331b..5d5035797a 100644
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/nsedit/CommonAddNamespacesControl.java
+++ b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/nsedit/CommonAddNamespacesControl.java
@@ -30,12 +30,12 @@ import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.TableItem;
 import org.eclipse.swt.widgets.Text;
 import org.eclipse.ui.part.PageBook;
+import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolver;
+import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolverPlugin;
 import org.eclipse.wst.common.uriresolver.internal.util.URIHelper;
 import org.eclipse.wst.xml.core.internal.contentmodel.util.NamespaceInfo;
 import org.eclipse.wst.xml.ui.internal.XMLUIMessages;
 import org.eclipse.wst.xml.ui.internal.dialogs.SelectFileOrXMLCatalogIdDialog;
-import org.eclipse.wst.xml.uriresolver.internal.util.IdResolver;
-import org.eclipse.wst.xml.uriresolver.internal.util.IdResolverImpl;
 
 public class CommonAddNamespacesControl extends Composite implements SelectionListener {
 
@@ -140,8 +140,8 @@ public class CommonAddNamespacesControl extends Composite implements SelectionLi
 					locationHintField.setText(uri);
 				} else if (id != null) {
 					locationHintField.setText(id);
-					IdResolver resolver = new IdResolverImpl(null);
-					grammarURI = resolver.resolveId(id, id);
+					URIResolver resolver = URIResolverPlugin.createResolver();
+					grammarURI = resolver.resolve(null, id, id);
 				}
 
 				try {
diff --git a/bundles/org.eclipse.wst.xsd.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.xsd.ui/META-INF/MANIFEST.MF
index d0665515f8..0a0ca100f5 100644
--- a/bundles/org.eclipse.wst.xsd.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.wst.xsd.ui/META-INF/MANIFEST.MF
@@ -38,7 +38,6 @@ Export-Package: org.eclipse.wst.xsd.ui.internal,
  org.eclipse.wst.xsd.ui.internal.wizards
 Require-Bundle: org.eclipse.core.runtime.compatibility,
  org.eclipse.wst.common.uriresolver,
- org.eclipse.wst.xml.uriresolver,
  org.eclipse.wst.sse.ui,
  org.eclipse.wst.sse.core,
  org.eclipse.wst.xml.core,
diff --git a/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/XSDURIConverter.java b/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/XSDURIConverter.java
index 656a104805..f688f9fe7a 100644
--- a/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/XSDURIConverter.java
+++ b/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/XSDURIConverter.java
@@ -16,8 +16,8 @@ import java.io.InputStream;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.resource.impl.URIConverterImpl;
-import org.eclipse.wst.xml.uriresolver.internal.util.IdResolver;
-import org.eclipse.wst.xml.uriresolver.internal.util.IdResolverImpl;
+import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolver;
+import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolverPlugin;
 
 public class XSDURIConverter extends URIConverterImpl
 {
@@ -39,8 +39,8 @@ public class XSDURIConverter extends URIConverterImpl
     // if ("http".equals(scheme))
     {
       String theURI = uri.toString();
-      IdResolver idResolver = new IdResolverImpl(theURI);
-      String result = idResolver.resolveId("/", null, theURI);
+      URIResolver idResolver = URIResolverPlugin.createResolver();
+      String result = idResolver.resolve("/", null, theURI);
       if (result != null)
       {
         mappedURI = createURI(result);