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

diff --git a/java/sca/itest/oneway/pom.xml b/java/sca/itest/oneway/pom.xml
index 9260b63dce..ba61e1e0c0 100644
--- a/java/sca/itest/oneway/pom.xml
+++ b/java/sca/itest/oneway/pom.xml
@@ -44,7 +44,7 @@
         

         <dependency>

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

-            <artifactId>tuscany-node2-impl</artifactId>

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

             <version>1.4-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

diff --git a/java/sca/itest/oneway/src/test/java/org/apache/tuscany/sca/itest/oneway/OneWayTestCase.java b/java/sca/itest/oneway/src/test/java/org/apache/tuscany/sca/itest/oneway/OneWayTestCase.java
index b21042c06b..c490150ec5 100644
--- a/java/sca/itest/oneway/src/test/java/org/apache/tuscany/sca/itest/oneway/OneWayTestCase.java
+++ b/java/sca/itest/oneway/src/test/java/org/apache/tuscany/sca/itest/oneway/OneWayTestCase.java
@@ -31,8 +31,8 @@ import org.apache.tuscany.sca.core.invocation.NonBlockingInterceptor;
 import org.apache.tuscany.sca.itest.oneway.impl.OneWayClientImpl;

 import org.apache.tuscany.sca.itest.oneway.impl.OneWayServiceImpl;

 import org.apache.tuscany.sca.node.SCAClient;

-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.After;

 import org.junit.Before;

 import org.junit.Test;

@@ -49,7 +49,7 @@ public class OneWayTestCase {
      */

     private static final int MAX_SLEEP_TIME = 10000;

 

-    private SCANode2 node;

+    private SCANode node;

     

     /**

      * Initialise the SCADomain.

@@ -59,7 +59,7 @@ public class OneWayTestCase {
     @Before

     public void setUp() throws Exception {

         

-        SCANode2Factory nodeFactory = SCANode2Factory.newInstance();

+        SCANodeFactory nodeFactory = SCANodeFactory.newInstance();

         node = nodeFactory.createSCANodeFromClassLoader("OneWayContribution/META-INF/sca-deployables/oneWay.composite", null);

         node.start();