Author: iocanel
Date: Thu Aug 25 21:44:36 2011
New Revision: 1161768
URL: http://svn.apache.org/viewvc?rev=1161768&view=rev
Log:
Merged from trunk
[KARAF-831] Added cluster:group-pick command. Also added output suppression
support for all group commands. This is really useful for command composition.
[from revision 1161766]
Added:
karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupPickCommand.java
- copied unchanged from r1161766,
karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupPickCommand.java
Modified:
karaf/cellar/branches/cellar-2.2.x/ (props changed)
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/GroupListCommand.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/GroupSetCommand.java
karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupSupport.java
karaf/cellar/branches/cellar-2.2.x/shell/src/main/resources/OSGI-INF/blueprint/shell-cluster.xml
Propchange: karaf/cellar/branches/cellar-2.2.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Aug 25 21:44:36 2011
@@ -1 +1 @@
-/karaf/cellar/trunk:1101991,1103447,1103456,1125012,1125040,1131478,1142446,1149693,1150108,1160898,1161074,1161494,1161515
+/karaf/cellar/trunk:1101991,1103447,1103456,1125012,1125040,1131478,1142446,1149693,1150108,1160898,1161074,1161494,1161515,1161766
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=1161768&r1=1161767&r2=1161768&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
Thu Aug 25 21:44:36 2011
@@ -39,7 +39,7 @@ public class GroupJoinCommand extends Gr
*/
@Override
protected Object doExecute() throws Exception {
- return doExecute(ManageGroupAction.JOIN, group, nodes);
+ return doExecute(ManageGroupAction.JOIN, group, nodes,false);
}
}
Modified:
karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupListCommand.java
URL:
http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupListCommand.java?rev=1161768&r1=1161767&r2=1161768&view=diff
==============================================================================
---
karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupListCommand.java
(original)
+++
karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupListCommand.java
Thu Aug 25 21:44:36 2011
@@ -36,7 +36,7 @@ public class GroupListCommand extends Gr
*/
@Override
protected Object doExecute() throws Exception {
- return doExecute(ManageGroupAction.LIST, null, nodes);
+ return doExecute(ManageGroupAction.LIST, null, nodes,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=1161768&r1=1161767&r2=1161768&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
Thu Aug 25 21:44:36 2011
@@ -39,7 +39,7 @@ public class GroupQuitCommand extends Gr
*/
@Override
protected Object doExecute() throws Exception {
- return doExecute(ManageGroupAction.QUIT, group, nodes);
+ return doExecute(ManageGroupAction.QUIT, group, nodes,false);
}
}
Modified:
karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupSetCommand.java
URL:
http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupSetCommand.java?rev=1161768&r1=1161767&r2=1161768&view=diff
==============================================================================
---
karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupSetCommand.java
(original)
+++
karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupSetCommand.java
Thu Aug 25 21:44:36 2011
@@ -39,7 +39,7 @@ public class GroupSetCommand extends Gro
*/
@Override
protected Object doExecute() throws Exception {
- return doExecute(ManageGroupAction.SET, group, nodes);
+ return doExecute(ManageGroupAction.SET, group, 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=1161768&r1=1161767&r2=1161768&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
Thu Aug 25 21:44:36 2011
@@ -34,11 +34,26 @@ public abstract class GroupSupport exten
/**
* Executes the command.
- *
+ * @param action
+ * @param group
+ * @param nodes
* @return
* @throws Exception
*/
protected Object doExecute(ManageGroupAction action, String group,
Collection<String> nodes) throws Exception {
+ return doExecute(action,group,nodes,true);
+ }
+
+ /**
+ * Executes the command.
+ * @param action
+ * @param group
+ * @param nodes
+ * @param supressOutput
+ * @return
+ * @throws Exception
+ */
+ protected Object doExecute(ManageGroupAction action, String group,
Collection<String> nodes,Boolean supressOutput) throws Exception {
ManageGroupCommand command = new
ManageGroupCommand(clusterManager.generateId());
Set<Node> recipientList = clusterManager.listNodes(nodes);
@@ -58,6 +73,7 @@ public abstract class GroupSupport exten
}
Map<Node, ManageGroupResult> results =
executionContext.execute(command);
+ if(!supressOutput) {
if (results == null || results.isEmpty()) {
System.out.println("No result received within given timeout");
} else {
@@ -79,6 +95,7 @@ public abstract class GroupSupport exten
}
}
}
+ }
return null;
}
Modified:
karaf/cellar/branches/cellar-2.2.x/shell/src/main/resources/OSGI-INF/blueprint/shell-cluster.xml
URL:
http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/shell/src/main/resources/OSGI-INF/blueprint/shell-cluster.xml?rev=1161768&r1=1161767&r2=1161768&view=diff
==============================================================================
---
karaf/cellar/branches/cellar-2.2.x/shell/src/main/resources/OSGI-INF/blueprint/shell-cluster.xml
(original)
+++
karaf/cellar/branches/cellar-2.2.x/shell/src/main/resources/OSGI-INF/blueprint/shell-cluster.xml
Thu Aug 25 21:44:36 2011
@@ -153,6 +153,17 @@
</completers>
</command>
+ <command name="cluster/group-pick">
+ <action
class="org.apache.karaf.cellar.shell.group.GroupPickCommand">
+ <property name="clusterManager" ref="clusterManager"/>
+ <property name="groupManager" ref="groupManager"/>
+ <property name="executionContext" ref="executionContext"/>
+ </action>
+ <completers>
+ <ref component-id="allGroupCompleter"/>
+ </completers>
+ </command>
+
<command name="cluster/group-list">
<action
class="org.apache.karaf.cellar.shell.group.GroupListCommand">
<property name="clusterManager" ref="clusterManager"/>
@@ -183,9 +194,9 @@
</command-bundle>
<!-- Reference to the Cluster Manager -->
- <reference id="clusterManager"
interface="org.apache.karaf.cellar.core.ClusterManager"/>
- <reference id="groupManager"
interface="org.apache.karaf.cellar.core.GroupManager"/>
- <reference id="executionContext"
interface="org.apache.karaf.cellar.core.command.ExecutionContext"/>
+ <reference id="clusterManager"
interface="org.apache.karaf.cellar.core.ClusterManager"
availability="optional"/>
+ <reference id="groupManager"
interface="org.apache.karaf.cellar.core.GroupManager" availability="optional"/>
+ <reference id="executionContext"
interface="org.apache.karaf.cellar.core.command.ExecutionContext"
availability="optional"/>
<!-- Completers -->
<bean id="allNodesCompleter"
class="org.apache.karaf.cellar.core.completers.AllNodeCompleter">
