You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2010/01/21 01:48:56 UTC
svn commit: r901470 - in /tuscany/sca-java-2.x/trunk/modules:
endpoint-dht/src/main/java/org/apache/tuscany/sca/endpoint/dht/OverlayEndpointRegistry.java
endpoint-zookeeper/src/main/java/org/apache/tuscany/sca/endpoint/zookeeper/DistributedRegistry.java
Author: rfeng
Date: Thu Jan 21 00:48:56 2010
New Revision: 901470
URL: http://svn.apache.org/viewvc?rev=901470&view=rev
Log:
Fix compilation errors due to interface change
Modified:
tuscany/sca-java-2.x/trunk/modules/endpoint-dht/src/main/java/org/apache/tuscany/sca/endpoint/dht/OverlayEndpointRegistry.java
tuscany/sca-java-2.x/trunk/modules/endpoint-zookeeper/src/main/java/org/apache/tuscany/sca/endpoint/zookeeper/DistributedRegistry.java
Modified: tuscany/sca-java-2.x/trunk/modules/endpoint-dht/src/main/java/org/apache/tuscany/sca/endpoint/dht/OverlayEndpointRegistry.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/endpoint-dht/src/main/java/org/apache/tuscany/sca/endpoint/dht/OverlayEndpointRegistry.java?rev=901470&r1=901469&r2=901470&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/endpoint-dht/src/main/java/org/apache/tuscany/sca/endpoint/dht/OverlayEndpointRegistry.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/endpoint-dht/src/main/java/org/apache/tuscany/sca/endpoint/dht/OverlayEndpointRegistry.java Thu Jan 21 00:48:56 2010
@@ -331,4 +331,9 @@
return endpointreferences;
}
+ public List<Endpoint> findEndpoint(String uri) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
}
Modified: tuscany/sca-java-2.x/trunk/modules/endpoint-zookeeper/src/main/java/org/apache/tuscany/sca/endpoint/zookeeper/DistributedRegistry.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/endpoint-zookeeper/src/main/java/org/apache/tuscany/sca/endpoint/zookeeper/DistributedRegistry.java?rev=901470&r1=901469&r2=901470&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/endpoint-zookeeper/src/main/java/org/apache/tuscany/sca/endpoint/zookeeper/DistributedRegistry.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/endpoint-zookeeper/src/main/java/org/apache/tuscany/sca/endpoint/zookeeper/DistributedRegistry.java Thu Jan 21 00:48:56 2010
@@ -189,23 +189,28 @@
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 @@
return endpointreferences;
}
+ public List<Endpoint> findEndpoint(String uri) {
+ List<Endpoint> endpoints = new ArrayList<Endpoint>();
+ lookup(endpoints, uri);
+ return endpoints;
+ }
+
}