Update to configure the registry from the domainURI

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

1 files changed, 13 insertions, 2 deletions

diff --git a/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/node2/NodeFactory.java b/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/node2/NodeFactory.java
index 47eba43477..cafa772a25 100644
--- a/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/node2/NodeFactory.java
+++ b/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/node2/NodeFactory.java
@@ -95,8 +95,9 @@ public class NodeFactory {
     }
 
     public Node createNode(String domainURI) {
-        EndpointRegistry endpointRegistry = domainRegistryFactory.getEndpointRegistry("default", domainURI);
-        return new NodeImpl(domainURI, deployer, compositeActivator, endpointRegistry, extensionPointRegistry, null);
+        String domainName = getDomainName(domainURI);
+        EndpointRegistry endpointRegistry = domainRegistryFactory.getEndpointRegistry(domainURI, domainName);
+        return new NodeImpl(domainName, deployer, compositeActivator, endpointRegistry, extensionPointRegistry, null);
     }
 
     protected Node createOneoffNode() {
@@ -152,4 +153,14 @@ public class NodeFactory {
     public AssemblyFactory getAssemblyFactory() {
         return assemblyFactory;
     }
+
+    private String getDomainName(String domainURI) {
+        int scheme = domainURI.indexOf(':');
+        int qm = domainURI.indexOf('?');
+        if (qm == -1) {
+            return domainURI.substring(scheme+1);
+        } else {
+            return domainURI.substring(scheme+1, qm);
+        }
+    }
 }