You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2012/05/04 16:10:34 UTC
svn commit: r1333971 - in
/karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/group:
GroupCreateCommand.java GroupDeleteCommand.java GroupJoinCommand.java
GroupPickCommand.java GroupQuitCommand.java GroupSupport.java
Author: jbonofre
Date: Fri May 4 14:10:34 2012
New Revision: 1333971
URL: http://svn.apache.org/viewvc?rev=1333971&view=rev
Log:
[KARAF-1321] Improve the display of cluster groups
Modified:
karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupCreateCommand.java
karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupDeleteCommand.java
karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupJoinCommand.java
karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupPickCommand.java
karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupQuitCommand.java
karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupSupport.java
Modified: karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupCreateCommand.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupCreateCommand.java?rev=1333971&r1=1333970&r2=1333971&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupCreateCommand.java (original)
+++ karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupCreateCommand.java Fri May 4 14:10:34 2012
@@ -24,7 +24,8 @@ public class GroupCreateCommand extends
@Override
protected Object doExecute() throws Exception {
- return groupManager.createGroup(group);
+ groupManager.createGroup(group);
+ return null;
}
}
Modified: karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupDeleteCommand.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupDeleteCommand.java?rev=1333971&r1=1333970&r2=1333971&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupDeleteCommand.java (original)
+++ karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupDeleteCommand.java Fri May 4 14:10:34 2012
@@ -43,26 +43,8 @@ public class GroupDeleteCommand extends
return null;
}
- ClassLoader originalClassLoader = Thread.currentThread().getContextClassLoader();
- try {
- Thread.currentThread().setContextClassLoader(getClass().getClassLoader());
- if (group == null) {
- System.out.println("Group " + groupName + " doesn't exist");
- return null;
- }
- List<String> nodes = new LinkedList<String>();
+ groupManager.deleteGroup(groupName);
- if (group.getNodes() != null && !group.getNodes().isEmpty()) {
- for (Node n : group.getNodes()) {
- nodes.add(n.getId());
- }
- doExecute(ManageGroupAction.QUIT, groupName, null, nodes);
- }
-
- groupManager.deleteGroup(groupName);
- } finally {
- Thread.currentThread().setContextClassLoader(originalClassLoader);
- }
return null;
}
Modified: karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupJoinCommand.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupJoinCommand.java?rev=1333971&r1=1333970&r2=1333971&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupJoinCommand.java (original)
+++ karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupJoinCommand.java Fri May 4 14:10:34 2012
@@ -33,9 +33,10 @@ public class GroupJoinCommand extends Gr
protected Object doExecute() throws Exception {
Group group = groupManager.findGroupByName(groupName);
if (group == null) {
- System.err.println("Cluster group " + groupName + " doesn't exist.");
+ System.err.println("Cluster group " + groupName + " doesn't exist");
return null;
}
+
return doExecute(ManageGroupAction.JOIN, groupName, null, nodes,false);
}
Modified: karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupPickCommand.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupPickCommand.java?rev=1333971&r1=1333970&r2=1333971&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupPickCommand.java (original)
+++ karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupPickCommand.java Fri May 4 14:10:34 2012
@@ -40,12 +40,12 @@ public class GroupPickCommand extends Gr
protected Object doExecute() throws Exception {
Group sourceGroup = groupManager.findGroupByName(sourceGroupName);
if (sourceGroup == null) {
- System.err.println("Source cluster group " + sourceGroupName + " doesn't exist.");
+ System.err.println("Source cluster group " + sourceGroupName + " doesn't exist");
return null;
}
Group targetGroup = groupManager.findGroupByName(targetGroupName);
if (targetGroup == null) {
- System.err.println("Target cluster group " + targetGroupName + " doesn't exist.");
+ System.err.println("Target cluster group " + targetGroupName + " doesn't exist");
return null;
}
@@ -61,9 +61,7 @@ public class GroupPickCommand extends Gr
i++;
}
- doExecute(ManageGroupAction.LIST, null, null, new ArrayList(), false);
-
- return null;
+ return doExecute(ManageGroupAction.LIST, null, null, new ArrayList(), false);
}
}
Modified: karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupQuitCommand.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupQuitCommand.java?rev=1333971&r1=1333970&r2=1333971&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupQuitCommand.java (original)
+++ karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupQuitCommand.java Fri May 4 14:10:34 2012
@@ -33,7 +33,7 @@ public class GroupQuitCommand extends Gr
protected Object doExecute() throws Exception {
Group group = groupManager.findGroupByName(groupName);
if (group == null) {
- System.err.println("Cluster group " + groupName + " doesn't exist.");
+ System.err.println("Cluster group " + groupName + " doesn't exist");
return null;
}
return doExecute(ManageGroupAction.QUIT, groupName, null, nodes, false);
Modified: karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupSupport.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupSupport.java?rev=1333971&r1=1333970&r2=1333971&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupSupport.java (original)
+++ karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupSupport.java Fri May 4 14:10:34 2012
@@ -27,7 +27,8 @@ import java.util.Set;
public abstract class GroupSupport extends ClusterCommandSupport {
- protected static final String OUTPUT_FORMAT = "%1s %-20s %s";
+ protected static final String HEADER_FORMAT = " %-20s %s";
+ protected static final String OUTPUT_FORMAT = "%1s [%-20s] [%s]";
/**
* Executes the command.
@@ -91,20 +92,24 @@ public abstract class GroupSupport exten
if (results == null || results.isEmpty()) {
System.out.println("No result received within given timeout");
} else {
- System.out.println(String.format(OUTPUT_FORMAT, " ", "Node", "Group"));
+ System.out.println(String.format(HEADER_FORMAT, "Group", "Members"));
for (Node node : results.keySet()) {
ManageGroupResult result = results.get(node);
if (result != null && result.getGroups() != null) {
for (Group g : result.getGroups()) {
+ StringBuffer buffer = new StringBuffer();
if (g.getNodes() != null && !g.getNodes().isEmpty()) {
+ String mark = " ";
for (Node member : g.getNodes()) {
- String name = g.getName();
- String mark = " ";
- if (member.equals(clusterManager.getNode()))
+ buffer.append(member.getId());
+ if (member.equals(clusterManager.getNode())) {
mark = "*";
- System.out.println(String.format(OUTPUT_FORMAT, mark, member.getId(), name));
+ buffer.append(mark);
+ }
+ buffer.append(" ");
}
- } else System.out.println(String.format(OUTPUT_FORMAT, "", "", g.getName()));
+ System.out.println(String.format(OUTPUT_FORMAT, mark, g.getName(), buffer.toString()));
+ } else System.out.println(String.format(OUTPUT_FORMAT, "", g.getName(), ""));
}
}
}