Start cleaning up JavaDoc and changes coming to light while doing that: move getDeployer and getAssemblyFactory from Node to NodeFactory, change getInstalledContribution to return an assembly Contribution instead of an InstalledContribution, rename deployDeployables to runDeployables

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

1 files changed, 19 insertions, 1 deletions

diff --git a/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/node2/NodeFactory.java b/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/node2/NodeFactory.java
index 36f49416f1..13ede41b1d 100644
--- a/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/node2/NodeFactory.java
+++ b/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/node2/NodeFactory.java
@@ -42,6 +42,7 @@ public class NodeFactory {
     private ExtensionPointRegistry extensionPointRegistry;
     private CompositeActivator compositeActivator;
     private ExtensibleDomainRegistryFactory domainRegistryFactory;
+    private RuntimeAssemblyFactory assemblyFactory;
 
     // TODO: keep this method?
     public static Node createNode() {
@@ -76,7 +77,7 @@ public class NodeFactory {
         extensionPointRegistry.start();
 
         FactoryExtensionPoint modelFactories = extensionPointRegistry.getExtensionPoint(FactoryExtensionPoint.class);
-        AssemblyFactory assemblyFactory = new RuntimeAssemblyFactory(extensionPointRegistry);
+        this.assemblyFactory = new RuntimeAssemblyFactory(extensionPointRegistry);
         modelFactories.addFactory(assemblyFactory);
 
         UtilityExtensionPoint utilities = extensionPointRegistry.getExtensionPoint(UtilityExtensionPoint.class);
@@ -94,4 +95,21 @@ public class NodeFactory {
 //        domainRegistryFactory.getEndpointRegistry(config.getProperty("reguri"), config.getProperty("defaultDomainName"));
 
     }
+    /**
+     * Get the Deployer. The Deployer can be used to create contribution artifacts 
+     * when configuring a Node programatically.
+     * @return the Deployer
+     */
+    public Deployer getDeployer() {
+        return deployer;
+    }
+    
+    /**
+     * Get the AssemblyFactory. The AssemblyFactory can be used to create contribution
+     * artifact contents when configuring a Node programatically.
+     * @return the AssemblyFactory
+     */
+    public AssemblyFactory getAssemblyFactory() {
+        return assemblyFactory;
+    }
 }