1 files changed, 12 insertions, 12 deletions
diff --git a/java/sca/vtest/java-api/annotations/destroy/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/DestroyAnnotationTestCase.java b/java/sca/vtest/java-api/annotations/destroy/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/DestroyAnnotationTestCase.java
index 1d10679a8c..f3b2f28200 100644
--- a/java/sca/vtest/java-api/annotations/destroy/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/DestroyAnnotationTestCase.java
+++ b/java/sca/vtest/java-api/annotations/destroy/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/DestroyAnnotationTestCase.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;
 
@@ -47,8 +47,8 @@ public class DestroyAnnotationTestCase {
      */
     @Test
     public void atDestroyProper() 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();
@@ -69,9 +69,9 @@ public class DestroyAnnotationTestCase {
      */
     @Test
     public void atDestroyProtectedMethod() 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();
@@ -94,9 +94,9 @@ public class DestroyAnnotationTestCase {
      */
     @Test
     public void atDestroyPrivateMethod() 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();
@@ -119,9 +119,9 @@ public class DestroyAnnotationTestCase {
      */
     @Test
     public void atDestroyNonVoidReturnType() throws Exception {
-        SCANode2Factory nodeFactory = SCANode2Factory.newInstance();
+        SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
         try {
-            SCANode2 node = nodeFactory.createSCANode(new File("src/main/resources/err3/AServiceErr3.composite").toURL().toString(),
+            SCANode node = nodeFactory.createSCANode(new File("src/main/resources/err3/AServiceErr3.composite").toURL().toString(),
                     new SCAContribution("TestContribution", 
                                         new File("src/main/resources/err3").toURL().toString()));
             Assert.fail();
@@ -144,9 +144,9 @@ public class DestroyAnnotationTestCase {
      */
     @Test
     public void atDestroyMethodWithArgs() throws Exception {
-        SCANode2Factory nodeFactory = SCANode2Factory.newInstance();
+        SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
         try {
-            SCANode2 node = nodeFactory.createSCANode(new File("src/main/resources/err4/AServiceErr4.composite").toURL().toString(),
+            SCANode node = nodeFactory.createSCANode(new File("src/main/resources/err4/AServiceErr4.composite").toURL().toString(),
                     new SCAContribution("TestContribution", 
                                         new File("src/main/resources/err4").toURL().toString()));
             Assert.fail();