Refactor the deployment-related code from NodeFactoryImpl into a Deployer utility

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

1 files changed, 3 insertions, 1 deletions

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 3a698eeb4b..42481c7e8e 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
@@ -26,6 +26,7 @@ import java.util.Hashtable;
 import java.util.logging.Level;
 
 import org.apache.tuscany.sca.core.ExtensionPointRegistry;
+import org.apache.tuscany.sca.core.FactoryExtensionPoint;
 import org.apache.tuscany.sca.extensibility.equinox.OSGiExtensionPointRegistry;
 import org.apache.tuscany.sca.node.configuration.NodeConfiguration;
 import org.apache.tuscany.sca.node.configuration.NodeConfigurationFactory;
@@ -56,6 +57,7 @@ public class OSGiNodeFactoryImpl extends NodeFactoryImpl {
         init();
 
         // Create a node configuration
+        FactoryExtensionPoint modelFactories = registry.getExtensionPoint(FactoryExtensionPoint.class);
         NodeConfigurationFactory configurationFactory = modelFactories.getFactory(NodeConfigurationFactory.class);
         NodeConfiguration configuration = configurationFactory.createNodeConfiguration();
 
@@ -86,7 +88,7 @@ public class OSGiNodeFactoryImpl extends NodeFactoryImpl {
             // Register the ExtensionPointRegistry as an OSGi service
             Dictionary<Object, Object> props = new Hashtable<Object, Object>();
             registration =
-                bundleContext.registerService(ExtensionPointRegistry.class.getName(), extensionPoints, props);
+                bundleContext.registerService(ExtensionPointRegistry.class.getName(), registry, props);
         }
     }