From 98802478a84a42af4a4bf7c28a815ade993eab6a Mon Sep 17 00:00:00 2001 From: antelder Date: Thu, 28 Jan 2010 18:40:43 +0000 Subject: Change the tuscanyClient scheme to pbe all lower case so it works with the toLowerCase in the DefaultEndpointRegistryFactory, and move all the remote code in the scaclient to happen at invocation time. This now works for multiple local and remote nodes in one or separate JVMs git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@904206 13f79535-47bb-0310-9956-ffa450edef68 --- .../tuscany/sca/core/runtime/DefaultDomainRegistryFactory.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'sca-java-2.x/trunk/modules/core/src/main/java/org/apache') 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 8bd5df8386..784eca90ab 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 @@ -76,7 +76,7 @@ public class DefaultDomainRegistryFactory implements DomainRegistryFactory, Life } String key; - if (endpointRegistryURI.startsWith("tuscany:") || endpointRegistryURI.startsWith("tuscanyClient:")){ + if (endpointRegistryURI.startsWith("tuscany:") || endpointRegistryURI.startsWith("tuscanyclient:")){ key = "tuscany:," + domainURI; } else { key = endpointRegistryURI + "," + domainURI; @@ -98,7 +98,7 @@ public class DefaultDomainRegistryFactory implements DomainRegistryFactory, Life return endpointRegistry; } - String scheme = "tuscanyClient:".equals(endpointRegistryURI) ? "tuscanyClient" : URI.create(endpointRegistryURI).getScheme(); + String scheme = "tuscanyclient:".equals(endpointRegistryURI) ? "tuscanyClient" : URI.create(endpointRegistryURI).getScheme(); if (scheme != null) { scheme = scheme.toLowerCase(); } else { @@ -134,7 +134,7 @@ public class DefaultDomainRegistryFactory implements DomainRegistryFactory, Life for (EndpointListener listener : listeners) { endpointRegistry.addListener(listener); } - if (!"tuscanyClient:".equals(endpointRegistryURI)) { + if (!"tuscanyclient:".equals(endpointRegistryURI)) { endpointRegistries.put(key, endpointRegistry); } return endpointRegistry; -- cgit v1.2.3