Use sca-config XML files for SCA binding/policy definitions

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@830339 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 11 insertions, 2 deletions

diff --git a/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolverExtensionPoint.java b/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolverExtensionPoint.java
index 7cbf8d5528..e66dee26af 100644
--- a/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolverExtensionPoint.java
+++ b/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolverExtensionPoint.java
@@ -22,6 +22,7 @@ import java.io.IOException;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.StringTokenizer;
 
 import org.apache.tuscany.sca.extensibility.ServiceDeclaration;
 import org.apache.tuscany.sca.extensibility.ServiceDiscovery;
@@ -103,11 +104,19 @@ public class DefaultModelResolverExtensionPoint implements ModelResolverExtensio
         }
         
         // Load model resolvers
-        for (ServiceDeclaration modelResolverDeclaration: modelResolverDeclarations) {
+        for (ServiceDeclaration modelResolverDeclaration : modelResolverDeclarations) {
             Map<String, String> attributes = modelResolverDeclaration.getAttributes();
             String model = attributes.get("model");
+            // The model can be a list of interfaces so that one model resolver can be used
+            // to resolve different types of models
+            if (model != null) {
+                StringTokenizer tokenizer = new StringTokenizer(model);
+                while (tokenizer.hasMoreTokens()) {
+                    String key = tokenizer.nextToken();
+                    loadedResolvers.put(key, modelResolverDeclaration);
+                }
 
-            loadedResolvers.put(model, modelResolverDeclaration);
+            }
         }
     }