svn commit: r904461 - in /tuscany/sca-java-2.x/trunk: itest/nodes/one-jvm-hazelcast/src/test/java/itest/ modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/

[antelder]

Author: antelder
Date: Fri Jan 29 11:11:09 2010
New Revision: 904461

URL: http://svn.apache.org/viewvc?rev=904461&view=rev
Log:
Update to find an existing domain if the registry isn't explicitly defined

Modified:
    
tuscany/sca-java-2.x/trunk/itest/nodes/one-jvm-hazelcast/src/test/java/itest/TwoRemoteNodesTestCase.java
    
tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/BaseEndpointRegistry.java
    
tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointRegistry.java
    
tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ExtensibleDomainRegistry.java

Modified: 
tuscany/sca-java-2.x/trunk/itest/nodes/one-jvm-hazelcast/src/test/java/itest/TwoRemoteNodesTestCase.java
URL: 
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/nodes/one-jvm-hazelcast/src/test/java/itest/TwoRemoteNodesTestCase.java?rev=904461&r1=904460&r2=904461&view=diff
==============================================================================
--- 
tuscany/sca-java-2.x/trunk/itest/nodes/one-jvm-hazelcast/src/test/java/itest/TwoRemoteNodesTestCase.java
 (original)
+++ 
tuscany/sca-java-2.x/trunk/itest/nodes/one-jvm-hazelcast/src/test/java/itest/TwoRemoteNodesTestCase.java
 Fri Jan 29 11:11:09 2010
@@ -64,7 +64,7 @@
 //        assertNotNull(scaClientService);
 //        assertEquals("Hello Petra", scaClientService.sayHello("Petra"));
 
-        Helloworld scaClientClient = 
SCAClientFactory.newInstance(URI.create("tuscany:TwoRemoteNodesTestCase")).getService(Helloworld.class,
 "HelloworldClient");
+        Helloworld scaClientClient = 
SCAClientFactory.newInstance(URI.create("TwoRemoteNodesTestCase")).getService(Helloworld.class,
 "HelloworldClient");
         assertNotNull(scaClientClient);
         assertEquals("Hi Hello Petra", scaClientClient.sayHello("Petra"));
     

Modified: 
tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/BaseEndpointRegistry.java
URL: 
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/BaseEndpointRegistry.java?rev=904461&r1=904460&r2=904461&view=diff
==============================================================================
--- 
tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/BaseEndpointRegistry.java
 (original)
+++ 
tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/BaseEndpointRegistry.java
 Fri Jan 29 11:11:09 2010
@@ -199,4 +199,8 @@
         listeners.remove(listener);
     }
 
+    public String getDomainName() {
+        return domainURI;
+    }
+
 }

Modified: 
tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointRegistry.java
URL: 
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointRegistry.java?rev=904461&r1=904460&r2=904461&view=diff
==============================================================================
--- 
tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointRegistry.java
 (original)
+++ 
tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointRegistry.java
 Fri Jan 29 11:11:09 2010
@@ -66,4 +66,5 @@
     void addListener(EndpointListener listener);
     void removeListener(EndpointListener listener);
 
+    String getDomainName();
 }

Modified: 
tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ExtensibleDomainRegistry.java
URL: 
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ExtensibleDomainRegistry.java?rev=904461&r1=904460&r2=904461&view=diff
==============================================================================
--- 
tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ExtensibleDomainRegistry.java
 (original)
+++ 
tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ExtensibleDomainRegistry.java
 Fri Jan 29 11:11:09 2010
@@ -64,6 +64,16 @@
         URI uri = URI.create(endpointRegistryURI);
         String scheme = uri.getScheme();
         if (scheme == null) {
+            
+            // See if there is a previously created registry for that domain
+            for (DomainRegistryFactory factory : 
factories.getDomainRegistryFactories()) {
+                for (EndpointRegistry endpointRegistry : 
factory.getEndpointRegistries()) {
+                    if (endpointRegistry.getDomainName().equals(domainURI)) {
+                        return endpointRegistry;
+                    }
+                }
+            }
+
             scheme = "vm";
             endpointRegistryURI = "vm:" + endpointRegistryURI;
         } else {