Fix the MF to trigger initialization of ServiceDiscovery

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

2 files changed, 2 insertions, 3 deletions

diff --git a/java/sca/modules/extensibility/META-INF/MANIFEST.MF b/java/sca/modules/extensibility/META-INF/MANIFEST.MF
index 14a9bdb56a..147f17e4a1 100644
--- a/java/sca/modules/extensibility/META-INF/MANIFEST.MF
+++ b/java/sca/modules/extensibility/META-INF/MANIFEST.MF
@@ -1,6 +1,4 @@
 Manifest-Version: 1.0

-Tuscany-Comment1: Export the META-INF.services under an "internal" attribute 

- so that it can be seen only by the bundle itself without following the DynamicImport-Package * 

 Export-Package: org.apache.tuscany.sca.core;version="2.0.0";

  uses:="org.apache.tuscany.sca.extensibility",

  org.apache.tuscany.sca.extensibility;version="2.0.0"

@@ -16,6 +14,7 @@ Bundle-Description: Apache Tuscany SCA Extensibility
 Import-Package: javax.xml.namespace,

  org.apache.tuscany.sca.core;version="2.0.0",

  org.apache.tuscany.sca.extensibility;version="2.0.0"

+DynamicImport-Package: org.apache.tuscany.sca.extensibility.equinox 

 Bundle-SymbolicName: org.apache.tuscany.sca.extensibility

 Bundle-DocURL: http://www.apache.org/

 Bundle-RequiredExecutionEnvironment: J2SE-1.5,JavaSE-1.6
diff --git a/java/sca/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistry.java b/java/sca/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistry.java
index 2317fbd475..3ffe893553 100644
--- a/java/sca/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistry.java
+++ b/java/sca/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistry.java
@@ -101,7 +101,7 @@ public class DefaultExtensionPointRegistry implements ExtensionPointRegistry {
             // Dynamically load an extension point class declared under META-INF/services
             try {
                 ServiceDeclaration extensionPointDeclaration =
-                    ServiceDiscovery.getInstance().getServiceDeclaration(extensionPointType);
+                    getServiceDiscovery().getServiceDeclaration(extensionPointType);
                 if (extensionPointDeclaration != null) {
                     extensionPoint = newInstance(this, extensionPointDeclaration);
                     // Cache the loaded extension point