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, 8 insertions, 8 deletions

diff --git a/java/sca/itest/late-reference-resolution/pom.xml b/java/sca/itest/late-reference-resolution/pom.xml
index f73cc8a69b..f30931f309 100644
--- a/java/sca/itest/late-reference-resolution/pom.xml
+++ b/java/sca/itest/late-reference-resolution/pom.xml
@@ -39,13 +39,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/late-reference-resolution/src/test/java/calculator/LateReferenceResolutionTestCase.java b/java/sca/itest/late-reference-resolution/src/test/java/calculator/LateReferenceResolutionTestCase.java
index d3fe027e60..ebe834028d 100644
--- a/java/sca/itest/late-reference-resolution/src/test/java/calculator/LateReferenceResolutionTestCase.java
+++ b/java/sca/itest/late-reference-resolution/src/test/java/calculator/LateReferenceResolutionTestCase.java
@@ -25,8 +25,8 @@ import junit.framework.Assert;
 
 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.node.launcher.DomainManagerLauncher;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
@@ -38,9 +38,9 @@ import org.junit.Test;
  */
 public class LateReferenceResolutionTestCase {
 
-    private static SCANode2 nodeA;
-    private static SCANode2 nodeB;
-    private static SCANode2 nodeC;
+    private static SCANode nodeA;
+    private static SCANode nodeB;
+    private static SCANode nodeC;
 
     private static CalculatorService calculatorService;
     
@@ -53,7 +53,7 @@ public class LateReferenceResolutionTestCase {
             System.out.println("Setting up domain");
 
             
-            SCANode2Factory nodeFactory = SCANode2Factory.newInstance();
+            SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
             nodeC = nodeFactory.createSCANode(new File("src/main/resources/nodeC/Calculator.composite").toURL().toString(),
                 new SCAContribution("NodeC", 
                                     new File("src/main/resources/nodeC").toURL().toString()));