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 2011/09/19 09:13:05 UTC
svn commit: r1172493 - in /karaf/cellar/trunk:
config/src/main/java/org/apache/karaf/cellar/config/shell/
dosgi/src/main/java/org/apache/karaf/cellar/dosgi/shell/
dosgi/src/main/resources/OSGI-INF/blueprint/
features/src/main/java/org/apache/karaf/cell...
Author: jbonofre
Date: Mon Sep 19 07:13:02 2011
New Revision: 1172493
URL: http://svn.apache.org/viewvc?rev=1172493&view=rev
Log:
[KARAF-863] Rename Cellar commands for consistency
Added:
karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/NodePingCommand.java
- copied, changed from r1171612, karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/PingCommand.java
karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/NodesListCommand.java
- copied, changed from r1171612, karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/ListNodesCommand.java
Removed:
karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/ListNodesCommand.java
karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/PingCommand.java
Modified:
karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/shell/ListCommand.java
karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/shell/PropListCommand.java
karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/shell/PropSetCommand.java
karaf/cellar/trunk/dosgi/src/main/java/org/apache/karaf/cellar/dosgi/shell/ListDistributedServicesCommand.java
karaf/cellar/trunk/dosgi/src/main/resources/OSGI-INF/blueprint/shell-dosgi.xml
karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/shell/FeatureCommandSupport.java
karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/shell/InstallFeatureCommand.java
karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/shell/ListGroupFeatures.java
karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/shell/UninstallFeatureCommand.java
karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/consumer/ConsumerStartCommand.java
karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/consumer/ConsumerStatusCommand.java
karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/consumer/ConsumerStopCommand.java
karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupCreateCommand.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/GroupJoinCommand.java
karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupListCommand.java
karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupQuitCommand.java
karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupSetCommand.java
karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/handler/HandlersStartCommand.java
karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/handler/HandlersStatusCommand.java
karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/handler/HandlersStopCommand.java
karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/producer/ProducerStartCommand.java
karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/producer/ProducerStatusCommand.java
karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/producer/ProducerStopCommand.java
karaf/cellar/trunk/shell/src/main/resources/OSGI-INF/blueprint/shell-cluster.xml
Modified: karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/shell/ListCommand.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/shell/ListCommand.java?rev=1172493&r1=1172492&r2=1172493&view=diff
==============================================================================
--- karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/shell/ListCommand.java (original)
+++ karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/shell/ListCommand.java Mon Sep 19 07:13:02 2011
@@ -24,7 +24,7 @@ import java.util.Properties;
/**
* List cluster config command.
*/
-@Command(scope = "cluster", name = "config-list", description = "List the config pids that are assigned to a group")
+@Command(scope = "cluster", name = "config-list", description = "List the configuration PIDs that are assigned to a group")
public class ListCommand extends ConfigCommandSupport {
protected static final String OUTPUT_FORMAT = "%-40s";
@@ -41,12 +41,12 @@ public class ListCommand extends ConfigC
Map<String, Properties> configurationTable = clusterManager.getMap(Constants.CONFIGURATION_MAP + Configurations.SEPARATOR + groupName);
if (configurationTable != null && !configurationTable.isEmpty()) {
- System.out.println(String.format("PIDs for group " + groupName));
+ System.out.println(String.format("Configuration PIDs for group " + groupName));
System.out.println(String.format(OUTPUT_FORMAT, "PID"));
for (String pid : configurationTable.keySet()) {
System.out.println(String.format(OUTPUT_FORMAT, pid));
}
- } else System.err.println("No PIDs found for group " + groupName);
+ } else System.err.println("No configuration PID found for group " + groupName);
} finally {
Thread.currentThread().setContextClassLoader(originalClassLoader);
}
Modified: karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/shell/PropListCommand.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/shell/PropListCommand.java?rev=1172493&r1=1172492&r2=1172493&view=diff
==============================================================================
--- karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/shell/PropListCommand.java (original)
+++ karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/shell/PropListCommand.java Mon Sep 19 07:13:02 2011
@@ -25,7 +25,7 @@ import java.util.Properties;
/**
* Config properties list cluster command.
*/
-@Command(scope = "cluster", name = "config-proplist", description = "List the config pids that are assigned to a group")
+@Command(scope = "cluster", name = "config-proplist", description = "List the configuration PIDs that are assigned to a group")
public class PropListCommand extends CellarCommandSupport {
protected static final String OUTPUT_FORMAT = "%-40s %s";
@@ -33,7 +33,7 @@ public class PropListCommand extends Cel
@Argument(index = 0, name = "group", description = "The name of the group", required = true, multiValued = false)
String groupName;
- @Argument(index = 1, name = "pid", description = "The pid of the configuration", required = true, multiValued = false)
+ @Argument(index = 1, name = "pid", description = "The PID of the configuration", required = true, multiValued = false)
String pid;
@Override
@@ -45,7 +45,7 @@ public class PropListCommand extends Cel
Map<String, Properties> configurationTable = clusterManager.getMap(Constants.CONFIGURATION_MAP + Configurations.SEPARATOR + groupName);
if (configurationTable != null && !configurationTable.isEmpty()) {
- System.out.println(String.format("Property list for PID " + pid + " for group " + groupName));
+ System.out.println(String.format("Property list for configuration PID " + pid + " for group " + groupName));
System.out.println(String.format(OUTPUT_FORMAT, "Key", "Value"));
Properties properties = configurationTable.get(pid);
if (properties != null && !properties.isEmpty())
@@ -53,7 +53,7 @@ public class PropListCommand extends Cel
String value = properties.getProperty((String) key);
System.out.println(String.format(OUTPUT_FORMAT, key, value));
}
- } else System.err.print("No PIDs found for group " + groupName);
+ } else System.err.print("No configuration PID found for group " + groupName);
} finally {
Thread.currentThread().setContextClassLoader(originalClassLoader);
}
Modified: karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/shell/PropSetCommand.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/shell/PropSetCommand.java?rev=1172493&r1=1172492&r2=1172493&view=diff
==============================================================================
--- karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/shell/PropSetCommand.java (original)
+++ karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/shell/PropSetCommand.java Mon Sep 19 07:13:02 2011
@@ -25,13 +25,13 @@ import java.util.Properties;
/**
* Config properties set cluster command.
*/
-@Command(scope = "cluster", name = "config-propset", description = "Sets the a property value for a PID and group")
+@Command(scope = "cluster", name = "config-propset", description = "Sets the a property value for a configuration PID and group")
public class PropSetCommand extends ConfigCommandSupport {
@Argument(index = 0, name = "group", description = "The name of the group", required = true, multiValued = false)
String groupName;
- @Argument(index = 1, name = "pid", description = "The pid of the configuration", required = true, multiValued = false)
+ @Argument(index = 1, name = "pid", description = "The PID of the configuration", required = true, multiValued = false)
String pid;
@Argument(index = 2, name = "key", description = "The key of the property", required = true, multiValued = false)
Modified: karaf/cellar/trunk/dosgi/src/main/java/org/apache/karaf/cellar/dosgi/shell/ListDistributedServicesCommand.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/dosgi/src/main/java/org/apache/karaf/cellar/dosgi/shell/ListDistributedServicesCommand.java?rev=1172493&r1=1172492&r2=1172493&view=diff
==============================================================================
--- karaf/cellar/trunk/dosgi/src/main/java/org/apache/karaf/cellar/dosgi/shell/ListDistributedServicesCommand.java (original)
+++ karaf/cellar/trunk/dosgi/src/main/java/org/apache/karaf/cellar/dosgi/shell/ListDistributedServicesCommand.java Mon Sep 19 07:13:02 2011
@@ -21,7 +21,7 @@ import org.apache.karaf.cellar.dosgi.End
import java.util.Map;
import java.util.Set;
-@Command(scope = "cluster", name = "list-distributed-services", description = "List the remote services")
+@Command(scope = "cluster", name = "list-services", description = "List the distributed services")
public class ListDistributedServicesCommand extends CellarCommandSupport {
private static final String LIST_FORMAT = "%-80s %-20s";
@@ -45,7 +45,7 @@ public class ListDistributedServicesComm
}
} else {
- System.out.println("There are no distributed services.");
+ System.out.println("There are no distributed service");
}
} finally {
Thread.currentThread().setContextClassLoader(originalClassLoader);
Modified: karaf/cellar/trunk/dosgi/src/main/resources/OSGI-INF/blueprint/shell-dosgi.xml
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/dosgi/src/main/resources/OSGI-INF/blueprint/shell-dosgi.xml?rev=1172493&r1=1172492&r2=1172493&view=diff
==============================================================================
--- karaf/cellar/trunk/dosgi/src/main/resources/OSGI-INF/blueprint/shell-dosgi.xml (original)
+++ karaf/cellar/trunk/dosgi/src/main/resources/OSGI-INF/blueprint/shell-dosgi.xml Mon Sep 19 07:13:02 2011
@@ -16,7 +16,7 @@
<!-- Command Bundle -->
<command-bundle xmlns="http://karaf.apache.org/xmlns/shell/v1.0.0">
- <command name="cluster/list-distributed-services">
+ <command name="cluster/list-services">
<action class="org.apache.karaf.cellar.dosgi.shell.ListDistributedServicesCommand">
<property name="clusterManager" ref="clusterManager"/>
<property name="eventTransportFactory" ref="eventTransportFactory"/>
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=1172493&r1=1172492&r2=1172493&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 Mon Sep 19 07:13:02 2011
@@ -30,7 +30,6 @@ import java.util.Map;
/**
* Abstract feature command.
*/
-@Command(scope = "cluster", name = "feature-install", description = "Installs a feature to all members of a group")
public abstract class FeatureCommandSupport extends CellarCommandSupport {
protected static final transient Logger LOGGER = LoggerFactory.getLogger(FeatureCommandSupport.class);
Modified: karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/shell/InstallFeatureCommand.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/shell/InstallFeatureCommand.java?rev=1172493&r1=1172492&r2=1172493&view=diff
==============================================================================
--- karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/shell/InstallFeatureCommand.java (original)
+++ karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/shell/InstallFeatureCommand.java Mon Sep 19 07:13:02 2011
@@ -23,10 +23,10 @@ import org.apache.karaf.features.Feature
/**
* Install feature command.
*/
-@Command(scope = "cluster", name = "features-install", description = "Installs a feature to the group")
+@Command(scope = "cluster", name = "features-install", description = "Installs a feature to the cluster group")
public class InstallFeatureCommand extends FeatureCommandSupport {
- @Argument(index = 0, name = "group", description = "The name of the group that will install the feature", required = true, multiValued = false)
+ @Argument(index = 0, name = "group", description = "The name of the group", required = true, multiValued = false)
String groupName;
@Argument(index = 1, name = "feature", description = "The name of the feature", required = true, multiValued = false)
Modified: karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/shell/ListGroupFeatures.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/shell/ListGroupFeatures.java?rev=1172493&r1=1172492&r2=1172493&view=diff
==============================================================================
--- karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/shell/ListGroupFeatures.java (original)
+++ karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/shell/ListGroupFeatures.java Mon Sep 19 07:13:02 2011
@@ -24,7 +24,7 @@ import java.util.Map;
/**
* List group features command.
*/
-@Command(scope = "cluster", name = "features-list", description = "List the features that are assigned to a group")
+@Command(scope = "cluster", name = "features-list", description = "List the features that are assigned to a cluster group")
public class ListGroupFeatures extends FeatureCommandSupport {
protected static final String OUTPUT_FORMAT = "%-40s %20s %-4s ";
Modified: karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/shell/UninstallFeatureCommand.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/shell/UninstallFeatureCommand.java?rev=1172493&r1=1172492&r2=1172493&view=diff
==============================================================================
--- karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/shell/UninstallFeatureCommand.java (original)
+++ karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/shell/UninstallFeatureCommand.java Mon Sep 19 07:13:02 2011
@@ -23,10 +23,10 @@ import org.apache.karaf.features.Feature
/**
* Uninstall feature command.
*/
-@Command(scope = "cluster", name = "features-uninstall", description = "Uninstalls a feature to the group")
+@Command(scope = "cluster", name = "features-uninstall", description = "Uninstall a feature from the cluster group")
public class UninstallFeatureCommand extends FeatureCommandSupport {
- @Argument(index = 0, name = "group", description = "The name of the group that will uninstall the feature", required = true, multiValued = false)
+ @Argument(index = 0, name = "group", description = "The name of the group", required = true, multiValued = false)
String groupName;
@Argument(index = 1, name = "feature", description = "The name of the feature", required = true, multiValued = false)
Copied: karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/NodePingCommand.java (from r1171612, karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/PingCommand.java)
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/NodePingCommand.java?p2=karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/NodePingCommand.java&p1=karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/PingCommand.java&r1=1171612&r2=1172493&rev=1172493&view=diff
==============================================================================
--- karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/PingCommand.java (original)
+++ karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/NodePingCommand.java Mon Sep 19 07:13:02 2011
@@ -24,10 +24,10 @@ import java.util.HashSet;
/**
* Ping command.
*/
-@Command(scope = "cluster", name = "ping", description = "Pings the nodes of the cluster.")
-public class PingCommand extends ClusterCommandSupport {
+@Command(scope = "cluster", name = "node-ping", description = "Ping a node of the cluster.")
+public class NodePingCommand extends ClusterCommandSupport {
- @Argument(index = 0, name = "node", description = "The id of the node(s) to ping", required = true, multiValued = false)
+ @Argument(index = 0, name = "node", description = "The ID of the node to ping", required = true, multiValued = false)
String nodeId;
@Argument(index = 1, name = "iterations", description = "The number of iterations to perform", required = false, multiValued = false)
@@ -40,10 +40,10 @@ public class PingCommand extends Cluster
protected Object doExecute() throws Exception {
Node node = clusterManager.findNodeById(nodeId);
if (node == null) {
- System.out.println("Node " + nodeId + " is not found.");
+ System.out.println("Node " + nodeId + " is not found");
return null;
}
- System.out.println("Pinging node :" + node.getId());
+ System.out.println("Pinging node: " + node.getId());
for (int i = 1; i <= iterations; i++) {
Long start = System.currentTimeMillis();
Ping ping = new Ping(clusterManager.generateId());
Copied: karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/NodesListCommand.java (from r1171612, karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/ListNodesCommand.java)
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/NodesListCommand.java?p2=karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/NodesListCommand.java&p1=karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/ListNodesCommand.java&r1=1171612&r2=1172493&rev=1172493&view=diff
==============================================================================
--- karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/ListNodesCommand.java (original)
+++ karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/NodesListCommand.java Mon Sep 19 07:13:02 2011
@@ -21,8 +21,8 @@ import java.util.Set;
/**
* List nodes command.
*/
-@Command(scope = "cluster", name = "list-nodes", description = "Lists the nodes of the cluster.")
-public class ListNodesCommand extends ClusterCommandSupport {
+@Command(scope = "cluster", name = "nodes-list", description = "Lists the nodes in the cluster")
+public class NodesListCommand extends ClusterCommandSupport {
private static final String LIST_FORMAT = "%1s %4s %-20s %5s %s";
@@ -43,7 +43,7 @@ public class ListNodesCommand extends Cl
System.out.println(String.format(LIST_FORMAT, mark, count++, node.getHost(), node.getPort(), node.getId()));
}
} else {
- System.err.println("No node found in the cluster!");
+ System.err.println("No node found in the cluster");
return null;
}
}
Modified: karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/consumer/ConsumerStartCommand.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/consumer/ConsumerStartCommand.java?rev=1172493&r1=1172492&r2=1172493&view=diff
==============================================================================
--- karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/consumer/ConsumerStartCommand.java (original)
+++ karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/consumer/ConsumerStartCommand.java Mon Sep 19 07:13:02 2011
@@ -22,10 +22,10 @@ import java.util.List;
/**
* Consumer start command.
*/
-@Command(scope = "cluster", name = "consumer-start", description = "Turns on/off the producer capabilities of a node.")
+@Command(scope = "cluster", name = "consumer-start", description = "Turns on/off the producer capabilities of a node")
public class ConsumerStartCommand extends ConsumerSupport {
- @Argument(index = 0, name = "node", description = "The id of the node(s) to turn on/off event producer", required = false, multiValued = true)
+ @Argument(index = 0, name = "node", description = "The ID of the node(s) to turn on/off event producer", required = false, multiValued = true)
List<String> nodes;
/**
Modified: karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/consumer/ConsumerStatusCommand.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/consumer/ConsumerStatusCommand.java?rev=1172493&r1=1172492&r2=1172493&view=diff
==============================================================================
--- karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/consumer/ConsumerStatusCommand.java (original)
+++ karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/consumer/ConsumerStatusCommand.java Mon Sep 19 07:13:02 2011
@@ -21,10 +21,10 @@ import java.util.List;
/**
* Consumer status command.
*/
-@Command(scope = "cluster", name = "consumer-status", description = "Turns on/off the producer capabilities of a node.")
+@Command(scope = "cluster", name = "consumer-status", description = "Turns on/off the producer capabilities of a node")
public class ConsumerStatusCommand extends ConsumerSupport {
- @Argument(index = 0, name = "node", description = "The id of the node(s) to turn on/off event producer", required = false, multiValued = true)
+ @Argument(index = 0, name = "node", description = "The ID of the node(s) to turn on/off event producer", required = false, multiValued = true)
List<String> nodes;
/**
Modified: karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/consumer/ConsumerStopCommand.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/consumer/ConsumerStopCommand.java?rev=1172493&r1=1172492&r2=1172493&view=diff
==============================================================================
--- karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/consumer/ConsumerStopCommand.java (original)
+++ karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/consumer/ConsumerStopCommand.java Mon Sep 19 07:13:02 2011
@@ -22,10 +22,10 @@ import java.util.List;
/**
* Consumer stop command.
*/
-@Command(scope = "cluster", name = "consumer-stop", description = "Turns on/off the producer capabilities of a node.")
+@Command(scope = "cluster", name = "consumer-stop", description = "Turns on/off the producer capabilities of a node")
public class ConsumerStopCommand extends ConsumerSupport {
- @Argument(index = 0, name = "node", description = "The id of the node(s) to turn on/off event producer", required = false, multiValued = true)
+ @Argument(index = 0, name = "node", description = "The ID of the node(s) to turn on/off event producer", required = false, multiValued = true)
List<String> nodes;
/**
Modified: karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupCreateCommand.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupCreateCommand.java?rev=1172493&r1=1172492&r2=1172493&view=diff
==============================================================================
--- karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupCreateCommand.java (original)
+++ karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupCreateCommand.java Mon Sep 19 07:13:02 2011
@@ -19,10 +19,10 @@ import org.apache.felix.gogo.commands.Co
/**
* Group create command.
*/
-@Command(scope = "cluster", name = "group-create", description = "Creates an empty group")
+@Command(scope = "cluster", name = "group-create", description = "Creates a cluster group")
public class GroupCreateCommand extends GroupSupport {
- @Argument(index = 0, name = "group", description = "The name of the group to join", required = false, multiValued = false)
+ @Argument(index = 0, name = "group", description = "The name of the group", required = false, multiValued = false)
String group;
/**
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=1172493&r1=1172492&r2=1172493&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 Mon Sep 19 07:13:02 2011
@@ -25,10 +25,10 @@ import java.util.List;
/**
* Group delete command.
*/
-@Command(scope = "cluster", name = "group-delete", description = "Deletes a group")
+@Command(scope = "cluster", name = "group-delete", description = "Delete a cluster group")
public class GroupDeleteCommand extends GroupSupport {
- @Argument(index = 0, name = "group", description = "The name of the group to delete", required = false, multiValued = false)
+ @Argument(index = 0, name = "group", description = "The name of the group", required = false, multiValued = false)
String group;
/**
@@ -44,7 +44,7 @@ public class GroupDeleteCommand extends
Thread.currentThread().setContextClassLoader(getClass().getClassLoader());
Group g = groupManager.findGroupByName(group);
if (g == null) {
- System.out.println("Group " + group + " doesn't exist.");
+ System.out.println("Group " + group + " doesn't exist");
return null;
}
List<String> nodes = new LinkedList<String>();
Modified: karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupJoinCommand.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupJoinCommand.java?rev=1172493&r1=1172492&r2=1172493&view=diff
==============================================================================
--- karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupJoinCommand.java (original)
+++ karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupJoinCommand.java Mon Sep 19 07:13:02 2011
@@ -22,13 +22,13 @@ import java.util.List;
/**
* Group join command.
*/
-@Command(scope = "cluster", name = "group-join", description = "Manages nodes and groups")
+@Command(scope = "cluster", name = "group-join", description = "Join node(s) to a cluster group")
public class GroupJoinCommand extends GroupSupport {
- @Argument(index = 0, name = "group", description = "The name of the group to join", required = false, multiValued = false)
+ @Argument(index = 0, name = "group", description = "The name of the group", required = false, multiValued = false)
String group;
- @Argument(index = 1, name = "node", description = "The id of the node(s) to turn on/off event producer. If none specified current is assumed", required = false, multiValued = true)
+ @Argument(index = 1, name = "node", description = "The ID of the node(s)", required = false, multiValued = true)
List<String> nodes;
/**
Modified: karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupListCommand.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupListCommand.java?rev=1172493&r1=1172492&r2=1172493&view=diff
==============================================================================
--- karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupListCommand.java (original)
+++ karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupListCommand.java Mon Sep 19 07:13:02 2011
@@ -22,10 +22,10 @@ import java.util.List;
/**
* Group list command.
*/
-@Command(scope = "cluster", name = "group-list", description = "Manages nodes and groups")
+@Command(scope = "cluster", name = "group-list", description = "List the cluster groups")
public class GroupListCommand extends GroupSupport {
- @Argument(index = 0, name = "node", description = "The id of the node(s) to turn on/off event producer", required = false, multiValued = true)
+ @Argument(index = 0, name = "node", description = "The ID of the node(s)", required = false, multiValued = true)
List<String> nodes;
/**
Modified: karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupQuitCommand.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupQuitCommand.java?rev=1172493&r1=1172492&r2=1172493&view=diff
==============================================================================
--- karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupQuitCommand.java (original)
+++ karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupQuitCommand.java Mon Sep 19 07:13:02 2011
@@ -22,13 +22,13 @@ import java.util.List;
/**
* Group quit command.
*/
-@Command(scope = "cluster", name = "group-quit", description = "Manages nodes and groups")
+@Command(scope = "cluster", name = "group-quit", description = "Quit node(s) from a cluster group")
public class GroupQuitCommand extends GroupSupport {
- @Argument(index = 0, name = "group", description = "The name of the group to join", required = false, multiValued = false)
+ @Argument(index = 0, name = "group", description = "The name of the group", required = false, multiValued = false)
String group;
- @Argument(index = 1, name = "node", description = "The id of the node(s) to turn on/off event producer", required = false, multiValued = true)
+ @Argument(index = 1, name = "node", description = "The ID of the node(s)", required = false, multiValued = true)
List<String> nodes;
/**
Modified: karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupSetCommand.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupSetCommand.java?rev=1172493&r1=1172492&r2=1172493&view=diff
==============================================================================
--- karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupSetCommand.java (original)
+++ karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupSetCommand.java Mon Sep 19 07:13:02 2011
@@ -22,13 +22,13 @@ import java.util.List;
/**
* Group set command.
*/
-@Command(scope = "cluster", name = "group-set", description = "Set the target nodes to a specific group")
+@Command(scope = "cluster", name = "group-set", description = "Set the target nodes to a group")
public class GroupSetCommand extends GroupSupport {
- @Argument(index = 0, name = "group", description = "The name of the group to join", required = false, multiValued = false)
+ @Argument(index = 0, name = "group", description = "The name of the group", required = false, multiValued = false)
String group;
- @Argument(index = 1, name = "node", description = "The id of the node(s) to turn on/off event producer. If none specified current is assumed", required = false, multiValued = true)
+ @Argument(index = 1, name = "node", description = "The ID of the node(s)", required = false, multiValued = true)
List<String> nodes;
/**
Modified: karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/handler/HandlersStartCommand.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/handler/HandlersStartCommand.java?rev=1172493&r1=1172492&r2=1172493&view=diff
==============================================================================
--- karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/handler/HandlersStartCommand.java (original)
+++ karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/handler/HandlersStartCommand.java Mon Sep 19 07:13:02 2011
@@ -23,15 +23,15 @@ import java.util.List;
/**
* Handlers command.
*/
-@Command(scope = "cluster", name = "handlers", description = "Starts the handler of the specified nodes.")
+@Command(scope = "cluster", name = "handlers", description = "Starts the handler of the specified nodes")
public class HandlersStartCommand extends HandlersSupport {
private static final String OUTPUT_FORMAT = "%-20s %-7s %s";
- @Argument(index = 0, name = "handler-start", description = "The id of the event handler", required = false, multiValued = false)
+ @Argument(index = 0, name = "handler-start", description = "The ID of the event handler", required = false, multiValued = false)
String handler;
- @Argument(index = 1, name = "node", description = "The id of the node(s)", required = false, multiValued = true)
+ @Argument(index = 1, name = "node", description = "The ID of the node(s)", required = false, multiValued = true)
List<String> nodes;
/**
Modified: karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/handler/HandlersStatusCommand.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/handler/HandlersStatusCommand.java?rev=1172493&r1=1172492&r2=1172493&view=diff
==============================================================================
--- karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/handler/HandlersStatusCommand.java (original)
+++ karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/handler/HandlersStatusCommand.java Mon Sep 19 07:13:02 2011
@@ -23,15 +23,13 @@ import java.util.List;
/**
* Handlers status command.
*/
-@Command(scope = "cluster", name = "handler-status", description = "Lists the handlers of the specified nodes.")
+@Command(scope = "cluster", name = "handler-status", description = "Give the status of a given handler")
public class HandlersStatusCommand extends HandlersSupport {
- private static final String OUTPUT_FORMAT = "%-20s %-7s %s";
-
- @Argument(index = 0, name = "handler-start", description = "The id of the event handler", required = false, multiValued = false)
+ @Argument(index = 0, name = "handler-start", description = "The ID of the event handler", required = false, multiValued = false)
String handler;
- @Argument(index = 1, name = "node", description = "The id of the node(s)", required = false, multiValued = true)
+ @Argument(index = 1, name = "node", description = "The ID of the node(s)", required = false, multiValued = true)
List<String> nodes;
/**
Modified: karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/handler/HandlersStopCommand.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/handler/HandlersStopCommand.java?rev=1172493&r1=1172492&r2=1172493&view=diff
==============================================================================
--- karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/handler/HandlersStopCommand.java (original)
+++ karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/handler/HandlersStopCommand.java Mon Sep 19 07:13:02 2011
@@ -23,15 +23,13 @@ import java.util.List;
/**
* Handlers stop command.
*/
-@Command(scope = "cluster", name = "handler-stop", description = "Stops the handler of the specified nodes.")
+@Command(scope = "cluster", name = "handler-stop", description = "Stop the handler of the specified nodes")
public class HandlersStopCommand extends HandlersSupport {
- private static final String OUTPUT_FORMAT = "%-20s %-7s %s";
-
- @Argument(index = 0, name = "handler", description = "The id of the event handler", required = false, multiValued = false)
+ @Argument(index = 0, name = "handler", description = "The ID of the event handler", required = false, multiValued = false)
String handler;
- @Argument(index = 1, name = "node", description = "The id of the node(s)", required = false, multiValued = true)
+ @Argument(index = 1, name = "node", description = "The ID of the node(s)", required = false, multiValued = true)
List<String> nodes;
/**
Modified: karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/producer/ProducerStartCommand.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/producer/ProducerStartCommand.java?rev=1172493&r1=1172492&r2=1172493&view=diff
==============================================================================
--- karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/producer/ProducerStartCommand.java (original)
+++ karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/producer/ProducerStartCommand.java Mon Sep 19 07:13:02 2011
@@ -22,10 +22,10 @@ import java.util.List;
/**
* Producer start command.
*/
-@Command(scope = "cluster", name = "producer-start", description = "Turns on the producer capabilities of a node.")
+@Command(scope = "cluster", name = "producer-start", description = "Start producer")
public class ProducerStartCommand extends ProducerSupport {
- @Argument(index = 0, name = "node", description = "The id of the node(s) to turn on/off event producer", required = false, multiValued = true)
+ @Argument(index = 0, name = "node", description = "The ID of the node(s)", required = false, multiValued = true)
List<String> nodes;
/**
Modified: karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/producer/ProducerStatusCommand.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/producer/ProducerStatusCommand.java?rev=1172493&r1=1172492&r2=1172493&view=diff
==============================================================================
--- karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/producer/ProducerStatusCommand.java (original)
+++ karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/producer/ProducerStatusCommand.java Mon Sep 19 07:13:02 2011
@@ -21,10 +21,10 @@ import java.util.List;
/**
* Producer start command.
*/
-@Command(scope = "cluster", name = "producer-start", description = "Displays the producer capabilities of a node.")
+@Command(scope = "cluster", name = "producer-start", description = "Give current producer status of the node(s)")
public class ProducerStatusCommand extends ProducerSupport {
- @Argument(index = 0, name = "node", description = "The id of the node(s) to turn on/off event producer", required = false, multiValued = true)
+ @Argument(index = 0, name = "node", description = "The ID of the node(s)", required = false, multiValued = true)
List<String> nodes;
/**
Modified: karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/producer/ProducerStopCommand.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/producer/ProducerStopCommand.java?rev=1172493&r1=1172492&r2=1172493&view=diff
==============================================================================
--- karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/producer/ProducerStopCommand.java (original)
+++ karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/producer/ProducerStopCommand.java Mon Sep 19 07:13:02 2011
@@ -22,10 +22,10 @@ import java.util.List;
/**
* Producer stop command.
*/
-@Command(scope = "cluster", name = "producer-stop", description = "Turns off the producer capabilities of a node.")
+@Command(scope = "cluster", name = "producer-stop", description = "Stop producer")
public class ProducerStopCommand extends ProducerSupport {
- @Argument(index = 0, name = "node", description = "The id of the node(s) to turn on/off event producer", required = false, multiValued = true)
+ @Argument(index = 0, name = "node", description = "The ID of the node(s)", required = false, multiValued = true)
List<String> nodes;
/**
Modified: karaf/cellar/trunk/shell/src/main/resources/OSGI-INF/blueprint/shell-cluster.xml
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/shell/src/main/resources/OSGI-INF/blueprint/shell-cluster.xml?rev=1172493&r1=1172492&r2=1172493&view=diff
==============================================================================
--- karaf/cellar/trunk/shell/src/main/resources/OSGI-INF/blueprint/shell-cluster.xml (original)
+++ karaf/cellar/trunk/shell/src/main/resources/OSGI-INF/blueprint/shell-cluster.xml Mon Sep 19 07:13:02 2011
@@ -17,14 +17,14 @@
<!-- Command Bundle -->
<command-bundle xmlns="http://karaf.apache.org/xmlns/shell/v1.0.0">
- <command name="cluster/list-nodes">
- <action class="org.apache.karaf.cellar.shell.ListNodesCommand">
+ <command name="cluster/nodes-list">
+ <action class="org.apache.karaf.cellar.shell.NodesListCommand">
<property name="clusterManager" ref="clusterManager"/>
</action>
</command>
- <command name="cluster/ping">
- <action class="org.apache.karaf.cellar.shell.PingCommand">
+ <command name="cluster/node-ping">
+ <action class="org.apache.karaf.cellar.shell.NodePingCommand">
<property name="clusterManager" ref="clusterManager"/>
<property name="executionContext" ref="executionContext"/>
</action>