From 994c753d4c4f224e7b93fa8dc6ae807367317678 Mon Sep 17 00:00:00 2001
From: rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68>
Date: Tue, 19 Aug 2008 00:08:11 +0000
Subject: 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
---
 .../calculator/src/main/java/calculator/CalculatorClient.java     | 8 ++++----
 .../calculator/src/test/java/calculator/CalculatorTestCase.java   | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'java/sca/samples/calculator/src')

diff --git a/java/sca/samples/calculator/src/main/java/calculator/CalculatorClient.java b/java/sca/samples/calculator/src/main/java/calculator/CalculatorClient.java
index 6dc2cbbe6f..3b2966e96d 100644
--- a/java/sca/samples/calculator/src/main/java/calculator/CalculatorClient.java
+++ b/java/sca/samples/calculator/src/main/java/calculator/CalculatorClient.java
@@ -20,8 +20,8 @@
 package calculator;
 
 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;
 
 /**
  * This client program shows how to create an SCA runtime, start it,
@@ -30,8 +30,8 @@ import org.apache.tuscany.sca.node.SCANode2Factory;
 public class CalculatorClient {
     public static void main(String[] args) throws Exception {
 
-        SCANode2Factory factory = SCANode2Factory.newInstance();
-        SCANode2 node = factory.createSCANodeFromClassLoader("Calculator.composite", CalculatorClient.class.getClassLoader());
+        SCANodeFactory factory = SCANodeFactory.newInstance();
+        SCANode node = factory.createSCANodeFromClassLoader("Calculator.composite", CalculatorClient.class.getClassLoader());
         node.start();
         
         CalculatorService calculatorService = ((SCAClient)node).getService(CalculatorService.class, "CalculatorServiceComponent");
diff --git a/java/sca/samples/calculator/src/test/java/calculator/CalculatorTestCase.java b/java/sca/samples/calculator/src/test/java/calculator/CalculatorTestCase.java
index a723af10c6..1b7476534a 100644
--- a/java/sca/samples/calculator/src/test/java/calculator/CalculatorTestCase.java
+++ b/java/sca/samples/calculator/src/test/java/calculator/CalculatorTestCase.java
@@ -21,8 +21,8 @@ package calculator;
 import junit.framework.TestCase;
 
 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;
 
 /**
  * This shows how to test the Calculator service component.
@@ -30,11 +30,11 @@ import org.apache.tuscany.sca.node.SCANode2Factory;
 public class CalculatorTestCase extends TestCase {
 
     private CalculatorService calculatorService;
-    private SCANode2 node;
+    private SCANode node;
 
     @Override
     protected void setUp() throws Exception {
-        SCANode2Factory factory = SCANode2Factory.newInstance();
+        SCANodeFactory factory = SCANodeFactory.newInstance();
         node = factory.createSCANodeFromClassLoader("Calculator.composite", getClass().getClassLoader());
         node.start();
         
-- 
cgit v1.2.3