Port to SCANodeFactory/SCANode

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

9 files changed, 28 insertions, 28 deletions

diff --git a/java/sca/samples/simple-bigbank-spring/pom.xml b/java/sca/samples/simple-bigbank-spring/pom.xml
index 75030ba81b..9e5dc673b9 100644
--- a/java/sca/samples/simple-bigbank-spring/pom.xml
+++ b/java/sca/samples/simple-bigbank-spring/pom.xml
@@ -38,13 +38,13 @@
     <dependencies>
         <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-impl</artifactId>
+            <artifactId>tuscany-node-impl</artifactId>
             <version>1.4-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
diff --git a/java/sca/samples/simple-bigbank-spring/src/main/java/bigbank/client/BigBankClient.java b/java/sca/samples/simple-bigbank-spring/src/main/java/bigbank/client/BigBankClient.java
index 1ad5a3f7b3..f7b940f873 100644
--- a/java/sca/samples/simple-bigbank-spring/src/main/java/bigbank/client/BigBankClient.java
+++ b/java/sca/samples/simple-bigbank-spring/src/main/java/bigbank/client/BigBankClient.java
@@ -20,8 +20,8 @@
 package bigbank.client;
 
 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 bigbank.account.AccountService;
 
@@ -32,8 +32,8 @@ import bigbank.account.AccountService;
 public class BigBankClient {
     public static void main(String[] args) throws Exception {
 
-        SCANode2Factory factory = SCANode2Factory.newInstance();
-        SCANode2 node = factory.createSCANodeFromClassLoader("BigBank.composite", BigBankClient.class.getClassLoader());
+        SCANodeFactory factory = SCANodeFactory.newInstance();
+        SCANode node = factory.createSCANodeFromClassLoader("BigBank.composite", BigBankClient.class.getClassLoader());
         node.start();
         
         AccountService accountService = ((SCAClient)node).getService(AccountService.class, "AccountServiceComponent");
diff --git a/java/sca/samples/simple-bigbank-spring/src/main/java/bigbank/server/BigBankServer.java b/java/sca/samples/simple-bigbank-spring/src/main/java/bigbank/server/BigBankServer.java
index cb86b9162d..241347e417 100644
--- a/java/sca/samples/simple-bigbank-spring/src/main/java/bigbank/server/BigBankServer.java
+++ b/java/sca/samples/simple-bigbank-spring/src/main/java/bigbank/server/BigBankServer.java
@@ -19,8 +19,8 @@
 
 package bigbank.server;
 
-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;
 
 /**
  * This client program shows how to create an SCA runtime, start it,
@@ -36,8 +36,8 @@ public class BigBankServer {
         
         System.out.println("Starting the Sample SCA Spring BigBank server...");
                 
-        SCANode2Factory factory = SCANode2Factory.newInstance();
-        SCANode2 node = factory.createSCANodeFromClassLoader("BigBank.composite", BigBankServer.class.getClassLoader());
+        SCANodeFactory factory = SCANodeFactory.newInstance();
+        SCANode node = factory.createSCANodeFromClassLoader("BigBank.composite", BigBankServer.class.getClassLoader());
         node.start();
 
         if (timeout < 0) {
diff --git a/java/sca/samples/spring-bigbank-calculator/pom.xml b/java/sca/samples/spring-bigbank-calculator/pom.xml
index 95fb9cf18e..45117a03de 100644
--- a/java/sca/samples/spring-bigbank-calculator/pom.xml
+++ b/java/sca/samples/spring-bigbank-calculator/pom.xml
@@ -38,13 +38,13 @@
     <dependencies>    
         <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-impl</artifactId>
+            <artifactId>tuscany-node-impl</artifactId>
             <version>1.4-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
diff --git a/java/sca/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/server/CalculatorServer.java b/java/sca/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/server/CalculatorServer.java
index 87f46ad40f..b0737899dc 100644
--- a/java/sca/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/server/CalculatorServer.java
+++ b/java/sca/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/server/CalculatorServer.java
@@ -19,8 +19,8 @@
 
 package bigbank.calculator.server;
 
-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;
 
 public class CalculatorServer {
 
@@ -28,8 +28,8 @@ public class CalculatorServer {
 
         System.out.println("Starting the Sample SCA Calculator...");
 
-        SCANode2Factory factory = SCANode2Factory.newInstance();
-        SCANode2 node = factory.createSCANodeFromClassLoader("Calculator.composite", CalculatorServer.class.getClassLoader());
+        SCANodeFactory factory = SCANodeFactory.newInstance();
+        SCANode node = factory.createSCANodeFromClassLoader("Calculator.composite", CalculatorServer.class.getClassLoader());
         node.start();
 
         System.out.println("Press Enter to Exit...");
diff --git a/java/sca/samples/spring-bigbank-checkaccount/pom.xml b/java/sca/samples/spring-bigbank-checkaccount/pom.xml
index 8194879380..19321adbb6 100644
--- a/java/sca/samples/spring-bigbank-checkaccount/pom.xml
+++ b/java/sca/samples/spring-bigbank-checkaccount/pom.xml
@@ -38,13 +38,13 @@
     <dependencies>     
         <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-impl</artifactId>
+            <artifactId>tuscany-node-impl</artifactId>
             <version>1.4-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
diff --git a/java/sca/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/checking/server/CheckingAccountServer.java b/java/sca/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/checking/server/CheckingAccountServer.java
index a3330528a8..2e367cf32b 100644
--- a/java/sca/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/checking/server/CheckingAccountServer.java
+++ b/java/sca/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/checking/server/CheckingAccountServer.java
@@ -21,8 +21,8 @@ package bigbank.account.checking.server;
 import java.io.IOException;
 
 import org.apache.activemq.broker.BrokerService;
-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;
 
 /**
  * This server program shows how to create an SCA runtime, and start it which
@@ -39,8 +39,8 @@ public class CheckingAccountServer {
             jmsBroker.addConnector("tcp://localhost:61619");
             jmsBroker.start();
             
-            SCANode2Factory factory = SCANode2Factory.newInstance();
-            SCANode2 node = factory.createSCANodeFromClassLoader("CheckingsAccount.composite", CheckingAccountServer.class.getClassLoader());
+            SCANodeFactory factory = SCANodeFactory.newInstance();
+            SCANode node = factory.createSCANodeFromClassLoader("CheckingsAccount.composite", CheckingAccountServer.class.getClassLoader());
             node.start();
 
             System.out.println("CheckingsAccount server started (press enter to shutdown)");
diff --git a/java/sca/samples/spring-bigbank-stockquote/pom.xml b/java/sca/samples/spring-bigbank-stockquote/pom.xml
index 64d74a947c..f4bc9ab98d 100644
--- a/java/sca/samples/spring-bigbank-stockquote/pom.xml
+++ b/java/sca/samples/spring-bigbank-stockquote/pom.xml
@@ -38,13 +38,13 @@
     <dependencies>
         <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-impl</artifactId>
+            <artifactId>tuscany-node-impl</artifactId>
             <version>1.4-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
diff --git a/java/sca/samples/spring-bigbank-stockquote/src/main/java/bigbank/stockquote/server/StockQuoteServer.java b/java/sca/samples/spring-bigbank-stockquote/src/main/java/bigbank/stockquote/server/StockQuoteServer.java
index 97ba202b49..41ea8d35c8 100644
--- a/java/sca/samples/spring-bigbank-stockquote/src/main/java/bigbank/stockquote/server/StockQuoteServer.java
+++ b/java/sca/samples/spring-bigbank-stockquote/src/main/java/bigbank/stockquote/server/StockQuoteServer.java
@@ -18,8 +18,8 @@
  */
 package bigbank.stockquote.server;
 
-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;
 
 /**
  * This server program shows how to bootstrap SCA from a simple J2SE program
@@ -31,8 +31,8 @@ public class StockQuoteServer {
 
         System.out.println("Starting the Sample SCA StockQuote Service...");
 
-        SCANode2Factory factory = SCANode2Factory.newInstance();
-        SCANode2 node = factory.createSCANodeFromClassLoader("StockQuote.composite", StockQuoteServer.class.getClassLoader());
+        SCANodeFactory factory = SCANodeFactory.newInstance();
+        SCANode node = factory.createSCANodeFromClassLoader("StockQuote.composite", StockQuoteServer.class.getClassLoader());
         node.start();
 
         System.out.println("Press Enter to Exit...");