diff options
| author | antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68> | 2010-01-23 12:51:13 +0000 |
|---|---|---|
| committer | antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68> | 2010-01-23 12:51:13 +0000 |
| commit | 7d97c341738d3cb5c0969374215a78b0df31da0d (patch) | |
| tree | 332148d69ccb5eafd2cde78aab9648115666f275 /sca-java-2.x/trunk/modules | |
| parent | 7493d03ae1b64ba2c605ea22a4cd6392925215dd (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')
2 files changed, 5 insertions, 3 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); diff --git a/sca-java-2.x/trunk/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/NodeConfiguration.java b/sca-java-2.x/trunk/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/NodeConfiguration.java index 05ed360d75..f7021338ce 100644 --- a/sca-java-2.x/trunk/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/NodeConfiguration.java +++ b/sca-java-2.x/trunk/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/NodeConfiguration.java @@ -31,9 +31,9 @@ import javax.xml.namespace.QName; * The configuration for a Node which represents the deployment of an SCA composite application */ public interface NodeConfiguration { - String DEFAULT_DOMAIN_URI = "http://tuscany.apache.org/sca/1.1/domains/default"; + String DEFAULT_DOMAIN_URI = "default"; String DEFAULT_NODE_URI = "http://tuscany.apache.org/sca/1.1/nodes/default"; - String DEFAULT_DOMAIN_REGISTRY_URI = "vm://localhost"; + String DEFAULT_DOMAIN_REGISTRY_URI = "default"; /** * Get the URI of the SCA domain that manages the composite application |