summaryrefslogtreecommitdiffstats
path: root/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test
diff options
context:
space:
mode:
authorantelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>2010-01-18 12:00:21 +0000
committerantelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>2010-01-18 12:00:21 +0000
commitc0b480ce1460f90294bd2b4e95573c0e7ae64118 (patch)
treec34c364b81a9962ab623f311c54c85e238f45d33 /sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test
parent852025a434345de1a4fada20943282a78c905869 (diff)
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
Diffstat (limited to 'sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test')
-rw-r--r--sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/AsynchTestCase.java4
-rw-r--r--sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/CallbackTestCase.java4
-rw-r--r--sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/PromotionTestCase.java4
-rw-r--r--sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/SimpleTestCase.java4
4 files changed, 8 insertions, 8 deletions
diff --git a/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/AsynchTestCase.java b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/AsynchTestCase.java
index b68fe7fed4..0dbe8b864b 100644
--- a/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/AsynchTestCase.java
+++ b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/AsynchTestCase.java
@@ -42,11 +42,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-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/CallbackTestCase.java b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/CallbackTestCase.java
index 4c05006ba6..b981bbc943 100644
--- a/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/CallbackTestCase.java
+++ b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/CallbackTestCase.java
@@ -40,11 +40,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-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/PromotionTestCase.java b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/PromotionTestCase.java
index 4f1ad18a31..992850e470 100644
--- a/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/PromotionTestCase.java
+++ b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/PromotionTestCase.java
@@ -41,11 +41,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-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/SimpleTestCase.java b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/SimpleTestCase.java
index 73354efbad..a6f4f216d6 100644
--- a/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/SimpleTestCase.java
+++ b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/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) {