You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2010/02/17 07:48:29 UTC
svn commit: r910841 -
/tuscany/sca-java-2.x/trunk/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolverExtensionPoint.java
Author: rfeng
Date: Wed Feb 17 06:48:29 2010
New Revision: 910841
URL: http://svn.apache.org/viewvc?rev=910841&view=rev
Log:
Enable org.apache.tuscany.sca.contribution.resolver.DefaultModelResolverExtensionPoint to honor ranking
Modified:
tuscany/sca-java-2.x/trunk/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolverExtensionPoint.java
Modified: tuscany/sca-java-2.x/trunk/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolverExtensionPoint.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolverExtensionPoint.java?rev=910841&r1=910840&r2=910841&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolverExtensionPoint.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolverExtensionPoint.java Wed Feb 17 06:48:29 2010
@@ -19,8 +19,10 @@
package org.apache.tuscany.sca.contribution.resolver;
import java.io.IOException;
+import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
import java.util.StringTokenizer;
@@ -100,13 +102,17 @@
// Get the model resolver service declarations
Collection<ServiceDeclaration> modelResolverDeclarations;
try {
- modelResolverDeclarations = registry.getServiceDiscovery().getServiceDeclarations(ModelResolver.class.getName());
+ modelResolverDeclarations = registry.getServiceDiscovery().getServiceDeclarations(ModelResolver.class, true);
} catch (IOException e) {
throw new IllegalStateException(e);
}
- // Load model resolvers
- for (ServiceDeclaration modelResolverDeclaration : modelResolverDeclarations) {
+ List<ServiceDeclaration> list = new ArrayList<ServiceDeclaration>(modelResolverDeclarations);
+
+ // Load model resolvers, add entries from lower ranking to higher ranking so that higher ranking ones override
+ // the map
+ for (int i = list.size() - 1; i >= 0; i--) {
+ ServiceDeclaration modelResolverDeclaration = list.get(i);
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