From 4e28c9663f0fbbcd558afdd034d420c52059f75f Mon Sep 17 00:00:00 2001
From: antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>
Date: Tue, 16 Jun 2009 10:14:44 +0000
Subject: Merge 785126 from 2.x trunk to M3 to fix 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@785143 13f79535-47bb-0310-9956-ffa450edef68
---
 .../java/org/apache/tuscany/sca/xsd/xml/XSDModelResolver.java  | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'branches/sca-java-2.0-M3/modules/xsd')

diff --git a/branches/sca-java-2.0-M3/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDModelResolver.java b/branches/sca-java-2.0-M3/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDModelResolver.java
index 2f303a295c..d201ce5b80 100644
--- a/branches/sca-java-2.0-M3/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDModelResolver.java
+++ b/branches/sca-java-2.0-M3/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) {
-- 
cgit v1.2.3