Author: bdekruijff at gmail.com
Date: Mon Jan 3 17:19:27 2011
New Revision: 556
Log:
[sandbox] adapted to latest fabric
Modified:
sandbox/bdekruijff/fabrictest/src/main/java/org/amdatu/core/fabrictest/FabricTestService.java
sandbox/bdekruijff/fabrictest/src/main/java/org/amdatu/core/fabrictest/service/FabricTestServiceImpl.java
sandbox/bdekruijff/fabrictest/src/main/java/org/amdatu/core/fabrictest/shell/FabricManagerCommand.java
sandbox/bdekruijff/fabrictest/src/main/java/org/amdatu/core/fabrictest/shell/FabricTestCommand.java
Modified:
sandbox/bdekruijff/fabrictest/src/main/java/org/amdatu/core/fabrictest/FabricTestService.java
==============================================================================
---
sandbox/bdekruijff/fabrictest/src/main/java/org/amdatu/core/fabrictest/FabricTestService.java
(original)
+++
sandbox/bdekruijff/fabrictest/src/main/java/org/amdatu/core/fabrictest/FabricTestService.java
Mon Jan 3 17:19:27 2011
@@ -18,7 +18,7 @@
public interface FabricTestService {
- void registerRemotableService();
+ void registerRemotableService(String serviceGroup);
void unregisterRemotableService();
Modified:
sandbox/bdekruijff/fabrictest/src/main/java/org/amdatu/core/fabrictest/service/FabricTestServiceImpl.java
==============================================================================
---
sandbox/bdekruijff/fabrictest/src/main/java/org/amdatu/core/fabrictest/service/FabricTestServiceImpl.java
(original)
+++
sandbox/bdekruijff/fabrictest/src/main/java/org/amdatu/core/fabrictest/service/FabricTestServiceImpl.java
Mon Jan 3 17:19:27 2011
@@ -21,6 +21,7 @@
import java.util.Hashtable;
import java.util.Map;
+import org.amdatu.core.fabric.remote.DiscoveryService;
import org.amdatu.core.fabric.remote.DistributionService;
import org.amdatu.core.fabrictest.FabricTestService;
import org.amdatu.core.fabrictest.NonRemotableService;
@@ -40,7 +41,7 @@
unregisterRemotableService();
}
- public void registerRemotableService() {
+ public void registerRemotableService(String serviceGroup) {
Dictionary<String, Object> props = new Hashtable<String, Object>();
props.put(DistributionService.SERVICE_INTENTS_PROP, new String[] {});
@@ -53,6 +54,10 @@
new String[] { DistributionService.SERVICE_CONFIGURATION_TYPE });
props.put("org.amdatu.test.prop", "this property should be published
on imported services");
+ if (serviceGroup != null && !"".equals(serviceGroup)) {
+ props.put(DiscoveryService.REMOTE_SERVICEGROUPID_PROP,
serviceGroup);
+ }
+
Component serviceComponent =
m_dependencyManager
.createComponent()
Modified:
sandbox/bdekruijff/fabrictest/src/main/java/org/amdatu/core/fabrictest/shell/FabricManagerCommand.java
==============================================================================
---
sandbox/bdekruijff/fabrictest/src/main/java/org/amdatu/core/fabrictest/shell/FabricManagerCommand.java
(original)
+++
sandbox/bdekruijff/fabrictest/src/main/java/org/amdatu/core/fabrictest/shell/FabricManagerCommand.java
Mon Jan 3 17:19:27 2011
@@ -149,8 +149,8 @@
}
Dictionary<String, Object> props = new Hashtable<String, Object>();
- props.put(ClusterMemberService.CLUSTER_CLUSTERGROUP_PROP,
clusterGroupId);
- props.put(ClusterMemberService.CLUSTER_CLUSTERMEMBER_PROP,
clusterMemberId);
+ props.put(ClusterMemberService.SERVICE_CLUSTERCHANNEL_PROPERTY,
clusterGroupId);
+ props.put(ClusterMemberService.SERVICE_CLUSTERMEMBER_PROPERTY,
clusterMemberId);
props.put(TribesClusterMemberServiceImpl.CLUSTER_TRIBES_ARGS_PROP,
args);
if (m_fabricManagerService.createClusterMember(clusterGroupId,
clusterMemberId, props)) {
out.println("New cluster created: " + clusterGroupId + "/" +
clusterMemberId);
@@ -193,8 +193,8 @@
}
Dictionary<String, Object> props = new Hashtable<String, Object>();
- props.put(ClusterMemberService.CLUSTER_CLUSTERGROUP_PROP,
clusterGroupId);
- props.put(ClusterMemberService.CLUSTER_CLUSTERMEMBER_PROP,
clusterMemberId);
+ props.put(ClusterMemberService.SERVICE_CLUSTERCHANNEL_PROPERTY,
clusterGroupId);
+ props.put(ClusterMemberService.SERVICE_CLUSTERMEMBER_PROPERTY,
clusterMemberId);
props.put(TribesClusterMemberServiceImpl.CLUSTER_TRIBES_ARGS_PROP,
args);
if (m_fabricManagerService.createClusterMember(clusterGroupId,
clusterMemberId, props)
&&
m_fabricManagerService.createDistribution(clusterGroupId, serviceGroupId)
Modified:
sandbox/bdekruijff/fabrictest/src/main/java/org/amdatu/core/fabrictest/shell/FabricTestCommand.java
==============================================================================
---
sandbox/bdekruijff/fabrictest/src/main/java/org/amdatu/core/fabrictest/shell/FabricTestCommand.java
(original)
+++
sandbox/bdekruijff/fabrictest/src/main/java/org/amdatu/core/fabrictest/shell/FabricTestCommand.java
Mon Jan 3 17:19:27 2011
@@ -78,7 +78,7 @@
StringTokenizer st = new StringTokenizer(s, " ");
st.nextToken(); // ignore command itself
- if (st.countTokens() != 1) {
+ if (st.countTokens() < 1) {
out.println(getUsage());
return;
}
@@ -86,7 +86,12 @@
String command = st.nextToken();
if (command.equals("register")) {
- m_fabricTestService.registerRemotableService();
+
+ String serviceGroup = null;
+ if (st.hasMoreElements()) {
+ serviceGroup = st.nextToken();
+ }
+ m_fabricTestService.registerRemotableService(serviceGroup);
return;
}
@@ -153,6 +158,17 @@
}
}
+ private static String rejoinRemainingTokens(StringTokenizer st) {
+ StringBuilder sb = new StringBuilder();
+ while (st.hasMoreTokens()) {
+ sb.append(st.nextToken());
+ if (st.hasMoreTokens()) {
+ sb.append(" ");
+ }
+ }
+ return sb.toString();
+ }
+
class HelloCallable implements Callable<String> {
private final RemotableService m_rs;
