svn commit: r898335 - /tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/domain/node/DomainNode.java

[antelder]

Author: antelder
Date: Tue Jan 12 14:15:55 2010
New Revision: 898335

URL: http://svn.apache.org/viewvc?rev=898335&view=rev
Log:
NodeFactory.getInstance doesn't work properly anymore so use the config approach

Modified:
    
tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/domain/node/DomainNode.java

Modified: 
tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/domain/node/DomainNode.java
URL: 
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/domain/node/DomainNode.java?rev=898335&r1=898334&r2=898335&view=diff
==============================================================================
--- 
tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/domain/node/DomainNode.java
 (original)
+++ 
tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/domain/node/DomainNode.java
 Tue Jan 12 14:15:55 2010
@@ -47,7 +47,6 @@
     private String domainName;
     private String domainRegistryURI;
     
-    private NodeFactory nodeFactory;
     private Map<String, Node> nodes = new HashMap<String, Node>();
     
     public DomainNode() {
@@ -61,7 +60,6 @@
     public DomainNode(String configURI, String[] contributionLocations) {
         this.domainRegistryURI = configURI;
         initDomainName(configURI);
-        nodeFactory = NodeFactory.getInstance(domainName);
         if (contributionLocations == null || contributionLocations.length == 
0) {
             addContribution(null, "_null");
         } else {
@@ -87,14 +85,14 @@
         if (nodes.containsKey(uri)) {
             throw new IllegalArgumentException("contribution already added: " 
+ uri);
         }
-        NodeConfiguration configuration = 
nodeFactory.createNodeConfiguration();
+        NodeConfiguration configuration = 
NodeFactory.newInstance().createNodeConfiguration();
         if (location != null) {
             configuration.addContribution(uri, location);
         }
         configuration.setDomainRegistryURI(domainRegistryURI);
         configuration.setDomainURI(domainName);
         configuration.setURI(uri); //???
-        Node node = nodeFactory.createNode(configuration).start();
+        Node node = 
NodeFactory.newInstance().createNode(configuration).start();
         nodes.put(uri, node);
     }