Author: jbonofre
Date: Mon Apr 29 08:00:31 2013
New Revision: 1476913
URL: http://svn.apache.org/r1476913
Log:
Code cleanup.
Modified:
karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/ClusterCommandSupport.java
karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/NodePingCommand.java
karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/NodesListCommand.java
karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/SyncCommand.java
karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/consumer/ConsumerStartCommand.java
karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/consumer/ConsumerStatusCommand.java
karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/consumer/ConsumerStopCommand.java
karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/consumer/ConsumerSupport.java
karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupCreateCommand.java
karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupDeleteCommand.java
karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupJoinCommand.java
karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupListCommand.java
karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupPickCommand.java
karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupQuitCommand.java
karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupSetCommand.java
karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupSupport.java
karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/handler/HandlersStartCommand.java
karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/handler/HandlersStatusCommand.java
karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/handler/HandlersStopCommand.java
karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/handler/HandlersSupport.java
karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/producer/ProducerStartCommand.java
karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/producer/ProducerStatusCommand.java
karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/producer/ProducerStopCommand.java
karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/producer/ProducerSupport.java
karaf/cellar/branches/cellar-2.3.x/shell/src/main/resources/OSGI-INF/blueprint/shell-cluster.xml
Modified:
karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/ClusterCommandSupport.java
URL:
http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/ClusterCommandSupport.java?rev=1476913&r1=1476912&r2=1476913&view=diff
==============================================================================
---
karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/ClusterCommandSupport.java
(original)
+++
karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/ClusterCommandSupport.java
Mon Apr 29 08:00:31 2013
@@ -16,6 +16,9 @@ package org.apache.karaf.cellar.shell;
import org.apache.karaf.cellar.core.command.ExecutionContext;
import org.apache.karaf.cellar.core.shell.CellarCommandSupport;
+/**
+ * Abstract cluster shell command support.
+ */
public abstract class ClusterCommandSupport extends CellarCommandSupport {
protected ExecutionContext executionContext;
Modified:
karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/NodePingCommand.java
URL:
http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/NodePingCommand.java?rev=1476913&r1=1476912&r2=1476913&view=diff
==============================================================================
---
karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/NodePingCommand.java
(original)
+++
karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/NodePingCommand.java
Mon Apr 29 08:00:31 2013
@@ -21,18 +21,18 @@ import org.apache.felix.gogo.commands.Co
import java.util.Arrays;
import java.util.HashSet;
-@Command(scope = "cluster", name = "node-ping", description = "Ping a cluster
node.")
+@Command(scope = "cluster", name = "node-ping", description = "Ping a cluster
node")
public class NodePingCommand extends ClusterCommandSupport {
private static Long TIMEOUT = 5000L;
- @Argument(index = 0, name = "node", description = "The node ID to ping.",
required = true, multiValued = false)
+ @Argument(index = 0, name = "node", description = "The node ID to ping",
required = true, multiValued = false)
String nodeId;
- @Argument(index = 1, name = "iterations", description = "The number of
iterations to perform.", required = false, multiValued = false)
+ @Argument(index = 1, name = "iterations", description = "The number of
iterations to perform", required = false, multiValued = false)
Integer iterations = 10;
- @Argument(index = 2, name = "interval", description = "The time in millis
to wait between iterations.", required = false, multiValued = false)
+ @Argument(index = 2, name = "interval", description = "The time in millis
to wait between iterations", required = false, multiValued = false)
Long interval = 1000L;
@Override
Modified:
karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/NodesListCommand.java
URL:
http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/NodesListCommand.java?rev=1476913&r1=1476912&r2=1476913&view=diff
==============================================================================
---
karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/NodesListCommand.java
(original)
+++
karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/NodesListCommand.java
Mon Apr 29 08:00:31 2013
@@ -18,7 +18,7 @@ import org.apache.felix.gogo.commands.Co
import java.util.Set;
-@Command(scope = "cluster", name = "node-list", description = "List the
cluster nodes.")
+@Command(scope = "cluster", name = "node-list", description = "List the
cluster nodes")
public class NodesListCommand extends ClusterCommandSupport {
private static final String HEADER_FORMAT = " %-30s %-20s %-5s";
Modified:
karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/SyncCommand.java
URL:
http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/SyncCommand.java?rev=1476913&r1=1476912&r2=1476913&view=diff
==============================================================================
---
karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/SyncCommand.java
(original)
+++
karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/SyncCommand.java
Mon Apr 29 08:00:31 2013
@@ -21,7 +21,7 @@ import org.osgi.framework.ServiceReferen
import java.util.Set;
-@Command(scope = "cluster", name = "sync", description = "Force the call of
all cluster synchronizers available.")
+@Command(scope = "cluster", name = "sync", description = "Force the call of
all cluster synchronizers available")
public class SyncCommand extends ClusterCommandSupport {
@Override
Modified:
karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/consumer/ConsumerStartCommand.java
URL:
http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/consumer/ConsumerStartCommand.java?rev=1476913&r1=1476912&r2=1476913&view=diff
==============================================================================
---
karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/consumer/ConsumerStartCommand.java
(original)
+++
karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/consumer/ConsumerStartCommand.java
Mon Apr 29 08:00:31 2013
@@ -19,10 +19,10 @@ import org.apache.felix.gogo.commands.Co
import java.util.List;
-@Command(scope = "cluster", name = "consumer-start", description = "Start an
event consumer.")
+@Command(scope = "cluster", name = "consumer-start", description = "Start a
cluster event consumer")
public class ConsumerStartCommand extends ConsumerSupport {
- @Argument(index = 0, name = "node", description = "The node(s) ID.",
required = false, multiValued = true)
+ @Argument(index = 0, name = "node", description = "The node(s) ID",
required = false, multiValued = true)
List<String> nodes;
@Override
Modified:
karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/consumer/ConsumerStatusCommand.java
URL:
http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/consumer/ConsumerStatusCommand.java?rev=1476913&r1=1476912&r2=1476913&view=diff
==============================================================================
---
karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/consumer/ConsumerStatusCommand.java
(original)
+++
karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/consumer/ConsumerStatusCommand.java
Mon Apr 29 08:00:31 2013
@@ -18,10 +18,10 @@ import org.apache.felix.gogo.commands.Co
import java.util.List;
-@Command(scope = "cluster", name = "consumer-status", description = "Status of
an event consumer.")
+@Command(scope = "cluster", name = "consumer-status", description = "Status of
a cluster event consumer")
public class ConsumerStatusCommand extends ConsumerSupport {
- @Argument(index = 0, name = "node", description = "The node(s) ID.",
required = false, multiValued = true)
+ @Argument(index = 0, name = "node", description = "The node(s) ID",
required = false, multiValued = true)
List<String> nodes;
@Override
Modified:
karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/consumer/ConsumerStopCommand.java
URL:
http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/consumer/ConsumerStopCommand.java?rev=1476913&r1=1476912&r2=1476913&view=diff
==============================================================================
---
karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/consumer/ConsumerStopCommand.java
(original)
+++
karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/consumer/ConsumerStopCommand.java
Mon Apr 29 08:00:31 2013
@@ -19,10 +19,10 @@ import org.apache.felix.gogo.commands.Co
import java.util.List;
-@Command(scope = "cluster", name = "consumer-stop", description = "Stop an
event consumer.")
+@Command(scope = "cluster", name = "consumer-stop", description = "Stop a
cluster event consumer")
public class ConsumerStopCommand extends ConsumerSupport {
- @Argument(index = 0, name = "node", description = "The node(s) ID.",
required = false, multiValued = true)
+ @Argument(index = 0, name = "node", description = "The node(s) ID",
required = false, multiValued = true)
List<String> nodes;
@Override
Modified:
karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/consumer/ConsumerSupport.java
URL:
http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/consumer/ConsumerSupport.java?rev=1476913&r1=1476912&r2=1476913&view=diff
==============================================================================
---
karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/consumer/ConsumerSupport.java
(original)
+++
karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/consumer/ConsumerSupport.java
Mon Apr 29 08:00:31 2013
@@ -24,6 +24,9 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
+/**
+ * Abstract cluster event consumer shell command support.
+ */
public abstract class ConsumerSupport extends ClusterCommandSupport {
protected static final String HEADER_FORMAT = " %-30s %-5s";
Modified:
karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupCreateCommand.java
URL:
http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupCreateCommand.java?rev=1476913&r1=1476912&r2=1476913&view=diff
==============================================================================
---
karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupCreateCommand.java
(original)
+++
karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupCreateCommand.java
Mon Apr 29 08:00:31 2013
@@ -17,10 +17,10 @@ import org.apache.felix.gogo.commands.Ar
import org.apache.felix.gogo.commands.Command;
import org.apache.karaf.cellar.core.Group;
-@Command(scope = "cluster", name = "group-create", description = "Create a
cluster group.")
+@Command(scope = "cluster", name = "group-create", description = "Create a
cluster group")
public class GroupCreateCommand extends GroupSupport {
- @Argument(index = 0, name = "group", description = "The cluster group
name.", required = true, multiValued = false)
+ @Argument(index = 0, name = "group", description = "The cluster group
name", required = true, multiValued = false)
String groupName;
@Override
Modified:
karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupDeleteCommand.java
URL:
http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupDeleteCommand.java?rev=1476913&r1=1476912&r2=1476913&view=diff
==============================================================================
---
karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupDeleteCommand.java
(original)
+++
karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupDeleteCommand.java
Mon Apr 29 08:00:31 2013
@@ -14,18 +14,13 @@
package org.apache.karaf.cellar.shell.group;
import org.apache.karaf.cellar.core.Group;
-import org.apache.karaf.cellar.core.Node;
-import org.apache.karaf.cellar.core.control.ManageGroupAction;
import org.apache.felix.gogo.commands.Argument;
import org.apache.felix.gogo.commands.Command;
-import java.util.LinkedList;
-import java.util.List;
-
-@Command(scope = "cluster", name = "group-delete", description = "Delete a
cluster group.")
+@Command(scope = "cluster", name = "group-delete", description = "Delete a
cluster group")
public class GroupDeleteCommand extends GroupSupport {
- @Argument(index = 0, name = "group", description = "The cluster group
name.", required = true, multiValued = false)
+ @Argument(index = 0, name = "group", description = "The cluster group
name", required = true, multiValued = false)
String groupName;
@Override
Modified:
karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupJoinCommand.java
URL:
http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupJoinCommand.java?rev=1476913&r1=1476912&r2=1476913&view=diff
==============================================================================
---
karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupJoinCommand.java
(original)
+++
karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupJoinCommand.java
Mon Apr 29 08:00:31 2013
@@ -20,13 +20,13 @@ import org.apache.felix.gogo.commands.Co
import java.util.List;
-@Command(scope = "cluster", name = "group-join", description = "Join a cluster
group.")
+@Command(scope = "cluster", name = "group-join", description = "Join a cluster
group")
public class GroupJoinCommand extends GroupSupport {
- @Argument(index = 0, name = "group", description = "The cluster group
name.", required = true, multiValued = false)
+ @Argument(index = 0, name = "group", description = "The cluster group
name", required = true, multiValued = false)
String groupName;
- @Argument(index = 1, name = "node", description = "The node(s) ID.",
required = false, multiValued = true)
+ @Argument(index = 1, name = "node", description = "The node(s) ID",
required = false, multiValued = true)
List<String> nodes;
@Override
Modified:
karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupListCommand.java
URL:
http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupListCommand.java?rev=1476913&r1=1476912&r2=1476913&view=diff
==============================================================================
---
karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupListCommand.java
(original)
+++
karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupListCommand.java
Mon Apr 29 08:00:31 2013
@@ -19,10 +19,10 @@ import org.apache.felix.gogo.commands.Co
import java.util.List;
-@Command(scope = "cluster", name = "group-list", description = "List cluster
groups.")
+@Command(scope = "cluster", name = "group-list", description = "List cluster
groups")
public class GroupListCommand extends GroupSupport {
- @Argument(index = 0, name = "node", description = "The node(s) ID.",
required = false, multiValued = true)
+ @Argument(index = 0, name = "node", description = "The node(s) ID",
required = false, multiValued = true)
List<String> nodes;
@Override
Modified:
karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupPickCommand.java
URL:
http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupPickCommand.java?rev=1476913&r1=1476912&r2=1476913&view=diff
==============================================================================
---
karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupPickCommand.java
(original)
+++
karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupPickCommand.java
Mon Apr 29 08:00:31 2013
@@ -24,16 +24,16 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Set;
-@Command(scope = "cluster", name = "group-pick", description = "Pick a number
of nodes from one cluster group and moves them into another.")
+@Command(scope = "cluster", name = "group-pick", description = "Pick a number
of nodes from one cluster group and moves them into another")
public class GroupPickCommand extends GroupSupport {
- @Argument(index = 0, name = "source", description = "The source cluster
group name that will act as a selection pool.", required = true, multiValued =
false)
+ @Argument(index = 0, name = "source", description = "The source cluster
group name that will act as a selection pool", required = true, multiValued =
false)
String sourceGroupName;
- @Argument(index = 1, name = "destination", description = "The destination
cluster group name.", required = true, multiValued = false)
+ @Argument(index = 1, name = "destination", description = "The destination
cluster group name", required = true, multiValued = false)
String targetGroupName;
- @Argument(index = 2, name = "count", description = "The number of nodes to
transfer.", required = false, multiValued = false)
+ @Argument(index = 2, name = "count", description = "The number of nodes to
transfer", required = false, multiValued = false)
int count = 1;
@Override
Modified:
karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupQuitCommand.java
URL:
http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupQuitCommand.java?rev=1476913&r1=1476912&r2=1476913&view=diff
==============================================================================
---
karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupQuitCommand.java
(original)
+++
karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupQuitCommand.java
Mon Apr 29 08:00:31 2013
@@ -20,13 +20,13 @@ import org.apache.felix.gogo.commands.Co
import java.util.List;
-@Command(scope = "cluster", name = "group-quit", description = "Quit a cluster
group.")
+@Command(scope = "cluster", name = "group-quit", description = "Quit a cluster
group")
public class GroupQuitCommand extends GroupSupport {
- @Argument(index = 0, name = "group", description = "The cluster group
name.", required = true, multiValued = false)
+ @Argument(index = 0, name = "group", description = "The cluster group
name", required = true, multiValued = false)
String groupName;
- @Argument(index = 1, name = "node", description = "The node(s) ID.",
required = false, multiValued = true)
+ @Argument(index = 1, name = "node", description = "The node(s) ID",
required = false, multiValued = true)
List<String> nodes;
@Override
Modified:
karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupSetCommand.java
URL:
http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupSetCommand.java?rev=1476913&r1=1476912&r2=1476913&view=diff
==============================================================================
---
karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupSetCommand.java
(original)
+++
karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupSetCommand.java
Mon Apr 29 08:00:31 2013
@@ -20,13 +20,13 @@ import org.apache.felix.gogo.commands.Co
import java.util.List;
-@Command(scope = "cluster", name = "group-set", description = "Set the target
nodes for a specific cluster group.")
+@Command(scope = "cluster", name = "group-set", description = "Set the target
nodes for a specific cluster group")
public class GroupSetCommand extends GroupSupport {
- @Argument(index = 0, name = "group", description = "The cluster group
name.", required = true, multiValued = false)
+ @Argument(index = 0, name = "group", description = "The cluster group
name", required = true, multiValued = false)
String groupName;
- @Argument(index = 1, name = "node", description = "The node(s) ID.",
required = false, multiValued = true)
+ @Argument(index = 1, name = "node", description = "The node(s) ID",
required = false, multiValued = true)
List<String> nodes;
@Override
Modified:
karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupSupport.java
URL:
http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupSupport.java?rev=1476913&r1=1476912&r2=1476913&view=diff
==============================================================================
---
karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupSupport.java
(original)
+++
karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupSupport.java
Mon Apr 29 08:00:31 2013
@@ -25,6 +25,9 @@ import java.util.HashSet;
import java.util.Map;
import java.util.Set;
+/**
+ * Abstract cluster group shell command support.
+ */
public abstract class GroupSupport extends ClusterCommandSupport {
protected static final String HEADER_FORMAT = " %-20s %s";
@@ -33,11 +36,11 @@ public abstract class GroupSupport exten
/**
* Executes the command.
*
- * @param action
- * @param group
- * @param nodes
- * @return
- * @throws Exception
+ * @param action the cluster group action.
+ * @param group the cluster group name.
+ * @param nodes the node IDs.
+ * @return the Object resulting of the command execution.
+ * @throws Exception in case of execution failure.
*/
protected Object doExecute(ManageGroupAction action, String group, Group
source, Collection<String> nodes) throws Exception {
return doExecute(action, group, source, nodes, true);
@@ -46,12 +49,12 @@ public abstract class GroupSupport exten
/**
* Executes the command.
*
- * @param action
- * @param group
- * @param nodeIds
- * @param suppressOutput
- * @return
- * @throws Exception
+ * @param action the cluster group action.
+ * @param group the cluster group name.
+ * @param nodeIds the node IDs.
+ * @param suppressOutput true to suppress command execution output, false
else.
+ * @return the Object resulting of the command execution.
+ * @throws Exception in case of execution failure.
*/
protected Object doExecute(ManageGroupAction action, String group, Group
source, Collection<String> nodeIds, Boolean suppressOutput) throws Exception {
Modified:
karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/handler/HandlersStartCommand.java
URL:
http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/handler/HandlersStartCommand.java?rev=1476913&r1=1476912&r2=1476913&view=diff
==============================================================================
---
karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/handler/HandlersStartCommand.java
(original)
+++
karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/handler/HandlersStartCommand.java
Mon Apr 29 08:00:31 2013
@@ -18,13 +18,13 @@ import org.apache.felix.gogo.commands.Co
import java.util.List;
-@Command(scope = "cluster", name = "handler-start", description = "Start an
event handler.")
+@Command(scope = "cluster", name = "handler-start", description = "Start a
cluster event handler")
public class HandlersStartCommand extends HandlersSupport {
- @Argument(index = 0, name = "handler", description = "The event handler
ID.", required = true, multiValued = false)
+ @Argument(index = 0, name = "handler", description = "The event handler",
required = true, multiValued = false)
String handler;
- @Argument(index = 1, name = "node", description = "The node(s) ID.",
required = false, multiValued = true)
+ @Argument(index = 1, name = "node", description = "The node(s) ID",
required = false, multiValued = true)
List<String> nodes;
@Override
Modified:
karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/handler/HandlersStatusCommand.java
URL:
http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/handler/HandlersStatusCommand.java?rev=1476913&r1=1476912&r2=1476913&view=diff
==============================================================================
---
karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/handler/HandlersStatusCommand.java
(original)
+++
karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/handler/HandlersStatusCommand.java
Mon Apr 29 08:00:31 2013
@@ -18,13 +18,13 @@ import org.apache.felix.gogo.commands.Co
import java.util.List;
-@Command(scope = "cluster", name = "handler-status", description = "Status of
an event handler.")
+@Command(scope = "cluster", name = "handler-status", description = "Status of
a cluster event handler")
public class HandlersStatusCommand extends HandlersSupport {
- @Argument(index = 0, name = "handler", description = "The event handler
ID.", required = false, multiValued = false)
+ @Argument(index = 0, name = "handler", description = "The event handler",
required = false, multiValued = false)
String handler;
- @Argument(index = 1, name = "node", description = "The node(s) ID.",
required = false, multiValued = true)
+ @Argument(index = 1, name = "node", description = "The node(s) ID",
required = false, multiValued = true)
List<String> nodes;
@Override
Modified:
karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/handler/HandlersStopCommand.java
URL:
http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/handler/HandlersStopCommand.java?rev=1476913&r1=1476912&r2=1476913&view=diff
==============================================================================
---
karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/handler/HandlersStopCommand.java
(original)
+++
karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/handler/HandlersStopCommand.java
Mon Apr 29 08:00:31 2013
@@ -18,13 +18,13 @@ import org.apache.felix.gogo.commands.Co
import java.util.List;
-@Command(scope = "cluster", name = "handler-stop", description = "Stop an
event handler.")
+@Command(scope = "cluster", name = "handler-stop", description = "Stop a
cluster event handler")
public class HandlersStopCommand extends HandlersSupport {
- @Argument(index = 0, name = "handler", description = "The event handler
ID.", required = true, multiValued = false)
+ @Argument(index = 0, name = "handler", description = "The event handler",
required = true, multiValued = false)
String handler;
- @Argument(index = 1, name = "node", description = "The node(s) ID.",
required = false, multiValued = true)
+ @Argument(index = 1, name = "node", description = "The node(s) ID",
required = false, multiValued = true)
List<String> nodes;
@Override
Modified:
karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/handler/HandlersSupport.java
URL:
http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/handler/HandlersSupport.java?rev=1476913&r1=1476912&r2=1476913&view=diff
==============================================================================
---
karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/handler/HandlersSupport.java
(original)
+++
karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/handler/HandlersSupport.java
Mon Apr 29 08:00:31 2013
@@ -23,6 +23,9 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
+/**
+ * Abstract cluster event handler shell command support.
+ */
public abstract class HandlersSupport extends ClusterCommandSupport {
protected static final String HEADER_FORMAT = " %-30s %-5s %s";
Modified:
karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/producer/ProducerStartCommand.java
URL:
http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/producer/ProducerStartCommand.java?rev=1476913&r1=1476912&r2=1476913&view=diff
==============================================================================
---
karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/producer/ProducerStartCommand.java
(original)
+++
karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/producer/ProducerStartCommand.java
Mon Apr 29 08:00:31 2013
@@ -19,10 +19,10 @@ import org.apache.felix.gogo.commands.Co
import java.util.List;
-@Command(scope = "cluster", name = "producer-start", description = "Start an
event producer.")
+@Command(scope = "cluster", name = "producer-start", description = "Start a
cluster event producer")
public class ProducerStartCommand extends ProducerSupport {
- @Argument(index = 0, name = "node", description = "The node(s) ID.",
required = false, multiValued = true)
+ @Argument(index = 0, name = "node", description = "The node(s) ID",
required = false, multiValued = true)
List<String> nodes;
@Override
Modified:
karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/producer/ProducerStatusCommand.java
URL:
http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/producer/ProducerStatusCommand.java?rev=1476913&r1=1476912&r2=1476913&view=diff
==============================================================================
---
karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/producer/ProducerStatusCommand.java
(original)
+++
karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/producer/ProducerStatusCommand.java
Mon Apr 29 08:00:31 2013
@@ -18,10 +18,10 @@ import org.apache.felix.gogo.commands.Co
import java.util.List;
-@Command(scope = "cluster", name = "producer-start", description = "Status of
an event producer.")
+@Command(scope = "cluster", name = "producer-start", description = "Status of
a cluster event producer")
public class ProducerStatusCommand extends ProducerSupport {
- @Argument(index = 0, name = "node", description = "The node(s) ID.",
required = false, multiValued = true)
+ @Argument(index = 0, name = "node", description = "The node(s) ID",
required = false, multiValued = true)
List<String> nodes;
@Override
Modified:
karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/producer/ProducerStopCommand.java
URL:
http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/producer/ProducerStopCommand.java?rev=1476913&r1=1476912&r2=1476913&view=diff
==============================================================================
---
karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/producer/ProducerStopCommand.java
(original)
+++
karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/producer/ProducerStopCommand.java
Mon Apr 29 08:00:31 2013
@@ -19,10 +19,10 @@ import org.apache.felix.gogo.commands.Co
import java.util.List;
-@Command(scope = "cluster", name = "producer-stop", description = "Stop an
event producer")
+@Command(scope = "cluster", name = "producer-stop", description = "Stop a
cluster event producer")
public class ProducerStopCommand extends ProducerSupport {
- @Argument(index = 0, name = "node", description = "The node(s) ID.",
required = false, multiValued = true)
+ @Argument(index = 0, name = "node", description = "The node(s) ID",
required = false, multiValued = true)
List<String> nodes;
@Override
Modified:
karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/producer/ProducerSupport.java
URL:
http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/producer/ProducerSupport.java?rev=1476913&r1=1476912&r2=1476913&view=diff
==============================================================================
---
karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/producer/ProducerSupport.java
(original)
+++
karaf/cellar/branches/cellar-2.3.x/shell/src/main/java/org/apache/karaf/cellar/shell/producer/ProducerSupport.java
Mon Apr 29 08:00:31 2013
@@ -24,6 +24,9 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
+/**
+ * Abstract cluster event producer shell command support.
+ */
public abstract class ProducerSupport extends ClusterCommandSupport {
protected static final String HEADER_FORMAT = " %-30s %-5s";
Modified:
karaf/cellar/branches/cellar-2.3.x/shell/src/main/resources/OSGI-INF/blueprint/shell-cluster.xml
URL:
http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.3.x/shell/src/main/resources/OSGI-INF/blueprint/shell-cluster.xml?rev=1476913&r1=1476912&r2=1476913&view=diff
==============================================================================
---
karaf/cellar/branches/cellar-2.3.x/shell/src/main/resources/OSGI-INF/blueprint/shell-cluster.xml
(original)
+++
karaf/cellar/branches/cellar-2.3.x/shell/src/main/resources/OSGI-INF/blueprint/shell-cluster.xml
Mon Apr 29 08:00:31 2013
@@ -15,28 +15,24 @@
-->
<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0";
default-activation="lazy">
- <!-- Command Bundle -->
<command-bundle xmlns="http://karaf.apache.org/xmlns/shell/v1.0.0";>
<command name="cluster/node-list">
<action class="org.apache.karaf.cellar.shell.NodesListCommand">
<property name="clusterManager" ref="clusterManager"/>
</action>
</command>
-
<command name="cluster/node-ping">
<action class="org.apache.karaf.cellar.shell.NodePingCommand">
<property name="clusterManager" ref="clusterManager"/>
<property name="executionContext" ref="executionContext"/>
</action>
</command>
-
<command name="cluster/sync">
<action class="org.apache.karaf.cellar.shell.SyncCommand">
<property name="clusterManager" ref="clusterManager"/>
<property name="groupManager" ref="groupManager"/>
</action>
</command>
-
<command name="cluster/consumer-start">
<action
class="org.apache.karaf.cellar.shell.consumer.ConsumerStartCommand">
<property name="clusterManager" ref="clusterManager"/>
@@ -46,7 +42,6 @@
<ref component-id="allNodesCompleter"/>
</completers>
</command>
-
<command name="cluster/consumer-stop">
<action
class="org.apache.karaf.cellar.shell.consumer.ConsumerStopCommand">
<property name="clusterManager" ref="clusterManager"/>
@@ -56,7 +51,6 @@
<ref component-id="allNodesCompleter"/>
</completers>
</command>
-
<command name="cluster/consumer-status">
<action
class="org.apache.karaf.cellar.shell.consumer.ConsumerStatusCommand">
<property name="clusterManager" ref="clusterManager"/>
@@ -66,7 +60,6 @@
<ref component-id="allNodesCompleter"/>
</completers>
</command>
-
<command name="cluster/producer-start">
<action
class="org.apache.karaf.cellar.shell.producer.ProducerStartCommand">
<property name="clusterManager" ref="clusterManager"/>
@@ -76,7 +69,6 @@
<ref component-id="allNodesCompleter"/>
</completers>
</command>
-
<command name="cluster/producer-stop">
<action
class="org.apache.karaf.cellar.shell.producer.ProducerStopCommand">
<property name="clusterManager" ref="clusterManager"/>
@@ -86,7 +78,6 @@
<ref component-id="allNodesCompleter"/>
</completers>
</command>
-
<command name="cluster/producer-status">
<action
class="org.apache.karaf.cellar.shell.producer.ProducerStatusCommand">
<property name="clusterManager" ref="clusterManager"/>
@@ -96,7 +87,6 @@
<ref component-id="allNodesCompleter"/>
</completers>
</command>
-
<command name="cluster/handler-start">
<action
class="org.apache.karaf.cellar.shell.handler.HandlersStartCommand">
<property name="clusterManager" ref="clusterManager"/>
@@ -106,7 +96,6 @@
<ref component-id="allNodesCompleter"/>
</completers>
</command>
-
<command name="cluster/handler-stop">
<action
class="org.apache.karaf.cellar.shell.handler.HandlersStopCommand">
<property name="clusterManager" ref="clusterManager"/>
@@ -116,7 +105,6 @@
<ref component-id="allNodesCompleter"/>
</completers>
</command>
-
<command name="cluster/handler-status">
<action
class="org.apache.karaf.cellar.shell.handler.HandlersStatusCommand">
<property name="clusterManager" ref="clusterManager"/>
@@ -126,7 +114,6 @@
<ref component-id="allNodesCompleter"/>
</completers>
</command>
-
<command name="cluster/group-join">
<action
class="org.apache.karaf.cellar.shell.group.GroupJoinCommand">
<property name="clusterManager" ref="clusterManager"/>
@@ -138,7 +125,6 @@
<ref component-id="allNodesCompleter"/>
</completers>
</command>
-
<command name="cluster/group-quit">
<action
class="org.apache.karaf.cellar.shell.group.GroupQuitCommand">
<property name="clusterManager" ref="clusterManager"/>
@@ -150,7 +136,6 @@
<ref component-id="allNodesCompleter"/>
</completers>
</command>
-
<command name="cluster/group-set">
<action
class="org.apache.karaf.cellar.shell.group.GroupSetCommand">
<property name="clusterManager" ref="clusterManager"/>
@@ -162,7 +147,6 @@
<ref component-id="allNodesCompleter"/>
</completers>
</command>
-
<command name="cluster/group-pick">
<action
class="org.apache.karaf.cellar.shell.group.GroupPickCommand">
<property name="clusterManager" ref="clusterManager"/>
@@ -173,7 +157,6 @@
<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"/>
@@ -181,7 +164,6 @@
<property name="executionContext" ref="executionContext"/>
</action>
</command>
-
<command name="cluster/group-create">
<action
class="org.apache.karaf.cellar.shell.group.GroupCreateCommand">
<property name="clusterManager" ref="clusterManager"/>
@@ -189,7 +171,6 @@
<property name="executionContext" ref="executionContext"/>
</action>
</command>
-
<command name="cluster/group-delete">
<action
class="org.apache.karaf.cellar.shell.group.GroupDeleteCommand">
<property name="clusterManager" ref="clusterManager"/>
@@ -200,27 +181,21 @@
<ref component-id="allGroupCompleter"/>
</completers>
</command>
-
</command-bundle>
- <!-- Reference to the Cluster Manager -->
<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.shell.completer.AllNodeCompleter">
<property name="clusterManager" ref="clusterManager"/>
</bean>
-
<bean id="allGroupCompleter"
class="org.apache.karaf.cellar.core.shell.completer.AllGroupsCompleter">
<property name="groupManager" ref="groupManager"/>
</bean>
-
<bean id="localGroupCompleter"
class="org.apache.karaf.cellar.core.shell.completer.LocalGroupsCompleter">
<property name="groupManager" ref="groupManager"/>
</bean>
-
<bean id="otherGroupCompleter"
class="org.apache.karaf.cellar.core.shell.completer.OtherGroupsCompleter">
<property name="groupManager" ref="groupManager"/>
</bean>
