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/callablereferences/pom.xml b/java/sca/itest/callablereferences/pom.xml
index f9deb7b230..5fbf05c6e7 100644
--- a/java/sca/itest/callablereferences/pom.xml
+++ b/java/sca/itest/callablereferences/pom.xml
@@ -45,7 +45,7 @@
 <!-- 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node2-impl</artifactId>
+            <artifactId>tuscany-node-impl</artifactId>
             <version>1.4-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>   
diff --git a/java/sca/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceRemoteTestCase.java b/java/sca/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceRemoteTestCase.java
index 053047f42f..ba9020811c 100644
--- a/java/sca/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceRemoteTestCase.java
+++ b/java/sca/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceRemoteTestCase.java
@@ -27,8 +27,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.junit.AfterClass;

 import org.junit.BeforeClass;

 import org.junit.Test;

@@ -40,8 +40,8 @@ import org.junit.Test;
  */

 public class CallableReferenceRemoteTestCase {

     

-    private static SCANode2 nodeA;

-    private static SCANode2 nodeB;

+    private static SCANode nodeA;

+    private static SCANode nodeB;

    

     private static AComponent acomponent;

 

@@ -52,7 +52,7 @@ public class CallableReferenceRemoteTestCase {
             

             System.out.println("Setting up nodes");

                   

-            SCANode2Factory nodeFactory = SCANode2Factory.newInstance();

+            SCANodeFactory nodeFactory = SCANodeFactory.newInstance();

             nodeA = nodeFactory.createSCANode(new File("src/main/resources/nodeA/CompositeA.composite").toURL().toString(),

                                              new SCAContribution("TestContribution", 

                                                                  new File("src/main/resources/nodeA").toURL().toString()));