summaryrefslogtreecommitdiffstats
path: root/sca-java-2.x/trunk/modules/core/src
diff options
context:
space:
mode:
authorantelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>2010-01-23 12:51:13 +0000
committerantelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>2010-01-23 12:51:13 +0000
commit7d97c341738d3cb5c0969374215a78b0df31da0d (patch)
tree332148d69ccb5eafd2cde78aab9648115666f275 /sca-java-2.x/trunk/modules/core/src
parent7493d03ae1b64ba2c605ea22a4cd6392925215dd (diff)
Fix the node tests by using a consistent domain name everywhere and using NodeFactory.getInstance instead of newInstance, change the default domain name to be simply 'default', add all the node itests back into the build as they work now
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@902401 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-java-2.x/trunk/modules/core/src')
-rw-r--r--sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/DefaultDomainRegistryFactory.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/DefaultDomainRegistryFactory.java b/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/DefaultDomainRegistryFactory.java
index 0490604fc4..7a9f7c3cb0 100644
--- a/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/DefaultDomainRegistryFactory.java
+++ b/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/DefaultDomainRegistryFactory.java
@@ -72,7 +72,7 @@ public class DefaultDomainRegistryFactory implements DomainRegistryFactory, Life
public synchronized EndpointRegistry getEndpointRegistry(String endpointRegistryURI, String domainURI) {
if (endpointRegistryURI == null) {
- endpointRegistryURI = "vm://localhost";
+ endpointRegistryURI = domainURI;
}
String key;
@@ -91,6 +91,8 @@ public class DefaultDomainRegistryFactory implements DomainRegistryFactory, Life
String scheme = uri.getScheme();
if (scheme != null) {
scheme = scheme.toLowerCase();
+ } else {
+ scheme = "vm";
}
ServiceDeclaration sd = declarations.get(scheme);