diff options
Diffstat (limited to 'sca-java-2.x/trunk/modules')
| -rw-r--r-- | sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/TuscanyURI.java (renamed from sca-java-2.x/trunk/modules/endpoint-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/ConfigURI.java) | 8 | ||||
| -rw-r--r-- | sca-java-2.x/trunk/modules/core-spi/src/test/java/org/apache/tuscany/sca/runtime/ConfigURITestCase.java (renamed from sca-java-2.x/trunk/modules/endpoint-hazelcast/src/test/java/org/apache/tuscany/sca/endpoint/hazelcast/ConfigURITestCase.java) | 21 | ||||
| -rw-r--r-- | sca-java-2.x/trunk/modules/endpoint-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/HazelcastEndpointRegistry.java | 5 | ||||
| -rw-r--r-- | sca-java-2.x/trunk/modules/endpoint-tribes/src/main/java/org/apache/tuscany/sca/endpoint/tribes/ReplicatedEndpointRegistry.java | 29 | ||||
| -rw-r--r-- | sca-java-2.x/trunk/modules/endpoint-tribes/src/main/java/org/apache/tuscany/sca/endpoint/tribes/TribesDomainRegistryFactory.java | 2 |
5 files changed, 47 insertions, 18 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/core-spi/src/main/java/org/apache/tuscany/sca/runtime/TuscanyURI.java index 0eee731249..2bb22ad634 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/core-spi/src/main/java/org/apache/tuscany/sca/runtime/TuscanyURI.java @@ -17,7 +17,7 @@ * under the License.
*/
-package org.apache.tuscany.sca.endpoint.hazelcast;
+package org.apache.tuscany.sca.runtime;
import java.net.URI;
import java.util.ArrayList;
@@ -38,10 +38,8 @@ import java.util.Map; * otherwise if remotes= is not specified then multicast defaults to 224.5.12.10:51482
* remotes - a list of ipAddress:port for remote nodes
*
- * TODO: move this to a base module as it will also be used by the SCAClient
- * add JCA encryption config
*/
-public class ConfigURI {
+public class TuscanyURI {
private String domainName = "default";
private String bindAddress = null; // null means all network adapters
@@ -53,7 +51,7 @@ public class ConfigURI { private List<String> remotes = new ArrayList<String>();
private String uri;
- public ConfigURI(String uri) {
+ public TuscanyURI(String uri) {
this.uri = uri;
parseURI(uri);
}
diff --git a/sca-java-2.x/trunk/modules/endpoint-hazelcast/src/test/java/org/apache/tuscany/sca/endpoint/hazelcast/ConfigURITestCase.java b/sca-java-2.x/trunk/modules/core-spi/src/test/java/org/apache/tuscany/sca/runtime/ConfigURITestCase.java index 85821afe39..525cf80587 100644 --- a/sca-java-2.x/trunk/modules/endpoint-hazelcast/src/test/java/org/apache/tuscany/sca/endpoint/hazelcast/ConfigURITestCase.java +++ b/sca-java-2.x/trunk/modules/core-spi/src/test/java/org/apache/tuscany/sca/runtime/ConfigURITestCase.java @@ -17,12 +17,13 @@ * under the License.
*/
-package org.apache.tuscany.sca.endpoint.hazelcast;
+package org.apache.tuscany.sca.runtime;
import java.net.UnknownHostException;
import junit.framework.Assert;
+import org.apache.tuscany.sca.runtime.TuscanyURI;
import org.junit.Test;
public class ConfigURITestCase {
@@ -30,7 +31,7 @@ public class ConfigURITestCase { @Test
public void testInvalidPrefix() throws UnknownHostException {
try {
- new ConfigURI("foo");
+ new TuscanyURI("foo");
Assert.fail();
} catch (IllegalArgumentException e) {
// expected
@@ -39,14 +40,14 @@ public class ConfigURITestCase { @Test
public void testDomainName() throws UnknownHostException {
- ConfigURI configURI = new ConfigURI("tuscany:myDomain");
+ TuscanyURI configURI = new TuscanyURI("tuscany:myDomain");
Assert.assertEquals("myDomain", configURI.getDomainName());
Assert.assertFalse(configURI.isMulticastDisabled());
}
@Test
public void testListenAddr() throws UnknownHostException {
- ConfigURI configURI = new ConfigURI("tuscany:myDomain?listen=4321");
+ TuscanyURI configURI = new TuscanyURI("tuscany:myDomain?listen=4321");
Assert.assertEquals("myDomain", configURI.getDomainName());
Assert.assertFalse(configURI.isMulticastDisabled());
Assert.assertEquals(4321, configURI.getListenPort());
@@ -54,7 +55,7 @@ public class ConfigURITestCase { }
@Test
public void testListenAddr2() throws UnknownHostException {
- ConfigURI configURI = new ConfigURI("tuscany:myDomain?listen=1.1.1.1:4321");
+ TuscanyURI configURI = new TuscanyURI("tuscany:myDomain?listen=1.1.1.1:4321");
Assert.assertEquals("myDomain", configURI.getDomainName());
Assert.assertFalse(configURI.isMulticastDisabled());
Assert.assertEquals(4321, configURI.getListenPort());
@@ -63,14 +64,14 @@ public class ConfigURITestCase { @Test
public void testMulticase1() throws UnknownHostException {
- ConfigURI configURI = new ConfigURI("tuscany:myDomain?multicast=off");
+ TuscanyURI configURI = new TuscanyURI("tuscany:myDomain?multicast=off");
Assert.assertEquals("myDomain", configURI.getDomainName());
Assert.assertTrue(configURI.isMulticastDisabled());
}
@Test
public void testMulticase2() throws UnknownHostException {
- ConfigURI configURI = new ConfigURI("tuscany:myDomain?multicast=1.2.3.4:67");
+ TuscanyURI configURI = new TuscanyURI("tuscany:myDomain?multicast=1.2.3.4:67");
Assert.assertEquals("myDomain", configURI.getDomainName());
Assert.assertFalse(configURI.isMulticastDisabled());
Assert.assertEquals("1.2.3.4", configURI.getMulticastAddress());
@@ -79,7 +80,7 @@ public class ConfigURITestCase { @Test
public void testMulticase3() throws UnknownHostException {
- ConfigURI configURI = new ConfigURI("tuscany:myDomain?multicast=1.2.3.4");
+ TuscanyURI configURI = new TuscanyURI("tuscany:myDomain?multicast=1.2.3.4");
Assert.assertEquals("myDomain", configURI.getDomainName());
Assert.assertFalse(configURI.isMulticastDisabled());
Assert.assertEquals("1.2.3.4", configURI.getMulticastAddress());
@@ -88,14 +89,14 @@ public class ConfigURITestCase { @Test
public void testPassword() {
- ConfigURI configURI = new ConfigURI("tuscany:myDomain?password=bla");
+ TuscanyURI configURI = new TuscanyURI("tuscany:myDomain?password=bla");
Assert.assertEquals("myDomain", configURI.getDomainName());
Assert.assertEquals("bla", configURI.getPassword());
}
@Test
public void testRemotes() throws UnknownHostException {
- ConfigURI configURI = new ConfigURI("tuscany:myDomain?remotes=1.1.1.1:23,2.2.2.2");
+ TuscanyURI configURI = new TuscanyURI("tuscany:myDomain?remotes=1.1.1.1:23,2.2.2.2");
Assert.assertEquals("myDomain", configURI.getDomainName());
Assert.assertTrue(configURI.isMulticastDisabled());
Assert.assertEquals(2, configURI.getRemotes().size());
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 e50f0511cf..afdee1484f 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 @@ -32,6 +32,7 @@ import org.apache.tuscany.sca.core.LifeCycleListener; import org.apache.tuscany.sca.runtime.BaseEndpointRegistry;
import org.apache.tuscany.sca.runtime.EndpointRegistry;
import org.apache.tuscany.sca.runtime.RuntimeEndpoint;
+import org.apache.tuscany.sca.runtime.TuscanyURI;
import com.hazelcast.config.Config;
import com.hazelcast.config.TcpIpConfig;
@@ -51,7 +52,7 @@ import com.hazelcast.nio.Address; public class HazelcastEndpointRegistry extends BaseEndpointRegistry implements EndpointRegistry, LifeCycleListener, EntryListener<String, Endpoint>, MembershipListener {
private final static Logger logger = Logger.getLogger(HazelcastEndpointRegistry.class.getName());
- protected ConfigURI configURI;
+ protected TuscanyURI configURI;
private HazelcastInstance hazelcastInstance;
protected Map<Object, Object> map;
@@ -62,7 +63,7 @@ public class HazelcastEndpointRegistry extends BaseEndpointRegistry implements E String domainRegistryURI,
String domainURI) {
super(registry, attributes, domainRegistryURI, domainURI);
- this.configURI = new ConfigURI(domainRegistryURI);
+ this.configURI = new TuscanyURI(domainRegistryURI);
}
public void start() {
diff --git a/sca-java-2.x/trunk/modules/endpoint-tribes/src/main/java/org/apache/tuscany/sca/endpoint/tribes/ReplicatedEndpointRegistry.java b/sca-java-2.x/trunk/modules/endpoint-tribes/src/main/java/org/apache/tuscany/sca/endpoint/tribes/ReplicatedEndpointRegistry.java index 3c2a062de2..5f46615001 100644 --- a/sca-java-2.x/trunk/modules/endpoint-tribes/src/main/java/org/apache/tuscany/sca/endpoint/tribes/ReplicatedEndpointRegistry.java +++ b/sca-java-2.x/trunk/modules/endpoint-tribes/src/main/java/org/apache/tuscany/sca/endpoint/tribes/ReplicatedEndpointRegistry.java @@ -51,6 +51,7 @@ import org.apache.tuscany.sca.endpoint.tribes.MapStore.MapListener; import org.apache.tuscany.sca.runtime.BaseEndpointRegistry; import org.apache.tuscany.sca.runtime.EndpointRegistry; import org.apache.tuscany.sca.runtime.RuntimeEndpoint; +import org.apache.tuscany.sca.runtime.TuscanyURI; /** * A replicated EndpointRegistry based on Apache Tomcat Tribes @@ -117,6 +118,13 @@ public class ReplicatedEndpointRegistry extends BaseEndpointRegistry implements if (uri.getPort() != -1) { map.put("port", String.valueOf(uri.getPort())); } + + if (domainRegistryURI.startsWith("tuscany")) { + setTuscanyConfig(map, domainRegistryURI); + setConfig(map); + return map; + } + int index = domainRegistryURI.indexOf('?'); if (index == -1) { setConfig(map); @@ -139,6 +147,27 @@ public class ReplicatedEndpointRegistry extends BaseEndpointRegistry implements return map; } + private void setTuscanyConfig(Map<String, String> map, String domainRegistryURI) { + TuscanyURI tuscanyURI = new TuscanyURI(domainRegistryURI); + map.put("address", tuscanyURI.getMulticastAddress()); + map.put("port", Integer.toString(tuscanyURI.getMulticastPort())); + map.put("bind", tuscanyURI.getBindAddress()); + map.put("receiverPort", Integer.toString(tuscanyURI.getListenPort())); + if (tuscanyURI.isMulticastDisabled()) { + map.put("nomcast", "true"); + } + if (tuscanyURI.getRemotes().size() > 0) { + String routes = ""; + for (int i=0; i<tuscanyURI.getRemotes().size(); i++) { + routes += tuscanyURI.getRemotes().get(i); + if (i < tuscanyURI.getRemotes().size()) { + routes += ","; + } + } + map.put("routes", routes); + } + } + private void setConfig(Map<String, String> attributes) { String portStr = attributes.get("port"); if (portStr != null) { diff --git a/sca-java-2.x/trunk/modules/endpoint-tribes/src/main/java/org/apache/tuscany/sca/endpoint/tribes/TribesDomainRegistryFactory.java b/sca-java-2.x/trunk/modules/endpoint-tribes/src/main/java/org/apache/tuscany/sca/endpoint/tribes/TribesDomainRegistryFactory.java index 68add08276..91314b4c37 100644 --- a/sca-java-2.x/trunk/modules/endpoint-tribes/src/main/java/org/apache/tuscany/sca/endpoint/tribes/TribesDomainRegistryFactory.java +++ b/sca-java-2.x/trunk/modules/endpoint-tribes/src/main/java/org/apache/tuscany/sca/endpoint/tribes/TribesDomainRegistryFactory.java @@ -28,7 +28,7 @@ import org.apache.tuscany.sca.runtime.EndpointRegistry; * given domain */ public class TribesDomainRegistryFactory extends BaseDomainRegistryFactory { - private final static String[] schemes = new String[] {"multicast", "tribes"}; + private final static String[] schemes = new String[] {"multicast", "tribes", "tuscany"}; /** * @param extensionRegistry |