Add SCANodeFactory/SCANode and rename the artifact ids from node2-xxx to node-xxx

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

2 files changed, 6 insertions, 6 deletions

diff --git a/java/sca/itest/domain/pom.xml b/java/sca/itest/domain/pom.xml
index 964e723f9e..930bcda79d 100644
--- a/java/sca/itest/domain/pom.xml
+++ b/java/sca/itest/domain/pom.xml
@@ -32,13 +32,13 @@
             

         <dependency>

             <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-node2-api</artifactId>

+            <artifactId>tuscany-node-api</artifactId>

             <version>1.4-SNAPSHOT</version>

         </dependency>    

         

         <dependency>

             <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-node2-launcher</artifactId>

+            <artifactId>tuscany-node-launcher</artifactId>

             <version>1.4-SNAPSHOT</version>

         </dependency>    

         

diff --git a/java/sca/itest/domain/src/test/java/org/apache/tuscany/sca/itest/domain/ContributionSPIsTestCase.java b/java/sca/itest/domain/src/test/java/org/apache/tuscany/sca/itest/domain/ContributionSPIsTestCase.java
index 7761b0bf69..98f13df774 100644
--- a/java/sca/itest/domain/src/test/java/org/apache/tuscany/sca/itest/domain/ContributionSPIsTestCase.java
+++ b/java/sca/itest/domain/src/test/java/org/apache/tuscany/sca/itest/domain/ContributionSPIsTestCase.java
@@ -50,8 +50,8 @@ import org.apache.tuscany.sca.monitor.Monitor;
 import org.apache.tuscany.sca.monitor.MonitorFactory;
 import org.apache.tuscany.sca.node.SCAClient;
 import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode2;
-import org.apache.tuscany.sca.node.SCANode2Factory;
+import org.apache.tuscany.sca.node.SCANode;
+import org.apache.tuscany.sca.node.SCANodeFactory;
 import org.apache.tuscany.sca.workspace.Workspace;
 import org.apache.tuscany.sca.workspace.WorkspaceFactory;
 import org.apache.tuscany.sca.workspace.builder.ContributionDependencyBuilder;
@@ -219,9 +219,9 @@ public class ContributionSPIsTestCase {
                 contributions[i] = new SCAContribution(contributionsToDeploy.get(i).getURI(), contributionsToDeploy.get(i).getLocation()); 
             }
                    
-            SCANode2Factory nodeFactory = SCANode2Factory.newInstance();
+            SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
             
-            SCANode2 node = nodeFactory.createSCANode(chosenDeployableLocation, contributions);
+            SCANode node = nodeFactory.createSCANode(chosenDeployableLocation, contributions);
             
             node.start();
             SCAClient client = (SCAClient)node;