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

8 files changed, 29 insertions, 29 deletions

diff --git a/java/sca/itest/conversations-ws/pom.xml b/java/sca/itest/conversations-ws/pom.xml
index a8b07c81bb..87827c86dd 100644
--- a/java/sca/itest/conversations-ws/pom.xml
+++ b/java/sca/itest/conversations-ws/pom.xml
@@ -33,7 +33,7 @@
         

         <dependency>

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

-            <artifactId>tuscany-node2-impl</artifactId>

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

             <version>1.4-SNAPSHOT</version>

         </dependency>        

         

diff --git a/java/sca/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationWSDLTestCase.java b/java/sca/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationWSDLTestCase.java
index d05e4712a1..9df966ebc2 100644
--- a/java/sca/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationWSDLTestCase.java
+++ b/java/sca/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationWSDLTestCase.java
@@ -26,8 +26,8 @@ import java.io.File;
 import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatelessImpl;

 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.After;

 import org.junit.Assert;

 import org.junit.Before;

@@ -35,12 +35,12 @@ import org.junit.Test;
 

 public class ConversationWSDLTestCase {

 

-    private SCANode2 node; 

+    private SCANode node; 

     private ConversationalClient conversationalStatelessClientStatefulService;    

 

     @Before

     public void setUp() throws Exception {

-        SCANode2Factory nodeFactory = SCANode2Factory.newInstance();

+        SCANodeFactory nodeFactory = SCANodeFactory.newInstance();

         node = nodeFactory.createSCANode(new File("src/main/resources/ConversationalWSDL/conversationalWSDL.composite").toURL().toString(),

                                          new SCAContribution("TestContribution", 

                                                                      new File("src/main/resources/ConversationalWSDL").toURL().toString()));

diff --git a/java/sca/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallbackTestCase.java b/java/sca/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallbackTestCase.java
index 7eec461476..ebd1e55dac 100644
--- a/java/sca/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallbackTestCase.java
+++ b/java/sca/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallbackTestCase.java
@@ -31,15 +31,15 @@ import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceSta
 import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatelessImpl;

 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.AfterClass;

 import org.junit.BeforeClass;

 import org.junit.Test;

 

 public class NonConversationalCallbackTestCase {

 

-    private static SCANode2 node;

+    private static SCANode node;

     private static ConversationalClient conversationalStatelessClientStatelessService;

     private static ConversationalClient conversationalStatelessClientStatefulService;

     private static ConversationalClient conversationalStatefulClientStatelessService;

@@ -50,7 +50,7 @@ public class NonConversationalCallbackTestCase {
     @BeforeClass

     public static void setUp() throws Exception {

     	try {

-            SCANode2Factory nodeFactory = SCANode2Factory.newInstance();

+            SCANodeFactory nodeFactory = SCANodeFactory.newInstance();

             node = nodeFactory.createSCANode(new File("src/main/resources/Conversational/conversational.composite").toURL().toString(),

                                              new SCAContribution("TestContribution", 

                                                                  new File("src/main/resources/Conversational").toURL().toString()));

diff --git a/java/sca/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/RequestScopeTestCase.java b/java/sca/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/RequestScopeTestCase.java
index 39ab4319f7..2c16145f54 100644
--- a/java/sca/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/RequestScopeTestCase.java
+++ b/java/sca/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/RequestScopeTestCase.java
@@ -32,15 +32,15 @@ import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceSta
 import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatelessImpl;

 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.AfterClass;

 import org.junit.BeforeClass;

 import org.junit.Test;

 

 public class RequestScopeTestCase {

 

-    private static SCANode2 node;

+    private static SCANode node;

     private static ConversationalClient conversationalStatelessClientStatelessService;

     private static ConversationalClient conversationalStatelessClientStatefulService;

     private static ConversationalClient conversationalStatefulClientStatelessService;

@@ -51,7 +51,7 @@ public class RequestScopeTestCase {
     @BeforeClass

     public static void setUp() throws Exception {

         try {

-            SCANode2Factory nodeFactory = SCANode2Factory.newInstance();

+            SCANodeFactory nodeFactory = SCANodeFactory.newInstance();

             node = nodeFactory.createSCANode(new File("src/main/resources/Conversational/conversational.composite").toURL().toString(),

                                              new SCAContribution("TestContribution", 

                                                                  new File("src/main/resources/Conversational").toURL().toString()));

diff --git a/java/sca/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatefulTestCase.java b/java/sca/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatefulTestCase.java
index 28df937283..4166e6acdf 100644
--- a/java/sca/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatefulTestCase.java
+++ b/java/sca/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatefulTestCase.java
@@ -31,15 +31,15 @@ import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceSta
 import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatelessImpl;

 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.AfterClass;

 import org.junit.BeforeClass;

 import org.junit.Test;

 

 public class StatefulStatefulTestCase {

 

-    private static SCANode2 node;

+    private static SCANode node;

     private static ConversationalClient conversationalStatelessClientStatelessService;

     private static ConversationalClient conversationalStatelessClientStatefulService;

     private static ConversationalClient conversationalStatefulClientStatelessService;

@@ -50,7 +50,7 @@ public class StatefulStatefulTestCase {
     @BeforeClass

     public static void setUp() throws Exception {

         try {

-            SCANode2Factory nodeFactory = SCANode2Factory.newInstance();

+            SCANodeFactory nodeFactory = SCANodeFactory.newInstance();

             node = nodeFactory.createSCANode(new File("src/main/resources/Conversational/conversational.composite").toURL().toString(),

                                              new SCAContribution("TestContribution", 

                                                                  new File("src/main/resources/Conversational").toURL().toString()));

diff --git a/java/sca/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatelessTestCase.java b/java/sca/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatelessTestCase.java
index 02295b0ca6..6023b7cd53 100644
--- a/java/sca/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatelessTestCase.java
+++ b/java/sca/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatelessTestCase.java
@@ -31,15 +31,15 @@ import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceSta
 import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatelessImpl;

 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.AfterClass;

 import org.junit.BeforeClass;

 import org.junit.Test;

 

 public class StatefulStatelessTestCase {

 

-    private static SCANode2 node;

+    private static SCANode node;

     private static ConversationalClient conversationalStatelessClientStatelessService;

     private static ConversationalClient conversationalStatelessClientStatefulService;

     private static ConversationalClient conversationalStatefulClientStatelessService;

@@ -50,7 +50,7 @@ public class StatefulStatelessTestCase {
     @BeforeClass

     public static void setUp() throws Exception {

         try {

-            SCANode2Factory nodeFactory = SCANode2Factory.newInstance();

+            SCANodeFactory nodeFactory = SCANodeFactory.newInstance();

             node = nodeFactory.createSCANode(new File("src/main/resources/Conversational/conversational.composite").toURL().toString(),

                                              new SCAContribution("TestContribution", 

                                                                  new File("src/main/resources/Conversational").toURL().toString()));

diff --git a/java/sca/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatefulTestCase.java b/java/sca/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatefulTestCase.java
index fce6ee0d50..fb3a3cec6f 100644
--- a/java/sca/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatefulTestCase.java
+++ b/java/sca/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatefulTestCase.java
@@ -30,15 +30,15 @@ import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceSta
 import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatelessImpl;

 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.AfterClass;

 import org.junit.BeforeClass;

 import org.junit.Test;

 

 public class StatelessStatefulTestCase {

 

-    private static SCANode2 node;

+    private static SCANode node;

     private static ConversationalClient conversationalStatelessClientStatelessService;

     private static ConversationalClient conversationalStatelessClientStatefulService;

     private static ConversationalClient conversationalStatefulClientStatelessService;

@@ -49,7 +49,7 @@ public class StatelessStatefulTestCase {
     @BeforeClass

     public static void setUp() throws Exception {

         try {

-            SCANode2Factory nodeFactory = SCANode2Factory.newInstance();

+            SCANodeFactory nodeFactory = SCANodeFactory.newInstance();

             node = nodeFactory.createSCANode(new File("src/main/resources/Conversational/conversational.composite").toURL().toString(),

                                              new SCAContribution("TestContribution", 

                                                                  new File("src/main/resources/Conversational").toURL().toString()));

diff --git a/java/sca/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatelessTestCase.java b/java/sca/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatelessTestCase.java
index 6df7767823..5fbe2c3f69 100644
--- a/java/sca/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatelessTestCase.java
+++ b/java/sca/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatelessTestCase.java
@@ -30,15 +30,15 @@ import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceSta
 import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatelessImpl;

 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.AfterClass;

 import org.junit.BeforeClass;

 import org.junit.Test;

 

 public class StatelessStatelessTestCase {

 

-    private static SCANode2 node;

+    private static SCANode node;

     private static ConversationalClient conversationalStatelessClientStatelessService;

     private static ConversationalClient conversationalStatelessClientStatefulService;

     private static ConversationalClient conversationalStatefulClientStatelessService;

@@ -49,7 +49,7 @@ public class StatelessStatelessTestCase {
     @BeforeClass

     public static void setUp() throws Exception {

         try {

-            SCANode2Factory nodeFactory = SCANode2Factory.newInstance();

+            SCANodeFactory nodeFactory = SCANodeFactory.newInstance();

             node = nodeFactory.createSCANode(new File("src/main/resources/Conversational/conversational.composite").toURL().toString(),

                                              new SCAContribution("TestContribution", 

                                                                  new File("src/main/resources/Conversational").toURL().toString()));