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
---
 java/sca/vtest/java-api/annotations/init/pom.xml   |  2 +-
 .../annotations/init/InitAnnotationTestCase.java   | 24 +++++++++++-----------
 2 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'java/sca/vtest/java-api/annotations/init')

diff --git a/java/sca/vtest/java-api/annotations/init/pom.xml b/java/sca/vtest/java-api/annotations/init/pom.xml
index 68e6052b04..b2393947f8 100644
--- a/java/sca/vtest/java-api/annotations/init/pom.xml
+++ b/java/sca/vtest/java-api/annotations/init/pom.xml
@@ -32,7 +32,7 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node2-impl</artifactId>
+            <artifactId>tuscany-node-impl</artifactId>
             <version>1.4-SNAPSHOT</version>
         </dependency>
         <dependency>
diff --git a/java/sca/vtest/java-api/annotations/init/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/InitAnnotationTestCase.java b/java/sca/vtest/java-api/annotations/init/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/InitAnnotationTestCase.java
index 65ccc9838d..0dbccd8611 100644
--- a/java/sca/vtest/java-api/annotations/init/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/InitAnnotationTestCase.java
+++ b/java/sca/vtest/java-api/annotations/init/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/InitAnnotationTestCase.java
@@ -25,8 +25,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.Test;
 import org.osoa.sca.ServiceRuntimeException;
 
@@ -50,8 +50,8 @@ public class InitAnnotationTestCase {
      */
     @Test
     public void atInitProper() throws Exception {
-        SCANode2Factory nodeFactory = SCANode2Factory.newInstance();
-        SCANode2 node = nodeFactory.createSCANode(new File("src/main/resources/proper/AService.composite").toURL().toString(),
+        SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
+        SCANode node = nodeFactory.createSCANode(new File("src/main/resources/proper/AService.composite").toURL().toString(),
                 new SCAContribution("TestContribution", 
                                     new File("src/main/resources/proper").toURL().toString()));
         node.start();
@@ -74,9 +74,9 @@ public class InitAnnotationTestCase {
      */
     @Test
     public void atInitProtectedMethod() throws Exception {
-        SCANode2Factory nodeFactory = SCANode2Factory.newInstance();
+        SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
         try {
-            SCANode2 node = nodeFactory.createSCANode(new File("src/main/resources/err1/AServiceErr1.composite").toURL().toString(),
+            SCANode node = nodeFactory.createSCANode(new File("src/main/resources/err1/AServiceErr1.composite").toURL().toString(),
                     new SCAContribution("TestContribution", 
                                         new File("src/main/resources/err1").toURL().toString()));
             Assert.fail();
@@ -100,9 +100,9 @@ public class InitAnnotationTestCase {
      */
     @Test
     public void atInitPrivateMethod() throws Exception {
-        SCANode2Factory nodeFactory = SCANode2Factory.newInstance();
+        SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
         try {
-            SCANode2 node = nodeFactory.createSCANode(new File("src/main/resources/err2/AServiceErr2.composite").toURL().toString(),
+            SCANode node = nodeFactory.createSCANode(new File("src/main/resources/err2/AServiceErr2.composite").toURL().toString(),
                     new SCAContribution("TestContribution", 
                                         new File("src/main/resources/err2").toURL().toString()));
             Assert.fail();
@@ -126,9 +126,9 @@ public class InitAnnotationTestCase {
      */
     @Test
     public void atInitNonVoidReturnType() throws Exception {
-        SCANode2Factory nodeFactory = SCANode2Factory.newInstance();
+        SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
         try {
-            SCANode2 node = nodeFactory.createSCANode(new File("src/main/resources/err3/HelloWorldErr3.composite").toURL().toString(),
+            SCANode node = nodeFactory.createSCANode(new File("src/main/resources/err3/HelloWorldErr3.composite").toURL().toString(),
                     new SCAContribution("TestContribution", 
                                         new File("src/main/resources/err3").toURL().toString()));
             Assert.fail();
@@ -152,9 +152,9 @@ public class InitAnnotationTestCase {
      */
     @Test
     public void atInitMethodWithArgs() throws Exception {
-        SCANode2Factory nodeFactory = SCANode2Factory.newInstance();
+        SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
         try {
-            SCANode2 node = nodeFactory.createSCANode(new File("src/main/resources/err4/HelloWorldErr4.composite").toURL().toString(),
+            SCANode node = nodeFactory.createSCANode(new File("src/main/resources/err4/HelloWorldErr4.composite").toURL().toString(),
                     new SCAContribution("TestContribution", 
                                         new File("src/main/resources/err4").toURL().toString()));
             Assert.fail();
-- 
cgit v1.2.3