summaryrefslogtreecommitdiffstats
path: root/sca-java-2.x/trunk
diff options
context:
space:
mode:
authorrfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68>2010-01-21 00:48:56 +0000
committerrfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68>2010-01-21 00:48:56 +0000
commitfe0ce2ac3de23992627982cfdf2c23c83a898419 (patch)
treef4fc9f151b5cb5c1bfb50eb974a4bf6830ecfe71 /sca-java-2.x/trunk
parent16789d7795605f23109b3b520f83a22fbb67e45c (diff)
Fix compilation errors due to interface change
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@901470 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-java-2.x/trunk')
-rw-r--r--sca-java-2.x/trunk/modules/endpoint-dht/src/main/java/org/apache/tuscany/sca/endpoint/dht/OverlayEndpointRegistry.java5
-rw-r--r--sca-java-2.x/trunk/modules/endpoint-zookeeper/src/main/java/org/apache/tuscany/sca/endpoint/zookeeper/DistributedRegistry.java37
2 files changed, 29 insertions, 13 deletions
diff --git a/sca-java-2.x/trunk/modules/endpoint-dht/src/main/java/org/apache/tuscany/sca/endpoint/dht/OverlayEndpointRegistry.java b/sca-java-2.x/trunk/modules/endpoint-dht/src/main/java/org/apache/tuscany/sca/endpoint/dht/OverlayEndpointRegistry.java
index f6fa1f3bfb..b8b582532a 100644
--- a/sca-java-2.x/trunk/modules/endpoint-dht/src/main/java/org/apache/tuscany/sca/endpoint/dht/OverlayEndpointRegistry.java
+++ b/sca-java-2.x/trunk/modules/endpoint-dht/src/main/java/org/apache/tuscany/sca/endpoint/dht/OverlayEndpointRegistry.java
@@ -331,4 +331,9 @@ public class OverlayEndpointRegistry implements EndpointRegistry, LifeCycleListe
return endpointreferences;
}
+ public List<Endpoint> findEndpoint(String uri) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
}
diff --git a/sca-java-2.x/trunk/modules/endpoint-zookeeper/src/main/java/org/apache/tuscany/sca/endpoint/zookeeper/DistributedRegistry.java b/sca-java-2.x/trunk/modules/endpoint-zookeeper/src/main/java/org/apache/tuscany/sca/endpoint/zookeeper/DistributedRegistry.java
index b000640e18..0e74bcb092 100644
--- a/sca-java-2.x/trunk/modules/endpoint-zookeeper/src/main/java/org/apache/tuscany/sca/endpoint/zookeeper/DistributedRegistry.java
+++ b/sca-java-2.x/trunk/modules/endpoint-zookeeper/src/main/java/org/apache/tuscany/sca/endpoint/zookeeper/DistributedRegistry.java
@@ -189,23 +189,28 @@ public class DistributedRegistry extends AbstractDistributedMap<Endpoint> implem
if (endpointReference.getReference() != null) {
Endpoint targetEndpoint = endpointReference.getTargetEndpoint();
- for (Object v : values()) {
- Endpoint endpoint = (Endpoint)v;
- // TODO: implement more complete matching
- logger.fine("Matching against - " + endpoint);
- if (matches(targetEndpoint.getURI(), endpoint.getURI())) {
- // if (!entry.isPrimary()) {
- ((RuntimeEndpoint)endpoint).bind(registry, this);
- // }
- foundEndpoints.add(endpoint);
- logger.fine("Found endpoint with matching service - " + endpoint);
- }
- // else the service name doesn't match
- }
+ String uri = targetEndpoint.getURI();
+ lookup(foundEndpoints, uri);
}
return foundEndpoints;
}
+ private void lookup(List<Endpoint> foundEndpoints, String uri) {
+ for (Object v : values()) {
+ Endpoint endpoint = (Endpoint)v;
+ // TODO: implement more complete matching
+ logger.fine("Matching against - " + endpoint);
+ if (matches(uri, endpoint.getURI())) {
+ // if (!entry.isPrimary()) {
+ ((RuntimeEndpoint)endpoint).bind(registry, this);
+ // }
+ foundEndpoints.add(endpoint);
+ logger.fine("Found endpoint with matching service - " + endpoint);
+ }
+ // else the service name doesn't match
+ }
+ }
+
public List<EndpointReference> findEndpointReference(Endpoint endpoint) {
return endpointreferences;
}
@@ -293,4 +298,10 @@ public class DistributedRegistry extends AbstractDistributedMap<Endpoint> implem
return endpointreferences;
}
+ public List<Endpoint> findEndpoint(String uri) {
+ List<Endpoint> endpoints = new ArrayList<Endpoint>();
+ lookup(endpoints, uri);
+ return endpoints;
+ }
+
}