summaryrefslogtreecommitdiffstats
path: root/java/sca/modules/xsd/src/main
diff options
context:
space:
mode:
authorramkumar <ramkumar@13f79535-47bb-0310-9956-ffa450edef68>2009-06-16 09:36:24 +0000
committerramkumar <ramkumar@13f79535-47bb-0310-9956-ffa450edef68>2009-06-16 09:36:24 +0000
commit47237c62208745d98cef0de4b518ad01b58094ec (patch)
tree4164ac2d428bb3f1fb705ec9ab1d89f033bd54b2 /java/sca/modules/xsd/src/main
parent57485094833282300ce30d05db9222b49a72eee0 (diff)
Commented import resolving code from XSDModelResolver as its not applicable for in-line schemas
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@785126 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/sca/modules/xsd/src/main')
-rw-r--r--java/sca/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDModelResolver.java10
1 files changed, 6 insertions, 4 deletions
diff --git a/java/sca/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDModelResolver.java b/java/sca/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDModelResolver.java
index 2f303a295c..d201ce5b80 100644
--- a/java/sca/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDModelResolver.java
+++ b/java/sca/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDModelResolver.java
@@ -89,7 +89,8 @@ public class XSDModelResolver implements ModelResolver {
String namespace = definition.getNamespace();
XSDefinition resolved = null;
- // Lookup a definition for the given namespace, from imports
+ // FIXME - We should not be using import resolvers for inline schema.
+ /* // Lookup a definition for the given namespace, from imports
List<String> locations = new ArrayList<String>();
// Collection of namespace imports with location
Map<String, NamespaceImport> locationMap = new HashMap<String, NamespaceImport>();
@@ -110,7 +111,8 @@ public class XSDModelResolver implements ModelResolver {
locations.add(namespaceImport.getLocation());
}
}
- } else if (import_ instanceof DefaultImport) {
+ }
+ else if (import_ instanceof DefaultImport) {
// Delegate the resolution to the default import resolver
resolved =
@@ -130,9 +132,9 @@ public class XSDModelResolver implements ModelResolver {
if (!resolved.isUnresolved()) {
return modelClass.cast(resolved);
}
- }
+ } */
- // Not found, lookup a definition for the given namespace, within the contribution
+ // Lookup a definition for the given namespace, within the contribution
List<XSDefinition> list = map.get(namespace);
XSDefinition modelXSD = null;
if (list != null && definition.getDocument() != null) {