From a0d5ac96505179eee741af4f819761fe28a3868a Mon Sep 17 00:00:00 2001
From: antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 25 Jan 2010 14:29:05 +0000
Subject: Catch up the tomcat runtime with all the recent domain and node
 changes

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@902818 13f79535-47bb-0310-9956-ffa450edef68
---
 .../src/main/java/org/apache/tuscany/sca/domain/node/DomainNode.java  | 4 ++--
 .../java/org/apache/tuscany/sca/client/rmi/SCAClientFactoryImpl.java  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'sca-java-2.x/trunk/modules')

diff --git a/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/domain/node/DomainNode.java b/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/domain/node/DomainNode.java
index 8ee7d5bdbf..98f6b5a481 100644
--- a/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/domain/node/DomainNode.java
+++ b/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/domain/node/DomainNode.java
@@ -85,14 +85,14 @@ public class DomainNode {
         if (nodes.containsKey(uri)) {
             throw new IllegalArgumentException("contribution already added: " + uri);
         }
-        NodeConfiguration configuration = NodeFactory.newInstance().createNodeConfiguration();
+        NodeConfiguration configuration = NodeFactory.getInstance().createNodeConfiguration();
         if (location != null) {
             configuration.addContribution(uri, location);
         }
         configuration.setDomainRegistryURI(domainRegistryURI);
         configuration.setDomainURI(domainName);
         configuration.setURI(uri); //???
-        Node node = NodeFactory.newInstance().createNode(configuration).start();
+        Node node = NodeFactory.getInstance().createNode(configuration).start();
         nodes.put(uri, node);
     }
 
diff --git a/sca-java-2.x/trunk/modules/sca-client-rmi/src/main/java/org/apache/tuscany/sca/client/rmi/SCAClientFactoryImpl.java b/sca-java-2.x/trunk/modules/sca-client-rmi/src/main/java/org/apache/tuscany/sca/client/rmi/SCAClientFactoryImpl.java
index b170c30045..7dad6a28db 100644
--- a/sca-java-2.x/trunk/modules/sca-client-rmi/src/main/java/org/apache/tuscany/sca/client/rmi/SCAClientFactoryImpl.java
+++ b/sca-java-2.x/trunk/modules/sca-client-rmi/src/main/java/org/apache/tuscany/sca/client/rmi/SCAClientFactoryImpl.java
@@ -48,7 +48,7 @@ public class SCAClientFactoryImpl extends SCAClientFactory {
 
     public SCAClientFactoryImpl(URI domainURI) throws NoSuchDomainException {
         super(domainURI);
-        NodeImpl node = (NodeImpl)NodeFactory.newInstance().createNode(domainURI);
+        NodeImpl node = (NodeImpl)NodeFactory.getInstance().createNode(domainURI);
         if (node.getExtensionPoints() == null) {
             // No local nodes have been started (for this domain?)
             // ideally we'll use the Hazelcast client but for now just start a node
-- 
cgit v1.2.3