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

6 files changed, 14 insertions, 14 deletions

diff --git a/java/sca/tutorials/store/catalog-webapp/pom.xml b/java/sca/tutorials/store/catalog-webapp/pom.xml
index 49319381ac..80a8861a99 100644
--- a/java/sca/tutorials/store/catalog-webapp/pom.xml
+++ b/java/sca/tutorials/store/catalog-webapp/pom.xml
@@ -46,7 +46,7 @@
 

         <dependency>

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

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

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

             <version>1.4-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

@@ -59,7 +59,7 @@
         

         <dependency>

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

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

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

             <version>1.4-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

diff --git a/java/sca/tutorials/store/domain/pom.xml b/java/sca/tutorials/store/domain/pom.xml
index 41ab070a0c..be3c8c38c9 100644
--- a/java/sca/tutorials/store/domain/pom.xml
+++ b/java/sca/tutorials/store/domain/pom.xml
@@ -38,7 +38,7 @@
     <dependencies>
         <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/tutorials/store/store-client/launch/LaunchStoreClientNode.java b/java/sca/tutorials/store/store-client/launch/LaunchStoreClientNode.java
index 8dd1429890..d1a9dfb36c 100644
--- a/java/sca/tutorials/store/store-client/launch/LaunchStoreClientNode.java
+++ b/java/sca/tutorials/store/store-client/launch/LaunchStoreClientNode.java
@@ -20,7 +20,7 @@
 package launch;
 
 import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCANode2;
+import org.apache.tuscany.sca.node.SCANode;
 import org.apache.tuscany.sca.node.launcher.NodeLauncher;
 
 import client.Shopper;
@@ -29,7 +29,7 @@ public class LaunchStoreClientNode {
 
     public static void main(String[] args) throws Exception {
         NodeLauncher nodeLauncher = NodeLauncher.newInstance();
-        SCANode2 storeClientNode = nodeLauncher.createNodeFromURL("http://localhost:9990/node-config/StoreClientNode");
+        SCANode storeClientNode = nodeLauncher.createNodeFromURL("http://localhost:9990/node-config/StoreClientNode");
         storeClientNode.start();
         SCAClient client = (SCAClient)storeClientNode;
         
diff --git a/java/sca/tutorials/store/store-client/pom.xml b/java/sca/tutorials/store/store-client/pom.xml
index b7155ee8cd..bfcc1a912b 100644
--- a/java/sca/tutorials/store/store-client/pom.xml
+++ b/java/sca/tutorials/store/store-client/pom.xml
@@ -50,13 +50,13 @@
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node2-launcher</artifactId>
+            <artifactId>tuscany-node-launcher</artifactId>
             <version>1.4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node2-api</artifactId>
+            <artifactId>tuscany-node-api</artifactId>
             <version>1.4-SNAPSHOT</version>
         </dependency>
 
diff --git a/java/sca/tutorials/store/store-test/pom.xml b/java/sca/tutorials/store/store-test/pom.xml
index 057d3713d8..7eb320a804 100644
--- a/java/sca/tutorials/store/store-test/pom.xml
+++ b/java/sca/tutorials/store/store-test/pom.xml
@@ -50,13 +50,13 @@
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node2-launcher</artifactId>
+            <artifactId>tuscany-node-launcher</artifactId>
             <version>1.4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node2-api</artifactId>
+            <artifactId>tuscany-node-api</artifactId>
             <version>1.4-SNAPSHOT</version>
         </dependency>
 
diff --git a/java/sca/tutorials/store/store-test/test/StoreSupplierTestCase.java b/java/sca/tutorials/store/store-test/test/StoreSupplierTestCase.java
index 26d3d49b78..5efec4ee2c 100644
--- a/java/sca/tutorials/store/store-test/test/StoreSupplierTestCase.java
+++ b/java/sca/tutorials/store/store-test/test/StoreSupplierTestCase.java
@@ -23,7 +23,7 @@ import junit.framework.Assert;
 import junit.framework.TestCase;
 
 import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCANode2;
+import org.apache.tuscany.sca.node.SCANode;
 import org.apache.tuscany.sca.node.launcher.DomainManagerLauncher;
 import org.apache.tuscany.sca.node.launcher.NodeLauncher;
 import org.junit.After;
@@ -40,10 +40,10 @@ import client.Shopper;
  */
 public class StoreSupplierTestCase {
     
-    private SCANode2 domainManager;
-    private SCANode2 storeSupplierNode;
-    private SCANode2 storeCatalogsNode;
-    private SCANode2 storeClientNode;
+    private SCANode domainManager;
+    private SCANode storeSupplierNode;
+    private SCANode storeCatalogsNode;
+    private SCANode storeClientNode;
 
     @Before
     public void setup() throws Exception {