summaryrefslogtreecommitdiffstats
path: root/sca-java-2.x/trunk/modules/endpoint-hazelcast/src/main/java/org/apache
diff options
context:
space:
mode:
authorantelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>2010-01-28 15:02:18 +0000
committerantelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>2010-01-28 15:02:18 +0000
commit514181bdd232345dcdc2430201fc25ecf2c07991 (patch)
treeb21316621200961b1e8af464fce876440f9bf624 /sca-java-2.x/trunk/modules/endpoint-hazelcast/src/main/java/org/apache
parentd8a718b9e51d78096c42dbdd2f385518ec21bf74 (diff)
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
Diffstat (limited to 'sca-java-2.x/trunk/modules/endpoint-hazelcast/src/main/java/org/apache')
-rw-r--r--sca-java-2.x/trunk/modules/endpoint-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/ConfigURI.java4
-rw-r--r--sca-java-2.x/trunk/modules/endpoint-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/HazelcastEndpointRegistry.java6
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<EndpointListener> listeners = new CopyOnWriteArrayList<EndpointListener>();
private ExtensionPointRegistry registry;
- private ConfigURI configURI;
+ protected ConfigURI configURI;
- HazelcastInstance hazelcastInstance;
- Map<Object, Object> map;
+ private HazelcastInstance hazelcastInstance;
+ protected Map<Object, Object> map;
private List<String> localEndpoints = new ArrayList<String>();;
public HazelcastEndpointRegistry(ExtensionPointRegistry registry,