Move all use of NodeFactory out of section10 class and associated code cleanup

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

1 files changed, 23 insertions, 18 deletions

diff --git a/sca-java-2.x/contrib/modules/section10/src/main/java/org/apache/tuscany/sca/something/impl/Section10Impl.java b/sca-java-2.x/contrib/modules/section10/src/main/java/org/apache/tuscany/sca/something/impl/Section10Impl.java
index aa12fe8716..183591e9bf 100644
--- a/sca-java-2.x/contrib/modules/section10/src/main/java/org/apache/tuscany/sca/something/impl/Section10Impl.java
+++ b/sca-java-2.x/contrib/modules/section10/src/main/java/org/apache/tuscany/sca/something/impl/Section10Impl.java
@@ -27,7 +27,6 @@ import java.util.HashMap;
 import java.util.HashSet;

 import java.util.List;

 import java.util.Map;

-import java.util.Properties;

 import java.util.Set;

 

 import javax.xml.namespace.QName;

@@ -38,13 +37,13 @@ import org.apache.tuscany.sca.common.java.io.IOHelper;
 import org.apache.tuscany.sca.contribution.Artifact;

 import org.apache.tuscany.sca.contribution.Contribution;

 import org.apache.tuscany.sca.contribution.processor.ContributionReadException;

-import org.apache.tuscany.sca.core.UtilityExtensionPoint;

+import org.apache.tuscany.sca.core.ExtensionPointRegistry;

 import org.apache.tuscany.sca.deployment.Deployer;

 import org.apache.tuscany.sca.monitor.Monitor;

 import org.apache.tuscany.sca.monitor.MonitorFactory;

-import org.apache.tuscany.sca.node.NodeFactory;

-import org.apache.tuscany.sca.node.impl.NodeFactoryImpl;

 import org.apache.tuscany.sca.runtime.ActivationException;

+import org.apache.tuscany.sca.runtime.CompositeActivator;

+import org.apache.tuscany.sca.runtime.EndpointRegistry;

 import org.apache.tuscany.sca.something.Section10;

 import org.oasisopen.sca.NoSuchDomainException;

 import org.oasisopen.sca.NoSuchServiceException;

@@ -52,16 +51,21 @@ import org.oasisopen.sca.client.SCAClientFactory;
 

 public class Section10Impl implements Section10 {

 

-    protected NodeFactoryImpl nodeFactory;

-    protected Deployer deployer;

-    protected Map<String, InstalledContribution> installedContributions = new HashMap<String, InstalledContribution>();

-    protected MonitorFactory monitorFactory;

+    private String domainName;

+    private Deployer deployer;

+    private Map<String, InstalledContribution> installedContributions = new HashMap<String, InstalledContribution>();

+    private MonitorFactory monitorFactory;

+    private CompositeActivator compositeActivator;

+    private EndpointRegistry endpointRegistry;

+    private ExtensionPointRegistry extensionPointRegistry;

     

-    public Section10Impl(Properties config) {

-        this.nodeFactory = (NodeFactoryImpl)NodeFactory.newInstance(config);

-        ((NodeFactoryImpl)nodeFactory).start();

-        this.deployer = nodeFactory.getDeployer();

-        this.monitorFactory = nodeFactory.getExtensionPointRegistry().getExtensionPoint(UtilityExtensionPoint.class).getUtility(MonitorFactory.class);

+    public Section10Impl(String domainName, Deployer deployer, MonitorFactory monitorFactory, CompositeActivator compositeActivator, EndpointRegistry endpointRegistry, ExtensionPointRegistry extensionPointRegistry) {

+        this.domainName = domainName;

+        this.deployer = deployer;

+        this.monitorFactory = monitorFactory;

+        this.compositeActivator = compositeActivator;

+        this.endpointRegistry = endpointRegistry;

+        this.extensionPointRegistry = extensionPointRegistry;

     }

 

     public String installContribution(String contributionURL) throws ContributionReadException, ActivationException {

@@ -183,8 +187,10 @@ public class Section10Impl implements Section10 {
         return null;

     }

 

-    public void shutdown() {

-        nodeFactory.destroy();

+    public void shutdown() throws ActivationException {

+        for (String uri : installedContributions.keySet()) {

+            removeContribution(uri);

+        }

     }

 

     public <T> T getService(Class<T> interfaze, String serviceURI) throws NoSuchServiceException {

@@ -197,8 +203,7 @@ public class Section10Impl implements Section10 {
     }

    

     public String getDomainName() {

-        // TODO Auto-generated method stub

-        return "default";

+        return domainName;

     }

 

     public List<String> getDeployedCompostes(String contributionURI) {

@@ -235,7 +240,7 @@ public class Section10Impl implements Section10 {
             dependentContributions.add(ics.getContribution());

         }

 

-        DeployedComposite dc = Helper.createDeployedComposite(c, ic, dependentContributions, getDomainName(), nodeFactory);

+        DeployedComposite dc = new DeployedComposite(c, ic, dependentContributions, deployer, compositeActivator, monitorFactory, endpointRegistry, extensionPointRegistry);

         ic.getDeployedComposites().add(dc);

     }