Refactor the default node config factory so that it doesn't require the import for NodeConfigurationFactoryImpl

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

3 files changed, 21 insertions, 2 deletions

diff --git a/java/sca/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/DefaultNodeConfigurationFactory.java b/java/sca/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/DefaultNodeConfigurationFactory.java
index 53e26fc9ad..8bc4b7d493 100644
--- a/java/sca/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/DefaultNodeConfigurationFactory.java
+++ b/java/sca/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/DefaultNodeConfigurationFactory.java
@@ -24,5 +24,23 @@ import org.apache.tuscany.sca.node.configuration.impl.NodeConfigurationFactoryIm
 /**

  * Default NodeConfigurationFactory

  */

-public class DefaultNodeConfigurationFactory extends NodeConfigurationFactoryImpl implements NodeConfigurationFactory {

+public class DefaultNodeConfigurationFactory implements NodeConfigurationFactory {

+    private NodeConfigurationFactory factory = new NodeConfigurationFactoryImpl();

+

+    public BindingConfiguration createBindingConfiguration() {

+        return factory.createBindingConfiguration();

+    }

+

+    public ContributionConfiguration createContributionConfiguration() {

+        return factory.createContributionConfiguration();

+    }

+

+    public DeploymentComposite createDeploymentComposite() {

+        return factory.createDeploymentComposite();

+    }

+

+    public NodeConfiguration createNodeConfiguration() {

+        return factory.createNodeConfiguration();

+    }

+

 }

diff --git a/java/sca/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/impl/NodeConfigurationFactoryImpl.java b/java/sca/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/impl/NodeConfigurationFactoryImpl.java
index fe5e9012cf..9396adc87d 100644
--- a/java/sca/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/impl/NodeConfigurationFactoryImpl.java
+++ b/java/sca/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/impl/NodeConfigurationFactoryImpl.java
@@ -28,7 +28,7 @@ import org.apache.tuscany.sca.node.configuration.NodeConfigurationFactory;
 /**

  * The factory to create java models related to the node configuration

  */

-public abstract class NodeConfigurationFactoryImpl implements NodeConfigurationFactory {

+public class NodeConfigurationFactoryImpl implements NodeConfigurationFactory {

     /**

      * Create a new instance of NodeConfiguration

      * @return

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 9ef9fb5a07..bd861302cf 100644
--- a/java/sca/modules/node-impl-osgi/META-INF/MANIFEST.MF
+++ b/java/sca/modules/node-impl-osgi/META-INF/MANIFEST.MF
@@ -41,3 +41,4 @@ Import-Package: javax.xml.namespace,
 Bundle-SymbolicName: org.apache.tuscany.sca.node.osgi.impl

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

 Bundle-RequiredExecutionEnvironment: J2SE-1.5,JavaSE-1.6
+Bundle-ActivationPolicy: lazy