svn commit: r897142 - /tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/DefaultDomainRegistryFactory.java

[an...@apache.org]

Author: antelder
Date: Fri Jan  8 09:28:21 2010
New Revision: 897142

URL: http://svn.apache.org/viewvc?rev=897142&view=rev
Log:
Change the Registry factory to not use the full config uri when its the tuscany: scheme so that the registry itself can control how the registry gets shared amoung nodes. (I think we need to review all the core approach to creating/locating/sharing endpoint registries, I'll start a ML thread about this once I've got something more complete working)

Modified:
    tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/DefaultDomainRegistryFactory.java

Modified: tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/DefaultDomainRegistryFactory.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/DefaultDomainRegistryFactory.java?rev=897142&r1=897141&r2=897142&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/DefaultDomainRegistryFactory.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/DefaultDomainRegistryFactory.java Fri Jan  8 09:28:21 2010
@@ -75,7 +75,12 @@
             endpointRegistryURI = "vm://localhost";
         }
         
-        String key = endpointRegistryURI + "," + domainURI;
+        String key;
+        if (endpointRegistryURI.startsWith("tuscany:")){ 
+            key = "tuscany:," + domainURI;
+        } else {
+            key = endpointRegistryURI + "," + domainURI;
+        }
 
         EndpointRegistry endpointRegistry = endpointRegistries.get(key);
         if (endpointRegistry != null) {