1 files changed, 5 insertions, 3 deletions
diff --git a/branches/sca-equinox/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistry.java b/branches/sca-equinox/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistry.java
index 48f240559c..12979723b1 100644
--- a/branches/sca-equinox/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistry.java
+++ b/branches/sca-equinox/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistry.java
@@ -28,6 +28,7 @@ import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
+import org.apache.tuscany.sca.extensibility.ServiceDeclaration;
 import org.apache.tuscany.sca.extensibility.ServiceDiscovery;
 
 /**
@@ -103,9 +104,10 @@ public class DefaultExtensionPointRegistry implements ExtensionPointRegistry {
             
             // Dynamically load an extension point class declared under META-INF/services           
             try {
-                Class<?> extensionPointClass = 
-                	ServiceDiscovery.getInstance().loadFirstServiceClass(extensionPointType);
-                if (extensionPointClass != null) {
+                ServiceDeclaration extensionPointDeclaration = ServiceDiscovery.getInstance().getFirstServiceDeclaration(extensionPointType.getName());
+                if (extensionPointDeclaration != null) {
+                    Class<?> extensionPointClass = extensionPointDeclaration.loadClass();
+                    
                     // Construct the extension point
                     Constructor<?>[] constructors = extensionPointClass.getConstructors();
                     Constructor<?> constructor = getConstructor(constructors, new Class<?>[] {ExtensionPointRegistry.class});