Change Node getInstance/newInstance methods so that newInstance really creates a new instance, and getInstance returns the singleton instance

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

4 files changed, 8 insertions, 8 deletions

diff --git a/sca-java-2.x/trunk/modules/binding-sca-axis2-runtime/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/AsynchTestCase.java b/sca-java-2.x/trunk/modules/binding-sca-axis2-runtime/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/AsynchTestCase.java
index a0bfe7409e..fcdef83225 100644
--- a/sca-java-2.x/trunk/modules/binding-sca-axis2-runtime/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/AsynchTestCase.java
+++ b/sca-java-2.x/trunk/modules/binding-sca-axis2-runtime/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/AsynchTestCase.java
@@ -44,11 +44,11 @@ public class AsynchTestCase {
         try {
             // create and start nodes
             Contribution contrib = new Contribution("asynch", "./target/test-classes/asynchReference");
-            nodeA = NodeFactory.newInstance().createNode("HelloWorld.composite", contrib);
+            nodeA = NodeFactory.getInstance().createNode("HelloWorld.composite", contrib);
             nodeA.start();
             
             contrib = new Contribution("asynch", "./target/test-classes/asynchService");
-            nodeB = NodeFactory.newInstance().createNode("HelloWorld.composite", contrib);
+            nodeB = NodeFactory.getInstance().createNode("HelloWorld.composite", contrib);
             nodeB.start();
 
         } catch (Exception ex) {
diff --git a/sca-java-2.x/trunk/modules/binding-sca-axis2-runtime/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/CallbackTestCase.java b/sca-java-2.x/trunk/modules/binding-sca-axis2-runtime/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/CallbackTestCase.java
index ad272528d8..cb15755708 100644
--- a/sca-java-2.x/trunk/modules/binding-sca-axis2-runtime/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/CallbackTestCase.java
+++ b/sca-java-2.x/trunk/modules/binding-sca-axis2-runtime/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/CallbackTestCase.java
@@ -42,11 +42,11 @@ public class CallbackTestCase {
         try {
             // create and start nodes
             Contribution contrib = new Contribution("reference", "./target/test-classes/callbackReference");
-            nodeA = NodeFactory.newInstance().createNode("HelloWorld.composite", contrib);
+            nodeA = NodeFactory.getInstance().createNode("HelloWorld.composite", contrib);
             nodeA.start();
             
             contrib = new Contribution("service", "./target/test-classes/callbackService");
-            nodeB = NodeFactory.newInstance().createNode("HelloWorld.composite", contrib);
+            nodeB = NodeFactory.getInstance().createNode("HelloWorld.composite", contrib);
             nodeB.start();
 
         } catch (Exception ex) {
diff --git a/sca-java-2.x/trunk/modules/binding-sca-axis2-runtime/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/PromotionTestCase.java b/sca-java-2.x/trunk/modules/binding-sca-axis2-runtime/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/PromotionTestCase.java
index 30919c5cb0..7357580364 100644
--- a/sca-java-2.x/trunk/modules/binding-sca-axis2-runtime/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/PromotionTestCase.java
+++ b/sca-java-2.x/trunk/modules/binding-sca-axis2-runtime/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/PromotionTestCase.java
@@ -42,11 +42,11 @@ public class PromotionTestCase {
         try {
             // create and start nodes
             Contribution contrib = new Contribution("reference", "./target/test-classes/promotionReference");
-            nodeA = NodeFactory.newInstance().createNode("HelloWorld.composite", contrib);
+            nodeA = NodeFactory.getInstance().createNode("HelloWorld.composite", contrib);
             nodeA.start();
             
             contrib = new Contribution("service", "./target/test-classes/promotionService");
-            nodeB = NodeFactory.newInstance().createNode("HelloWorld.composite", contrib);
+            nodeB = NodeFactory.getInstance().createNode("HelloWorld.composite", contrib);
             nodeB.start();
 
         } catch (Exception ex) {
diff --git a/sca-java-2.x/trunk/modules/binding-sca-axis2-runtime/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/SimpleTestCase.java b/sca-java-2.x/trunk/modules/binding-sca-axis2-runtime/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/SimpleTestCase.java
index c65e4ea5c9..a0bb50cbf6 100644
--- a/sca-java-2.x/trunk/modules/binding-sca-axis2-runtime/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/SimpleTestCase.java
+++ b/sca-java-2.x/trunk/modules/binding-sca-axis2-runtime/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/SimpleTestCase.java
@@ -41,11 +41,11 @@ public class SimpleTestCase {
         try {
             // create and start nodes
             Contribution contrib = new Contribution("reference", "./target/test-classes/simpleReference");
-            nodeA = NodeFactory.newInstance().createNode("HelloWorld.composite", contrib);
+            nodeA = NodeFactory.getInstance().createNode("HelloWorld.composite", contrib);
             nodeA.start();
             
             contrib = new Contribution("service", "./target/test-classes/simpleService");
-            nodeB = NodeFactory.newInstance().createNode("HelloWorld.composite", contrib);
+            nodeB = NodeFactory.getInstance().createNode("HelloWorld.composite", contrib);
             nodeB.start();
 
         } catch (Exception ex) {