You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by io...@apache.org on 2011/12/03 19:49:06 UTC
svn commit: r1209977 - in /karaf/cellar/trunk:
features/src/main/java/org/apache/karaf/cellar/features/
features/src/main/java/org/apache/karaf/cellar/features/shell/
hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/
management/src/main/java/o...
Author: iocanel
Date: Sat Dec 3 18:49:05 2011
New Revision: 1209977
URL: http://svn.apache.org/viewvc?rev=1209977&view=rev
Log:
[KARAF-1081] Refactored Group to implement MultiNode interface used by the merge policy.
Modified:
karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/FeaturesSynchronizer.java
karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/shell/FeatureCommandSupport.java
karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastClusterManager.java
karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastGroupManager.java
karaf/cellar/trunk/management/src/main/java/org/apache/karaf/cellar/management/internal/CellarGroupMBeanImpl.java
karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupDeleteCommand.java
karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupPickCommand.java
karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupSupport.java
karaf/cellar/trunk/webconsole/src/main/java/org/apache/karaf/cellar/webconsole/CellarPlugin.java
Modified: karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/FeaturesSynchronizer.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/FeaturesSynchronizer.java?rev=1209977&r1=1209976&r2=1209977&view=diff
==============================================================================
--- karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/FeaturesSynchronizer.java (original)
+++ karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/FeaturesSynchronizer.java Sat Dec 3 18:49:05 2011
@@ -71,6 +71,7 @@ public class FeaturesSynchronizer extend
*/
public void pull(Group group) {
if (group != null) {
+ LOGGER.info("CELLAR FEATURES: Pulling features from group {}.",group.getName());
String groupName = group.getName();
List<String> repositories = clusterManager.getList(Constants.REPOSITORIES + Configurations.SEPARATOR + groupName);
Map<FeatureInfo, Boolean> features = clusterManager.getMap(Constants.FEATURES + Configurations.SEPARATOR + groupName);
@@ -133,6 +134,7 @@ public class FeaturesSynchronizer extend
public void push(Group group) {
if (group != null) {
String groupName = group.getName();
+ LOGGER.info("CELLAR FEATURES: Pulling features from group {}.",groupName);
//List<String> repositories = clusterManager.getList(Constants.REPOSITORIES + Configurations.SEPARATOR + groupName);
Map<FeatureInfo, Boolean> features = clusterManager.getMap(Constants.FEATURES + Configurations.SEPARATOR + groupName);
clusterManager.getList(Constants.FEATURES + Configurations.SEPARATOR + groupName);
Modified: karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/shell/FeatureCommandSupport.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/shell/FeatureCommandSupport.java?rev=1209977&r1=1209976&r2=1209977&view=diff
==============================================================================
--- karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/shell/FeatureCommandSupport.java (original)
+++ karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/shell/FeatureCommandSupport.java Sat Dec 3 18:49:05 2011
@@ -18,7 +18,6 @@ import org.apache.karaf.cellar.core.Grou
import org.apache.karaf.cellar.core.shell.CellarCommandSupport;
import org.apache.karaf.cellar.features.Constants;
import org.apache.karaf.cellar.features.FeatureInfo;
-import org.apache.felix.gogo.commands.Command;
import org.apache.karaf.features.Feature;
import org.apache.karaf.features.FeaturesService;
import org.osgi.framework.BundleContext;
@@ -53,7 +52,7 @@ public abstract class FeatureCommandSupp
try {
Thread.currentThread().setContextClassLoader(getClass().getClassLoader());
Group group = groupManager.findGroupByName(groupName);
- if (group == null || group.getMembers().isEmpty()) {
+ if (group == null || group.getNodes().isEmpty()) {
FeatureInfo info = new FeatureInfo(feature, version);
Map<FeatureInfo, Boolean> features = clusterManager.getMap(Constants.FEATURES + Configurations.SEPARATOR + groupName);
//1st check the existing configuration
Modified: karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastClusterManager.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastClusterManager.java?rev=1209977&r1=1209976&r2=1209977&view=diff
==============================================================================
--- karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastClusterManager.java (original)
+++ karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastClusterManager.java Sat Dec 3 18:49:05 2011
@@ -14,16 +14,11 @@
package org.apache.karaf.cellar.hazelcast;
import com.hazelcast.core.Cluster;
-import com.hazelcast.core.IQueue;
-import com.hazelcast.core.ITopic;
import com.hazelcast.core.IdGenerator;
import com.hazelcast.core.Member;
import org.apache.karaf.cellar.core.ClusterManager;
-import org.apache.karaf.cellar.core.Dispatcher;
import org.apache.karaf.cellar.core.Group;
import org.apache.karaf.cellar.core.Node;
-import org.apache.karaf.cellar.core.event.EventConsumer;
-import org.apache.karaf.cellar.core.event.EventProducer;
import org.apache.karaf.cellar.core.utils.CombinedClassLoader;
import org.osgi.service.cm.ConfigurationAdmin;
@@ -149,7 +144,7 @@ public class HazelcastClusterManager ext
@Override
public Set<Node> listNodesByGroup(Group group) {
- return group.getMembers();
+ return group.getNodes();
}
/**
Modified: karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastGroupManager.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastGroupManager.java?rev=1209977&r1=1209976&r2=1209977&view=diff
==============================================================================
--- karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastGroupManager.java (original)
+++ karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastGroupManager.java Sat Dec 3 18:49:05 2011
@@ -202,7 +202,7 @@ public class HazelcastGroupManager imple
Collection<Group> groupCollection = groupMap.values();
if (groupCollection != null && !groupCollection.isEmpty()) {
for (Group group : groupCollection) {
- if (group.getMembers().contains(node)) {
+ if (group.getNodes().contains(node)) {
result.add(group);
}
}
@@ -282,7 +282,7 @@ public class HazelcastGroupManager imple
consumerRegistrations.put(groupName, consumerRegistration);
}
- group.getMembers().add(getNode());
+ group.getNodes().add(getNode());
listGroups().put(groupName, group);
//Add group to configuration
@@ -347,7 +347,7 @@ public class HazelcastGroupManager imple
public void unRegisterGroup(Group group) {
String groupName = group.getName();
//1. Remove local node from group.
- group.getMembers().remove(getNode());
+ group.getNodes().remove(getNode());
listGroups().put(groupName, group);
//2. Unregister group consumers
Modified: karaf/cellar/trunk/management/src/main/java/org/apache/karaf/cellar/management/internal/CellarGroupMBeanImpl.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/management/src/main/java/org/apache/karaf/cellar/management/internal/CellarGroupMBeanImpl.java?rev=1209977&r1=1209976&r2=1209977&view=diff
==============================================================================
--- karaf/cellar/trunk/management/src/main/java/org/apache/karaf/cellar/management/internal/CellarGroupMBeanImpl.java (original)
+++ karaf/cellar/trunk/management/src/main/java/org/apache/karaf/cellar/management/internal/CellarGroupMBeanImpl.java Sat Dec 3 18:49:05 2011
@@ -75,8 +75,8 @@ public class CellarGroupMBeanImpl extend
Group g = groupManager.findGroupByName(name);
List<String> nodes = new LinkedList<String>();
- if (g.getMembers() != null && !g.getMembers().isEmpty()) {
- for (Node n : g.getMembers()) {
+ if (g.getNodes() != null && !g.getNodes().isEmpty()) {
+ for (Node n : g.getNodes()) {
nodes.add(n.getId());
}
ManageGroupCommand command = new ManageGroupCommand(clusterManager.generateId());
@@ -130,7 +130,7 @@ public class CellarGroupMBeanImpl extend
for (Group group : allGroups) {
StringBuffer members = new StringBuffer();
- for (Node node : group.getMembers()) {
+ for (Node node : group.getNodes()) {
members.append(node.getId());
members.append(" ");
}
Modified: karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupDeleteCommand.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupDeleteCommand.java?rev=1209977&r1=1209976&r2=1209977&view=diff
==============================================================================
--- karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupDeleteCommand.java (original)
+++ karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupDeleteCommand.java Sat Dec 3 18:49:05 2011
@@ -49,8 +49,8 @@ public class GroupDeleteCommand extends
}
List<String> nodes = new LinkedList<String>();
- if (g.getMembers() != null && !g.getMembers().isEmpty()) {
- for (Node n : g.getMembers()) {
+ if (g.getNodes() != null && !g.getNodes().isEmpty()) {
+ for (Node n : g.getNodes()) {
nodes.add(n.getId());
}
doExecute(ManageGroupAction.QUIT, group, nodes);
Modified: karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupPickCommand.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupPickCommand.java?rev=1209977&r1=1209976&r2=1209977&view=diff
==============================================================================
--- karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupPickCommand.java (original)
+++ karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupPickCommand.java Sat Dec 3 18:49:05 2011
@@ -21,8 +21,6 @@ import org.apache.karaf.cellar.core.Node
import org.apache.karaf.cellar.core.control.ManageGroupAction;
import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
import java.util.Set;
@@ -47,7 +45,7 @@ public class GroupPickCommand extends Gr
Group sourceGroup = groupManager.findGroupByName(sourceGroupName);
if(sourceGroup != null) {
List<String> eligibleMembers = new LinkedList<String>();
- Set<Node> groupMembers = sourceGroup.getMembers();
+ Set<Node> groupMembers = sourceGroup.getNodes();
for(Node node:groupMembers) {
Set<Group> nodeGroups = groupManager.listGroups(node);
Modified: karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupSupport.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupSupport.java?rev=1209977&r1=1209976&r2=1209977&view=diff
==============================================================================
--- karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupSupport.java (original)
+++ karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupSupport.java Sat Dec 3 18:49:05 2011
@@ -82,8 +82,8 @@ public abstract class GroupSupport exten
ManageGroupResult result = results.get(node);
if (result != null && result.getGroups() != null) {
for (Group g : result.getGroups()) {
- if (g.getMembers() != null && !g.getMembers().isEmpty()) {
- for (Node memeber : g.getMembers()) {
+ if (g.getNodes() != null && !g.getNodes().isEmpty()) {
+ for (Node memeber : g.getNodes()) {
String name = g.getName();
String mark = " ";
if (memeber.equals(clusterManager.getNode()))
Modified: karaf/cellar/trunk/webconsole/src/main/java/org/apache/karaf/cellar/webconsole/CellarPlugin.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/webconsole/src/main/java/org/apache/karaf/cellar/webconsole/CellarPlugin.java?rev=1209977&r1=1209976&r2=1209977&view=diff
==============================================================================
--- karaf/cellar/trunk/webconsole/src/main/java/org/apache/karaf/cellar/webconsole/CellarPlugin.java (original)
+++ karaf/cellar/trunk/webconsole/src/main/java/org/apache/karaf/cellar/webconsole/CellarPlugin.java Sat Dec 3 18:49:05 2011
@@ -198,7 +198,7 @@ public class CellarPlugin extends Abstra
jw.key("name");
jw.value(g.getName());
- Set<Node> members = g.getMembers();
+ Set<Node> members = g.getNodes();
jw.key("members");
jw.array();
if (nodes != null) {