[110356] WSDL editor content assist not working if WSDL schemas are not explicitly added to the XML catalog

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 dce92c8..48e65ad 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

@@ -32,6 +32,16 @@
 	}
 
 	protected String resolveGrammarURI(Document document, String publicId, String systemId) {
-		return idResolver.resolve(null, publicId, systemId);
+		
+		String resolvedId = idResolver.resolve(null, publicId, systemId); // initially we had only this call
+		if(resolvedId == null){
+			String location = systemId;
+			if(location == null){
+				location = publicId;
+			}
+			// try physical location
+			resolvedId = idResolver.resolvePhysicalLocation(null, publicId, location);
+		}
+		return resolvedId;
 	}
 }