From 514181bdd232345dcdc2430201fc25ecf2c07991 Mon Sep 17 00:00:00 2001 From: antelder Date: Thu, 28 Jan 2010 15:02:18 +0000 Subject: Update to allow the client to share this as a subclass git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@904113 13f79535-47bb-0310-9956-ffa450edef68 --- .../java/org/apache/tuscany/sca/endpoint/hazelcast/ConfigURI.java | 4 ++++ .../tuscany/sca/endpoint/hazelcast/HazelcastEndpointRegistry.java | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/sca-java-2.x/trunk/modules/endpoint-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/ConfigURI.java b/sca-java-2.x/trunk/modules/endpoint-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/ConfigURI.java index 191005eafd..066ff187db 100644 --- a/sca-java-2.x/trunk/modules/endpoint-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/ConfigURI.java +++ b/sca-java-2.x/trunk/modules/endpoint-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/ConfigURI.java @@ -59,6 +59,10 @@ public class ConfigURI { } private void parseURI(String uri) { + if (uri.startsWith("tuscanyClient:")) { + uri = uri.replace("tuscanyClient:", "tuscany:"); + } + if (!uri.startsWith("tuscany:")) { throw new IllegalArgumentException("Config URI must start with 'tuscany:'"); } diff --git a/sca-java-2.x/trunk/modules/endpoint-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/HazelcastEndpointRegistry.java b/sca-java-2.x/trunk/modules/endpoint-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/HazelcastEndpointRegistry.java index 3bc9fa9f66..7722a157f0 100644 --- a/sca-java-2.x/trunk/modules/endpoint-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/HazelcastEndpointRegistry.java +++ b/sca-java-2.x/trunk/modules/endpoint-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/HazelcastEndpointRegistry.java @@ -57,10 +57,10 @@ public class HazelcastEndpointRegistry implements EndpointRegistry, LifeCycleLis private List listeners = new CopyOnWriteArrayList(); private ExtensionPointRegistry registry; - private ConfigURI configURI; + protected ConfigURI configURI; - HazelcastInstance hazelcastInstance; - Map map; + private HazelcastInstance hazelcastInstance; + protected Map map; private List localEndpoints = new ArrayList();; public HazelcastEndpointRegistry(ExtensionPointRegistry registry, -- cgit v1.2.3