Refactoring a few methods on the ServiceDiscover

Adding an OSGi service registry based ExtensionPointRegistry implementation

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

3 files changed, 7 insertions, 1 deletions

diff --git a/java/sca/modules/node-impl-osgi/META-INF/MANIFEST.MF b/java/sca/modules/node-impl-osgi/META-INF/MANIFEST.MF
index e055ec9afe..9ef9fb5a07 100644
--- a/java/sca/modules/node-impl-osgi/META-INF/MANIFEST.MF
+++ b/java/sca/modules/node-impl-osgi/META-INF/MANIFEST.MF
@@ -21,6 +21,7 @@ Import-Package: javax.xml.namespace,
  org.apache.tuscany.sca.definitions;version="2.0.0",

  org.apache.tuscany.sca.definitions.util;version="2.0.0",

  org.apache.tuscany.sca.definitions.xml;version="2.0.0",

+ org.apache.tuscany.sca.extensibility.equinox;version="2.0.0",

  org.apache.tuscany.sca.implementation.node;version="2.0.0",

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

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

diff --git a/java/sca/modules/node-impl-osgi/pom.xml b/java/sca/modules/node-impl-osgi/pom.xml
index 5e84c4c2bd..1987a833e1 100644
--- a/java/sca/modules/node-impl-osgi/pom.xml
+++ b/java/sca/modules/node-impl-osgi/pom.xml
@@ -74,7 +74,6 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-extensibility-equinox</artifactId>
             <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
         </dependency>
 
          <dependency>
diff --git a/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/OSGiNodeFactoryImpl.java b/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/OSGiNodeFactoryImpl.java
index 1a4befb3e3..4dfa7ace90 100644
--- a/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/OSGiNodeFactoryImpl.java
+++ b/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/OSGiNodeFactoryImpl.java
@@ -25,6 +25,7 @@ import java.util.Dictionary;
 import java.util.Hashtable;
 
 import org.apache.tuscany.sca.core.ExtensionPointRegistry;
+import org.apache.tuscany.sca.extensibility.equinox.OSGiExtensionPointRegistry;
 import org.apache.tuscany.sca.node.configuration.NodeConfiguration;
 import org.apache.tuscany.sca.node.configuration.NodeConfigurationFactory;
 import org.apache.tuscany.sca.node.impl.NodeFactoryImpl;
@@ -104,4 +105,9 @@ public class OSGiNodeFactoryImpl extends NodeFactoryImpl {
         return configuration.getExtensions().get(0);
     }
 
+    @Override
+    protected ExtensionPointRegistry createExtensionPointRegistry() {
+        return new OSGiExtensionPointRegistry(bundleContext);
+    }
+
 }