You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2012/02/01 10:36:24 UTC
svn commit: r1239022 [1/2] - 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/kara...
Author: jbonofre
Date: Wed Feb 1 09:36:22 2012
New Revision: 1239022
URL: http://svn.apache.org/viewvc?rev=1239022&view=rev
Log:
[KARAF-1171] Console cluster:* commands (naming)
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/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/itests/src/test/java/org/apache/karaf/cellar/itests/CellarChildNodesTest.java
karaf/cellar/trunk/itests/src/test/java/org/apache/karaf/cellar/itests/CellarFeaturesTest.java
karaf/cellar/trunk/itests/src/test/java/org/apache/karaf/cellar/itests/CellarGroupsTest.java
karaf/cellar/trunk/itests/src/test/java/org/apache/karaf/cellar/itests/CellarInstallationTest.java
karaf/cellar/trunk/itests/src/test/java/org/apache/karaf/cellar/itests/CellarSampleCamelHazelcastTest.java
karaf/cellar/trunk/itests/src/test/java/org/apache/karaf/cellar/itests/CellarSampleDosgiGreeterTest.java
karaf/cellar/trunk/itests/src/test/java/org/apache/karaf/cellar/itests/CellarTestSupport.java
karaf/cellar/trunk/management/src/main/resources/OSGI-INF/blueprint/blueprint.xml
karaf/cellar/trunk/manual/src/main/webapp/user-guide/deploy.conf
karaf/cellar/trunk/manual/src/main/webapp/user-guide/groups.conf
karaf/cellar/trunk/manual/src/main/webapp/user-guide/obr.conf
karaf/cellar/trunk/obr/src/main/java/org/apache/karaf/cellar/obr/shell/ObrAddUrlCommand.java
karaf/cellar/trunk/obr/src/main/java/org/apache/karaf/cellar/obr/shell/ObrDeployCommand.java
karaf/cellar/trunk/obr/src/main/java/org/apache/karaf/cellar/obr/shell/ObrListCommand.java
karaf/cellar/trunk/obr/src/main/java/org/apache/karaf/cellar/obr/shell/ObrListUrlCommand.java
karaf/cellar/trunk/obr/src/main/java/org/apache/karaf/cellar/obr/shell/ObrRemoveUrlCommand.java
karaf/cellar/trunk/obr/src/main/resources/OSGI-INF/blueprint/shell-commands.xml
karaf/cellar/trunk/samples/dosgi-greeter/README
karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/ClusterCommandSupport.java
karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/NodePingCommand.java
karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/NodesListCommand.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/consumer/ConsumerSupport.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/GroupPickCommand.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/group/GroupSupport.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/handler/HandlersSupport.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/java/org/apache/karaf/cellar/shell/producer/ProducerSupport.java
karaf/cellar/trunk/shell/src/main/resources/OSGI-INF/blueprint/shell-cluster.xml
karaf/cellar/trunk/utils/src/main/java/org/apache/karaf/cellar/utils/ping/Ping.java
karaf/cellar/trunk/utils/src/main/java/org/apache/karaf/cellar/utils/ping/PingHandler.java
karaf/cellar/trunk/utils/src/main/java/org/apache/karaf/cellar/utils/ping/Pong.java
karaf/cellar/trunk/utils/src/main/java/org/apache/karaf/cellar/utils/ping/PongHandler.java
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=1239022&r1=1239021&r2=1239022&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 Wed Feb 1 09:36:22 2012
@@ -24,12 +24,12 @@ import java.util.Properties;
/**
* List cluster config command.
*/
-@Command(scope = "cluster", name = "config-list", description = "List the configuration PIDs that are assigned to a group")
+@Command(scope = "cluster", name = "config-list", description = "List the configuration PIDs assigned to a cluster group.")
public class ListCommand extends ConfigCommandSupport {
protected static final String OUTPUT_FORMAT = "%-40s";
- @Argument(index = 0, name = "group", description = "The name of the group", required = true, multiValued = false)
+ @Argument(index = 0, name = "group", description = "The cluster group name.", required = true, multiValued = false)
String groupName;
@Override
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=1239022&r1=1239021&r2=1239022&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 Wed Feb 1 09:36:22 2012
@@ -25,15 +25,15 @@ import java.util.Properties;
/**
* Config properties list cluster command.
*/
-@Command(scope = "cluster", name = "config-proplist", description = "List the configuration PIDs that are assigned to a group")
+@Command(scope = "cluster", name = "config-proplist", description = "List the properties in a configuration PID assigned to a cluster group.")
public class PropListCommand extends CellarCommandSupport {
protected static final String OUTPUT_FORMAT = "%-40s %s";
- @Argument(index = 0, name = "group", description = "The name of the group", required = true, multiValued = false)
+ @Argument(index = 0, name = "group", description = "The cluster group name.", 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 configuration PID.", required = true, multiValued = false)
String pid;
@Override
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=1239022&r1=1239021&r2=1239022&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 Wed Feb 1 09:36:22 2012
@@ -25,19 +25,19 @@ import java.util.Properties;
/**
* Config properties set cluster command.
*/
-@Command(scope = "cluster", name = "config-propset", description = "Sets the a property value for a configuration PID and group")
+@Command(scope = "cluster", name = "config-propset", description = "Sets the a property value for a configuration PID in a cluster group name.")
public class PropSetCommand extends ConfigCommandSupport {
- @Argument(index = 0, name = "group", description = "The name of the group", required = true, multiValued = false)
+ @Argument(index = 0, name = "group", description = "The cluster group name.", 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 configuration PID.", required = true, multiValued = false)
String pid;
- @Argument(index = 2, name = "key", description = "The key of the property", required = true, multiValued = false)
+ @Argument(index = 2, name = "key", description = "The property key.", required = true, multiValued = false)
String key;
- @Argument(index = 3, name = "value", description = "The value of the property", required = true, multiValued = false)
+ @Argument(index = 3, name = "value", description = "The property value.", required = true, multiValued = false)
String value;
@Override
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=1239022&r1=1239021&r2=1239022&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 Wed Feb 1 09:36:22 2012
@@ -22,7 +22,7 @@ import org.apache.karaf.cellar.dosgi.End
import java.util.Map;
import java.util.Set;
-@Command(scope = "cluster", name = "list-services", description = "List the distributed services")
+@Command(scope = "cluster", name = "service-list", description = "List the cluster distributed services.")
public class ListDistributedServicesCommand extends CellarCommandSupport {
private static final String LIST_FORMAT = "%-80s %-20s";
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=1239022&r1=1239021&r2=1239022&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 Wed Feb 1 09:36:22 2012
@@ -16,7 +16,7 @@
<!-- Command Bundle -->
<command-bundle xmlns="http://karaf.apache.org/xmlns/shell/v1.0.0">
- <command name="cluster/list-services">
+ <command name="cluster/service-list">
<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/InstallFeatureCommand.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/shell/InstallFeatureCommand.java?rev=1239022&r1=1239021&r2=1239022&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 Wed Feb 1 09:36:22 2012
@@ -20,19 +20,16 @@ import org.apache.felix.gogo.commands.Ar
import org.apache.felix.gogo.commands.Command;
import org.apache.karaf.features.FeatureEvent;
-/**
- * Install feature command.
- */
-@Command(scope = "cluster", name = "features-install", description = "Installs a feature to the cluster group")
+@Command(scope = "cluster", name = "feature-install", description = "Install a feature assigned to a cluster group.")
public class InstallFeatureCommand extends FeatureCommandSupport {
- @Argument(index = 0, name = "group", description = "The name of the group", required = true, multiValued = false)
+ @Argument(index = 0, name = "group", description = "The cluster group name.", required = true, multiValued = false)
String groupName;
- @Argument(index = 1, name = "feature", description = "The name of the feature", required = true, multiValued = false)
+ @Argument(index = 1, name = "feature", description = "The feature name.", required = true, multiValued = false)
String feature;
- @Argument(index = 2, name = "version", description = "The version of the feature", required = false, multiValued = false)
+ @Argument(index = 2, name = "version", description = "The feature version.", required = false, multiValued = false)
String version;
@Override
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=1239022&r1=1239021&r2=1239022&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 Wed Feb 1 09:36:22 2012
@@ -21,15 +21,12 @@ import org.apache.felix.gogo.commands.Co
import java.util.Map;
-/**
- * List group features command.
- */
-@Command(scope = "cluster", name = "features-list", description = "List the features that are assigned to a cluster group")
+@Command(scope = "cluster", name = "feature-list", description = "List the features assigned to a cluster group.")
public class ListGroupFeatures extends FeatureCommandSupport {
protected static final String OUTPUT_FORMAT = "%-40s %20s %-4s ";
- @Argument(index = 0, name = "group", description = "The name of the group", required = true, multiValued = false)
+ @Argument(index = 0, name = "group", description = "The cluster group name.", required = true, multiValued = false)
String groupName;
@Override
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=1239022&r1=1239021&r2=1239022&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 Wed Feb 1 09:36:22 2012
@@ -20,25 +20,22 @@ import org.apache.felix.gogo.commands.Ar
import org.apache.felix.gogo.commands.Command;
import org.apache.karaf.features.FeatureEvent;
-/**
- * Uninstall feature command.
- */
-@Command(scope = "cluster", name = "features-uninstall", description = "Uninstall a feature from the cluster group")
+@Command(scope = "cluster", name = "feature-uninstall", description = "Uninstall a feature assigned to a cluster group.")
public class UninstallFeatureCommand extends FeatureCommandSupport {
- @Argument(index = 0, name = "group", description = "The name of the group", required = true, multiValued = false)
+ @Argument(index = 0, name = "group", description = "The cluster group name.", required = true, multiValued = false)
String groupName;
- @Argument(index = 1, name = "feature", description = "The name of the feature", required = true, multiValued = false)
+ @Argument(index = 1, name = "feature", description = "The feature name.", required = true, multiValued = false)
String feature;
- @Argument(index = 2, name = "version", description = "The version of the feature", required = false, multiValued = false)
+ @Argument(index = 2, name = "version", description = "The feature version.", required = false, multiValued = false)
String version;
@Override
protected Object doExecute() throws Exception {
Group group = groupManager.findGroupByName(groupName);
- EventProducer producer = eventTransportFactory.getEventProducer(groupName,true);
+ EventProducer producer = eventTransportFactory.getEventProducer(groupName, true);
RemoteFeaturesEvent event = new RemoteFeaturesEvent(feature, version, FeatureEvent.EventType.FeatureUninstalled);
event.setForce(true);
event.setSourceGroup(group);
Modified: karaf/cellar/trunk/itests/src/test/java/org/apache/karaf/cellar/itests/CellarChildNodesTest.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/itests/src/test/java/org/apache/karaf/cellar/itests/CellarChildNodesTest.java?rev=1239022&r1=1239021&r2=1239022&view=diff
==============================================================================
--- karaf/cellar/trunk/itests/src/test/java/org/apache/karaf/cellar/itests/CellarChildNodesTest.java (original)
+++ karaf/cellar/trunk/itests/src/test/java/org/apache/karaf/cellar/itests/CellarChildNodesTest.java Wed Feb 1 09:36:22 2012
@@ -45,7 +45,7 @@ public class CellarChildNodesTest extend
Node localNode = clusterManager.getNode();
Set<Node> nodes = clusterManager.listNodes();
- System.err.println(executeCommand("cluster:nodes-list"));
+ System.err.println(executeCommand("cluster:node-list"));
assertTrue("There should be at least 2 cellar nodes running", 2 <= nodes.size());
}
Modified: karaf/cellar/trunk/itests/src/test/java/org/apache/karaf/cellar/itests/CellarFeaturesTest.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/itests/src/test/java/org/apache/karaf/cellar/itests/CellarFeaturesTest.java?rev=1239022&r1=1239021&r2=1239022&view=diff
==============================================================================
--- karaf/cellar/trunk/itests/src/test/java/org/apache/karaf/cellar/itests/CellarFeaturesTest.java (original)
+++ karaf/cellar/trunk/itests/src/test/java/org/apache/karaf/cellar/itests/CellarFeaturesTest.java Wed Feb 1 09:36:22 2012
@@ -49,49 +49,49 @@ public class CellarFeaturesTest extends
System.err.println(executeCommand("admin:list"));
- String eventadminFeatureStatus = executeCommand("admin:connect child1 features:list | grep eventadmin");
+ String eventadminFeatureStatus = executeCommand("admin:connect child1 feature:list | grep eventadmin");
System.err.println(eventadminFeatureStatus);
assertTrue(eventadminFeatureStatus.startsWith(UNINSTALLED));
//Test feature sync - install
System.err.println(executeCommand("features:install eventadmin"));
Thread.sleep(5000);
- eventadminFeatureStatus = executeCommand("admin:connect child1 features:list | grep eventadmin");
+ eventadminFeatureStatus = executeCommand("admin:connect child1 feature:list | grep eventadmin");
System.err.println(eventadminFeatureStatus);
assertTrue(eventadminFeatureStatus.startsWith(INSTALLED));
//Test feature sync - uninstall
System.err.println(executeCommand("features:uninstall eventadmin"));
Thread.sleep(5000);
- eventadminFeatureStatus = executeCommand("admin:connect child1 features:list | grep eventadmin");
+ eventadminFeatureStatus = executeCommand("admin:connect child1 feature:list | grep eventadmin");
System.err.println(eventadminFeatureStatus);
assertTrue(eventadminFeatureStatus.startsWith(UNINSTALLED));
//Test feature command - install
- System.err.println(executeCommand("cluster:features-install default eventadmin"));
+ System.err.println(executeCommand("cluster:feature-install default eventadmin"));
Thread.sleep(5000);
- eventadminFeatureStatus = executeCommand("admin:connect child1 features:list | grep eventadmin");
+ eventadminFeatureStatus = executeCommand("admin:connect child1 feature:list | grep eventadmin");
System.err.println(eventadminFeatureStatus);
assertTrue(eventadminFeatureStatus.startsWith(INSTALLED));
//Test feature command - uninstall
- System.err.println(executeCommand("cluster:features-uninstall default eventadmin"));
+ System.err.println(executeCommand("cluster:feature-uninstall default eventadmin"));
Thread.sleep(5000);
- eventadminFeatureStatus = executeCommand("admin:connect child1 features:list | grep eventadmin");
+ eventadminFeatureStatus = executeCommand("admin:connect child1 feature:list | grep eventadmin");
System.err.println(eventadminFeatureStatus);
assertTrue(eventadminFeatureStatus.startsWith(UNINSTALLED));
//Test feature command - install - before a node joins
- System.err.println(executeCommand("cluster:features-install testgroup eventadmin"));
+ System.err.println(executeCommand("cluster:feature-install testgroup eventadmin"));
System.err.println(executeCommand("cluster:group-set testgroup " + getNodeIdOfChild("child1")));
Thread.sleep(5000);
- eventadminFeatureStatus = executeCommand("admin:connect child1 features:list | grep eventadmin");
+ eventadminFeatureStatus = executeCommand("admin:connect child1 feature:list | grep eventadmin");
System.err.println(eventadminFeatureStatus);
assertTrue(eventadminFeatureStatus.startsWith(INSTALLED));
Node localNode = clusterManager.getNode();
Set<Node> nodes = clusterManager.listNodes();
- System.err.println(executeCommand("cluster:nodes-list"));
+ System.err.println(executeCommand("cluster:node-list"));
assertTrue("There should be at least 2 cellar nodes running", 2 <= nodes.size());
}
Modified: karaf/cellar/trunk/itests/src/test/java/org/apache/karaf/cellar/itests/CellarGroupsTest.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/itests/src/test/java/org/apache/karaf/cellar/itests/CellarGroupsTest.java?rev=1239022&r1=1239021&r2=1239022&view=diff
==============================================================================
--- karaf/cellar/trunk/itests/src/test/java/org/apache/karaf/cellar/itests/CellarGroupsTest.java (original)
+++ karaf/cellar/trunk/itests/src/test/java/org/apache/karaf/cellar/itests/CellarGroupsTest.java Wed Feb 1 09:36:22 2012
@@ -48,7 +48,7 @@ public class CellarGroupsTest extends Ce
ClusterManager clusterManager = getOsgiService(ClusterManager.class);
assertNotNull(clusterManager);
- System.err.println(executeCommand("cluster:nodes-list"));
+ System.err.println(executeCommand("cluster:node-list"));
Node localNode = clusterManager.getNode();
Set<Node> nodes = clusterManager.listNodes();
assertTrue("There should be at least 2 cellar nodes running", 2 <= nodes.size());
Modified: karaf/cellar/trunk/itests/src/test/java/org/apache/karaf/cellar/itests/CellarInstallationTest.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/itests/src/test/java/org/apache/karaf/cellar/itests/CellarInstallationTest.java?rev=1239022&r1=1239021&r2=1239022&view=diff
==============================================================================
--- karaf/cellar/trunk/itests/src/test/java/org/apache/karaf/cellar/itests/CellarInstallationTest.java (original)
+++ karaf/cellar/trunk/itests/src/test/java/org/apache/karaf/cellar/itests/CellarInstallationTest.java Wed Feb 1 09:36:22 2012
@@ -37,7 +37,7 @@ public class CellarInstallationTest exte
assertNotNull(clusterManager);
Thread.sleep(20000);
System.err.println(executeCommand("osgi:list"));
- System.err.println(executeCommand("cluster:nodes-list"));
+ System.err.println(executeCommand("cluster:node-list"));
}
Modified: karaf/cellar/trunk/itests/src/test/java/org/apache/karaf/cellar/itests/CellarSampleCamelHazelcastTest.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/itests/src/test/java/org/apache/karaf/cellar/itests/CellarSampleCamelHazelcastTest.java?rev=1239022&r1=1239021&r2=1239022&view=diff
==============================================================================
--- karaf/cellar/trunk/itests/src/test/java/org/apache/karaf/cellar/itests/CellarSampleCamelHazelcastTest.java (original)
+++ karaf/cellar/trunk/itests/src/test/java/org/apache/karaf/cellar/itests/CellarSampleCamelHazelcastTest.java Wed Feb 1 09:36:22 2012
@@ -47,11 +47,11 @@ public class CellarSampleCamelHazelcastT
ClusterManager clusterManager = getOsgiService(ClusterManager.class);
assertNotNull(clusterManager);
- System.err.println(executeCommand("features:addurl mvn:org.apache.karaf.cellar.samples/camel-hazelcast-app/3.0.0-SNAPSHOT/xml/features"));
+ System.err.println(executeCommand("feature:add-url mvn:org.apache.karaf.cellar.samples/camel-hazelcast-app/3.0.0-SNAPSHOT/xml/features"));
System.err.println(executeCommand("admin:list"));
- System.err.println(executeCommand("cluster:nodes-list"));
+ System.err.println(executeCommand("cluster:node-list"));
Node localNode = clusterManager.getNode();
Set<Node> nodes = clusterManager.listNodes();
assertTrue("There should be at least 3 cellar nodes running", 3 <= nodes.size());
@@ -61,18 +61,18 @@ public class CellarSampleCamelHazelcastT
String node1 = getNodeIdOfChild("child1");
String node2 = getNodeIdOfChild("child2");
- System.err.println("Child1:" + node1);
- System.err.println("Child2:" + node2);
+ System.err.println("Child1: " + node1);
+ System.err.println("Child2: " + node2);
System.err.println(executeCommand("cluster:group-set producer-grp " + localNode.getId()));
System.err.println(executeCommand("cluster:group-set consumer-grp " + node1));
System.err.println(executeCommand("cluster:group-set consumer-grp " + node2));
System.err.println(executeCommand("cluster:group-list"));
- System.err.println(executeCommand("cluster:features-install consumer-grp cellar-sample-camel-consumer"));
- System.err.println(executeCommand("cluster:features-install producer-grp cellar-sample-camel-producer"));
+ System.err.println(executeCommand("cluster:feature-install consumer-grp cellar-sample-camel-consumer"));
+ System.err.println(executeCommand("cluster:feature-install producer-grp cellar-sample-camel-producer"));
Thread.sleep(10000);
- System.err.println(executeCommand("features:list"));
+ System.err.println(executeCommand("feature:list"));
System.err.println(executeCommand("osgi:list"));
System.err.println(executeCommand("cluster:group-list"));
Modified: karaf/cellar/trunk/itests/src/test/java/org/apache/karaf/cellar/itests/CellarSampleDosgiGreeterTest.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/itests/src/test/java/org/apache/karaf/cellar/itests/CellarSampleDosgiGreeterTest.java?rev=1239022&r1=1239021&r2=1239022&view=diff
==============================================================================
--- karaf/cellar/trunk/itests/src/test/java/org/apache/karaf/cellar/itests/CellarSampleDosgiGreeterTest.java (original)
+++ karaf/cellar/trunk/itests/src/test/java/org/apache/karaf/cellar/itests/CellarSampleDosgiGreeterTest.java Wed Feb 1 09:36:22 2012
@@ -52,7 +52,7 @@ public class CellarSampleDosgiGreeterTes
System.err.println(executeCommand("admin:list"));
- System.err.println(executeCommand("cluster:nodes-list"));
+ System.err.println(executeCommand("cluster:node-list"));
Node localNode = clusterManager.getNode();
Set<Node> nodes = clusterManager.listNodes();
assertTrue("There should be at least 3 cellar nodes running", 3 <= nodes.size());
@@ -70,11 +70,11 @@ public class CellarSampleDosgiGreeterTes
System.err.println(executeCommand("cluster:group-set service-grp " + node1));
System.err.println(executeCommand("cluster:group-list"));
- System.err.println(executeCommand("cluster:features-install client-grp greeter-client"));
+ System.err.println(executeCommand("cluster:feature-install client-grp greeter-client"));
Thread.sleep(10000);
- System.err.println(executeCommand("cluster:features-install service-grp greeter-service"));
+ System.err.println(executeCommand("cluster:feature-install service-grp greeter-service"));
Thread.sleep(10000);
- System.err.println(executeCommand("cluster:list-services"));
+ System.err.println(executeCommand("cluster:service-list"));
String greetOutput = executeCommand("dosgi-greeter:greet Hi 10");
System.err.println(greetOutput);
Modified: karaf/cellar/trunk/itests/src/test/java/org/apache/karaf/cellar/itests/CellarTestSupport.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/itests/src/test/java/org/apache/karaf/cellar/itests/CellarTestSupport.java?rev=1239022&r1=1239021&r2=1239022&view=diff
==============================================================================
--- karaf/cellar/trunk/itests/src/test/java/org/apache/karaf/cellar/itests/CellarTestSupport.java (original)
+++ karaf/cellar/trunk/itests/src/test/java/org/apache/karaf/cellar/itests/CellarTestSupport.java Wed Feb 1 09:36:22 2012
@@ -109,9 +109,9 @@ public class CellarTestSupport {
* Installs the Cellar feature
*/
protected void installCellar() {
- System.err.println(executeCommand("features:addurl " + CELLAR_FEATURE_URL));
- System.err.println(executeCommand("features:listurl"));
- System.err.println(executeCommand("features:list"));
+ System.err.println(executeCommand("feature:add-url " + CELLAR_FEATURE_URL));
+ System.err.println(executeCommand("feature:list-url"));
+ System.err.println(executeCommand("feature:list"));
executeCommand("features:install cellar");
}
@@ -160,7 +160,7 @@ public class CellarTestSupport {
* Destroys the child node.
*/
protected void destroyCellarChild(String name) {
- System.err.println(executeCommand("admin:connect " + name + " features:uninstall cellar"));
+ System.err.println(executeCommand("admin:connect " + name + " feature:uninstall cellar"));
System.err.println(executeCommand("admin:stop " + name));
}
@@ -169,7 +169,7 @@ public class CellarTestSupport {
*/
protected String getNodeIdOfChild(String name) {
String nodeId = null;
- String nodesList = executeCommand("admin:connect " + name + " cluster:nodes-list | grep \\\\*", COMMAND_TIMEOUT, true);
+ String nodesList = executeCommand("admin:connect " + name + " cluster:node-list | grep \\\\*", COMMAND_TIMEOUT, true);
String[] tokens = nodesList.split(" ");
if (tokens != null && tokens.length > 0) {
nodeId = tokens[tokens.length - 1].trim().replaceAll("\n", "");
Modified: karaf/cellar/trunk/management/src/main/resources/OSGI-INF/blueprint/blueprint.xml
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/management/src/main/resources/OSGI-INF/blueprint/blueprint.xml?rev=1239022&r1=1239021&r2=1239022&view=diff
==============================================================================
--- karaf/cellar/trunk/management/src/main/resources/OSGI-INF/blueprint/blueprint.xml (original)
+++ karaf/cellar/trunk/management/src/main/resources/OSGI-INF/blueprint/blueprint.xml Wed Feb 1 09:36:22 2012
@@ -56,7 +56,7 @@
<entry value="org.apache.karaf.cellar:type=core,name=${karaf.name}" key-ref="cellarMBean"/>
<entry value="org.apache.karaf.cellar:type=node,name=${karaf.name}" key-ref="cellarNodeMBean"/>
<entry value="org.apache.karaf.cellar:type=config,name=${karaf.name}" key-ref="cellarConfigMBean"/>
- <entry value="org.apache.karaf.cellar:type=features,name=${karaf.name}" key-ref="cellarFeaturesMBean"/>
+ <entry value="org.apache.karaf.cellar:type=feature,name=${karaf.name}" key-ref="cellarFeaturesMBean"/>
<entry value="org.apache.karaf.cellar:type=group,name=${karaf.name}" key-ref="cellarGroupMBean"/>
</map>
</property>
Modified: karaf/cellar/trunk/manual/src/main/webapp/user-guide/deploy.conf
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/manual/src/main/webapp/user-guide/deploy.conf?rev=1239022&r1=1239021&r2=1239022&view=diff
==============================================================================
--- karaf/cellar/trunk/manual/src/main/webapp/user-guide/deploy.conf (original)
+++ karaf/cellar/trunk/manual/src/main/webapp/user-guide/deploy.conf Wed Feb 1 09:36:22 2012
@@ -46,7 +46,7 @@ And Cellar cluster commands are now avai
{code}
karaf@root> cluster:<TAB>
-cluster:config-list cluster:config-proplist cluster:config-propset cluster:consumer-start cluster:consumer-status cluster:consumer-stop cluster:features-install cluster:features-list
-cluster:features-uninstall cluster:group-create cluster:group-delete cluster:group-join cluster:group-list cluster:group-quit cluster:group-set cluster:handler-start
+cluster:config-list cluster:config-proplist cluster:config-propset cluster:consumer-start cluster:consumer-status cluster:consumer-stop cluster:feature-install cluster:feature-list
+cluster:feature-uninstall cluster:group-create cluster:group-delete cluster:group-join cluster:group-list cluster:group-quit cluster:group-set cluster:handler-start
cluster:handler-status cluster:handler-stop cluster:list-nodes cluster:ping cluster:producer-start cluster:producer-status cluster:producer-stop
{code}
Modified: karaf/cellar/trunk/manual/src/main/webapp/user-guide/groups.conf
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/manual/src/main/webapp/user-guide/groups.conf?rev=1239022&r1=1239021&r2=1239022&view=diff
==============================================================================
--- karaf/cellar/trunk/manual/src/main/webapp/user-guide/groups.conf (original)
+++ karaf/cellar/trunk/manual/src/main/webapp/user-guide/groups.conf Wed Feb 1 09:36:22 2012
@@ -114,7 +114,7 @@ h2. Group features
Configuration and features can be assigned to a given group.
{code}
-karaf@root> cluster:features-list default
+karaf@root> cluster:feature-list default
Features for group:default
Name Version Status
spring-dm 1.2.1 true
@@ -145,7 +145,7 @@ spring
{code}
{code}
-karaf@root> cluster:features-list test
+karaf@root> cluster:feature-list test
Features for group:test
Name Version Status
webconsole 3.0.0-SNAPSHOT false
@@ -178,14 +178,14 @@ kar
Now we can "install" a feature for a given cluster group:
{code}
-karaf@root> cluster:features-install test eventadmin
-karaf@root> cluster:features-list test|grep -i event
+karaf@root> cluster:feature-install test eventadmin
+karaf@root> cluster:feature-list test|grep -i event
eventadmin 3.0.0-SNAPSHOT true
{code}
Below, we see that the eventadmin feature has been installed on this member of the test group:
{code}
-karaf@root> features:list|grep -i event
+karaf@root> feature:list|grep -i event
[installed ] [3.0.0-SNAPSHOT ] eventadmin karaf-3.0.0-SNAPSHOT
{code}
Modified: karaf/cellar/trunk/manual/src/main/webapp/user-guide/obr.conf
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/manual/src/main/webapp/user-guide/obr.conf?rev=1239022&r1=1239021&r2=1239022&view=diff
==============================================================================
--- karaf/cellar/trunk/manual/src/main/webapp/user-guide/obr.conf (original)
+++ karaf/cellar/trunk/manual/src/main/webapp/user-guide/obr.conf Wed Feb 1 09:36:22 2012
@@ -14,24 +14,24 @@ Of course, if the Cellar core feature is
nodes of the same group:
{code}
-karaf@root> cluster:features-install group cellar-obr
+karaf@root> cluster:feature-install group cellar-obr
{code}
The Cellar OBR feature will install the Karaf OBR feature which provides the OBR service (RepositoryAdmin).
h2. Register repository URL in a cluster
-The cluster:obr-addurl command registers an OBR repository URL (repository.xml) in a cluster group:
+The cluster:obr-add-url command registers an OBR repository URL (repository.xml) in a cluster group:
{code}
-karaf@root> cluster:obr-addurl group file://path/to/repository.xml
-karaf@root> cluster:obr-addurl group http://karaf.cave.host:9090/cave/repo-repository.xml
+karaf@root> cluster:obr-add-url group file://path/to/repository.xml
+karaf@root> cluster:obr-add-url group http://karaf.cave.host:9090/cave/repo-repository.xml
{code}
The OBR repository URLs are stored in a cluster distributed set. It allows new nodes to register the distributed URLs:
{code}
-karaf@root> cluster:obr-listurl group
+karaf@root> cluster:obr-list-url group
file://path/to/repository.xml
http://karaf.cave.host:9090/cave/repo-repository.xml
{code}
@@ -57,7 +57,7 @@ karaf@root> cluster:obr-list group
When you remove a repository URL from the distributed OBR, the bundles' distributed set is updated:
{code}
-karaf@root> cluster:obr-removeurl group http://karaf.cave.host:9090/cave/repo-repository.xml
+karaf@root> cluster:obr-remove-url group http://karaf.cave.host:9090/cave/repo-repository.xml
{code}
h2. Deploying bundles using the cluster OBR
Modified: karaf/cellar/trunk/obr/src/main/java/org/apache/karaf/cellar/obr/shell/ObrAddUrlCommand.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/obr/src/main/java/org/apache/karaf/cellar/obr/shell/ObrAddUrlCommand.java?rev=1239022&r1=1239021&r2=1239022&view=diff
==============================================================================
--- karaf/cellar/trunk/obr/src/main/java/org/apache/karaf/cellar/obr/shell/ObrAddUrlCommand.java (original)
+++ karaf/cellar/trunk/obr/src/main/java/org/apache/karaf/cellar/obr/shell/ObrAddUrlCommand.java Wed Feb 1 09:36:22 2012
@@ -29,13 +29,13 @@ import java.util.Set;
/**
* cluster:obr-addurl command.
*/
-@Command(scope = "cluster", name = "obr-addurl", description = "Register a repository URLS_DISTRIBUTED_SET_NAME in the distributed OBR service")
+@Command(scope = "cluster", name = "obr-add-url", description = "Register a repository URL in the distributed OBR service.")
public class ObrAddUrlCommand extends ObrCommandSupport {
- @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 = "url", description = "The repository URLS_DISTRIBUTED_SET_NAME to register in the OBR service", required = true, multiValued = false)
+ @Argument(index = 1, name = "url", description = "The repository URL to register in the OBR service.", required = true, multiValued = false)
String url;
public Object doExecute() throws Exception {
@@ -47,7 +47,7 @@ public class ObrAddUrlCommand extends Ob
event.setForce(true);
event.setSourceGroup(group);
producer.produce(event);
- // push the OBR URLS_DISTRIBUTED_SET_NAME in the distributed set
+ // push the OBR URLs in the distributed set
Set<String> urls = clusterManager.getSet(Constants.URLS_DISTRIBUTED_SET_NAME + Configurations.SEPARATOR + groupName);
urls.add(url);
// push the bundles in the OBR distributed set
Modified: karaf/cellar/trunk/obr/src/main/java/org/apache/karaf/cellar/obr/shell/ObrDeployCommand.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/obr/src/main/java/org/apache/karaf/cellar/obr/shell/ObrDeployCommand.java?rev=1239022&r1=1239021&r2=1239022&view=diff
==============================================================================
--- karaf/cellar/trunk/obr/src/main/java/org/apache/karaf/cellar/obr/shell/ObrDeployCommand.java (original)
+++ karaf/cellar/trunk/obr/src/main/java/org/apache/karaf/cellar/obr/shell/ObrDeployCommand.java Wed Feb 1 09:36:22 2012
@@ -25,16 +25,16 @@ import org.apache.karaf.cellar.obr.ObrBu
/**
* Deploy a bundle from the OBR.
*/
-@Command(scope = "cluster", name = "obr-deploy", description = "Deploy a bundle from the OBR on a cluster group")
+@Command(scope = "cluster", name = "obr-deploy", description = "Deploy a bundle from the OBR on a cluster group.")
public class ObrDeployCommand extends CellarCommandSupport {
- @Argument(index = 0, name = "group", description = "The cluster group where to deploy the bundle from the OBR", required = true, multiValued = false)
+ @Argument(index = 0, name = "group", description = "The cluster group name.", required = true, multiValued = false)
String groupName;
- @Argument(index = 1, name="bundleId", description = "The bundle ID (symbolicname,version in the OBR) to deploy", required = true, multiValued = false)
+ @Argument(index = 1, name="bundleId", description = "The bundle ID (symbolicname,version in the OBR) to deploy.", required = true, multiValued = false)
String bundleId;
- @Option(name = "-s", aliases = { "--start" }, description = "Start the deployed bundles", required = false, multiValued = false)
+ @Option(name = "-s", aliases = { "--start" }, description = "Start the deployed bundles.", required = false, multiValued = false)
boolean start = false;
@Override
Modified: karaf/cellar/trunk/obr/src/main/java/org/apache/karaf/cellar/obr/shell/ObrListCommand.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/obr/src/main/java/org/apache/karaf/cellar/obr/shell/ObrListCommand.java?rev=1239022&r1=1239021&r2=1239022&view=diff
==============================================================================
--- karaf/cellar/trunk/obr/src/main/java/org/apache/karaf/cellar/obr/shell/ObrListCommand.java (original)
+++ karaf/cellar/trunk/obr/src/main/java/org/apache/karaf/cellar/obr/shell/ObrListCommand.java Wed Feb 1 09:36:22 2012
@@ -25,10 +25,10 @@ import java.util.Set;
/**
* cluster:obr-list command.
*/
-@Command(scope = "cluster", name = "obr-list", description = "List available bundles in the OBR of all nodes of the same cluster group.")
+@Command(scope = "cluster", name = "obr-list", description = "List available bundles in the OBR of all nodes assigned to a cluster group.")
public class ObrListCommand extends CellarCommandSupport {
- @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;
public Object doExecute() {
Modified: karaf/cellar/trunk/obr/src/main/java/org/apache/karaf/cellar/obr/shell/ObrListUrlCommand.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/obr/src/main/java/org/apache/karaf/cellar/obr/shell/ObrListUrlCommand.java?rev=1239022&r1=1239021&r2=1239022&view=diff
==============================================================================
--- karaf/cellar/trunk/obr/src/main/java/org/apache/karaf/cellar/obr/shell/ObrListUrlCommand.java (original)
+++ karaf/cellar/trunk/obr/src/main/java/org/apache/karaf/cellar/obr/shell/ObrListUrlCommand.java Wed Feb 1 09:36:22 2012
@@ -24,10 +24,10 @@ import java.util.Set;
/**
* cluster:obr-list command
*/
-@Command(scope = "cluster", name = "obr-listurl", description = "List repository URLs defined in the distributed OBR service for the given group")
+@Command(scope = "cluster", name = "obr-list-url", description = "List repository URLs defined in the distributed OBR service for the given cluster group.")
public class ObrListUrlCommand extends CellarCommandSupport {
- @Argument(index = 0, name = "group", description = "Cluster group name", required = true, multiValued = false)
+ @Argument(index = 0, name = "group", description = "The cluster group name.", required = true, multiValued = false)
String groupName;
public Object doExecute() throws Exception {
Modified: karaf/cellar/trunk/obr/src/main/java/org/apache/karaf/cellar/obr/shell/ObrRemoveUrlCommand.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/obr/src/main/java/org/apache/karaf/cellar/obr/shell/ObrRemoveUrlCommand.java?rev=1239022&r1=1239021&r2=1239022&view=diff
==============================================================================
--- karaf/cellar/trunk/obr/src/main/java/org/apache/karaf/cellar/obr/shell/ObrRemoveUrlCommand.java (original)
+++ karaf/cellar/trunk/obr/src/main/java/org/apache/karaf/cellar/obr/shell/ObrRemoveUrlCommand.java Wed Feb 1 09:36:22 2012
@@ -29,13 +29,13 @@ import java.util.Set;
/**
* cluster:obr-removeurl command
*/
-@Command(scope = "cluster", name = "obr-removeurl", description = "Remove a repository URLS_DISTRIBUTED_SET_NAME from the distributed OBR service")
+@Command(scope = "cluster", name = "obr-remove-url", description = "Remove a repository URL from the distributed OBR service.")
public class ObrRemoveUrlCommand extends ObrCommandSupport {
- @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 = "url", description = "The repository URLS_DISTRIBUTED_SET_NAME to add in the OBR service", required = true, multiValued = false)
+ @Argument(index = 1, name = "url", description = "The repository URL to remove from the OBR service.", required = true, multiValued = false)
String url;
public Object doExecute() throws Exception {
Modified: karaf/cellar/trunk/obr/src/main/resources/OSGI-INF/blueprint/shell-commands.xml
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/obr/src/main/resources/OSGI-INF/blueprint/shell-commands.xml?rev=1239022&r1=1239021&r2=1239022&view=diff
==============================================================================
--- karaf/cellar/trunk/obr/src/main/resources/OSGI-INF/blueprint/shell-commands.xml (original)
+++ karaf/cellar/trunk/obr/src/main/resources/OSGI-INF/blueprint/shell-commands.xml Wed Feb 1 09:36:22 2012
@@ -38,7 +38,7 @@
<null/>
</completers>
</command>
- <command name="cluster/obr-listurl">
+ <command name="cluster/obr-list-url">
<action class="org.apache.karaf.cellar.obr.shell.ObrListUrlCommand">
<property name="clusterManager" ref="clusterManager"/>
<property name="groupManager" ref="groupManager"/>
@@ -49,7 +49,7 @@
<null/>
</completers>
</command>
- <command name="cluster/obr-addurl">
+ <command name="cluster/obr-add-url">
<action class="org.apache.karaf.cellar.obr.shell.ObrAddUrlCommand">
<property name="clusterManager" ref="clusterManager"/>
<property name="groupManager" ref="groupManager"/>
@@ -61,7 +61,7 @@
<null/>
</completers>
</command>
- <command name="cluster/obr-removeurl">
+ <command name="cluster/obr-remove-url">
<action class="org.apache.karaf.cellar.obr.shell.ObrRemoveUrlCommand">
<property name="clusterManager" ref="clusterManager"/>
<property name="groupManager" ref="groupManager"/>
Modified: karaf/cellar/trunk/samples/dosgi-greeter/README
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/samples/dosgi-greeter/README?rev=1239022&r1=1239021&r2=1239022&view=diff
==============================================================================
--- karaf/cellar/trunk/samples/dosgi-greeter/README (original)
+++ karaf/cellar/trunk/samples/dosgi-greeter/README Wed Feb 1 09:36:22 2012
@@ -16,7 +16,7 @@ Installation
Node A Shell:
-------------
- karaf@root> features:addurl mvn:org.apache.karaf.cellar.samples/dosgi-greeter/3.0.0-SNAPSHOT/xml/features
+ karaf@root> feature:add-url mvn:org.apache.karaf.cellar.samples/dosgi-greeter/3.0.0-SNAPSHOT/xml/features
karaf@root> cluster:group-set greeter-exporter-group 192.168.1.1:5702
Node Group
* 192.168.1.101:5701 greeter-exporter-group
@@ -24,8 +24,8 @@ Installation
karaf@root> cluster:group-set greeter-importer-group 192.168.1.1:5701
Node Group
* 192.168.1.101:5701 greeter-importer-group
- karaf@root> cluster:features-install greeter-exporter-group greeter-service
- karaf@root> cluster:features-install greeter-importer-group greeter-client
+ karaf@root> cluster:feature-install greeter-exporter-group greeter-service
+ karaf@root> cluster:feature-install greeter-importer-group greeter-client
3. Executing the greet (Pass a greet message and the number of iterations).
karaf@root> dosgi-greeter:greet Halo 2
Modified: karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/ClusterCommandSupport.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/ClusterCommandSupport.java?rev=1239022&r1=1239021&r2=1239022&view=diff
==============================================================================
--- karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/ClusterCommandSupport.java (original)
+++ karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/ClusterCommandSupport.java Wed Feb 1 09:36:22 2012
@@ -16,9 +16,6 @@ package org.apache.karaf.cellar.shell;
import org.apache.karaf.cellar.core.command.ExecutionContext;
import org.apache.karaf.cellar.core.shell.CellarCommandSupport;
-/**
- * Abstract Cluster command.
- */
public abstract class ClusterCommandSupport extends CellarCommandSupport {
protected ExecutionContext executionContext;
Modified: karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/NodePingCommand.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/NodePingCommand.java?rev=1239022&r1=1239021&r2=1239022&view=diff
==============================================================================
--- karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/NodePingCommand.java (original)
+++ karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/NodePingCommand.java Wed Feb 1 09:36:22 2012
@@ -21,19 +21,16 @@ import org.apache.felix.gogo.commands.Co
import java.util.Arrays;
import java.util.HashSet;
-/**
- * Ping command.
- */
-@Command(scope = "cluster", name = "node-ping", description = "Ping a node of the cluster.")
+@Command(scope = "cluster", name = "node-ping", description = "Ping a cluster node.")
public class NodePingCommand extends ClusterCommandSupport {
- @Argument(index = 0, name = "node", description = "The ID of the node 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)
+ @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 iteration.", required = false, multiValued = false)
Long interval = 1000L;
@Override
Modified: karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/NodesListCommand.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/NodesListCommand.java?rev=1239022&r1=1239021&r2=1239022&view=diff
==============================================================================
--- karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/NodesListCommand.java (original)
+++ karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/NodesListCommand.java Wed Feb 1 09:36:22 2012
@@ -18,10 +18,7 @@ import org.apache.felix.gogo.commands.Co
import java.util.Set;
-/**
- * List nodes command.
- */
-@Command(scope = "cluster", name = "nodes-list", description = "Lists the nodes in the cluster")
+@Command(scope = "cluster", name = "node-list", description = "List the nodes in the cluster.")
public class NodesListCommand extends ClusterCommandSupport {
private static final String LIST_FORMAT = "%1s %4s %-20s %5s %s";
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=1239022&r1=1239021&r2=1239022&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 Wed Feb 1 09:36:22 2012
@@ -19,21 +19,12 @@ import org.apache.felix.gogo.commands.Co
import java.util.List;
-/**
- * Consumer start command.
- */
-@Command(scope = "cluster", name = "consumer-start", description = "Start an event consumer")
+@Command(scope = "cluster", name = "consumer-start", description = "Start an event consumer.")
public class ConsumerStartCommand extends ConsumerSupport {
- @Argument(index = 0, name = "node", description = "The ID of the node(s)", required = false, multiValued = true)
+ @Argument(index = 0, name = "node", description = "The node(s) ID.", required = false, multiValued = true)
List<String> nodes;
- /**
- * Executes the command.
- *
- * @return
- * @throws Exception
- */
@Override
protected Object doExecute() throws Exception {
return doExecute(nodes, SwitchStatus.ON);
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=1239022&r1=1239021&r2=1239022&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 Wed Feb 1 09:36:22 2012
@@ -18,21 +18,12 @@ import org.apache.felix.gogo.commands.Co
import java.util.List;
-/**
- * Consumer status command.
- */
-@Command(scope = "cluster", name = "consumer-status", description = "Status of an event consumer")
+@Command(scope = "cluster", name = "consumer-status", description = "Status of an event consumer.")
public class ConsumerStatusCommand extends ConsumerSupport {
- @Argument(index = 0, name = "node", description = "The ID of the node(s)", required = false, multiValued = true)
+ @Argument(index = 0, name = "node", description = "The node(s) ID.", required = false, multiValued = true)
List<String> nodes;
- /**
- * Executes the command.
- *
- * @return
- * @throws Exception
- */
@Override
protected Object doExecute() throws Exception {
return doExecute(nodes, null);
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=1239022&r1=1239021&r2=1239022&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 Wed Feb 1 09:36:22 2012
@@ -19,21 +19,12 @@ import org.apache.felix.gogo.commands.Co
import java.util.List;
-/**
- * Consumer stop command.
- */
-@Command(scope = "cluster", name = "consumer-stop", description = "Stop an event consumer")
+@Command(scope = "cluster", name = "consumer-stop", description = "Stop an event consumer.")
public class ConsumerStopCommand extends ConsumerSupport {
- @Argument(index = 0, name = "node", description = "The ID of the node(s)", required = false, multiValued = true)
+ @Argument(index = 0, name = "node", description = "The node(s) ID.", required = false, multiValued = true)
List<String> nodes;
- /**
- * Executes the command.
- *
- * @return
- * @throws Exception
- */
@Override
protected Object doExecute() throws Exception {
return doExecute(nodes, SwitchStatus.OFF);
Modified: karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/consumer/ConsumerSupport.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/consumer/ConsumerSupport.java?rev=1239022&r1=1239021&r2=1239022&view=diff
==============================================================================
--- karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/consumer/ConsumerSupport.java (original)
+++ karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/consumer/ConsumerSupport.java Wed Feb 1 09:36:22 2012
@@ -23,19 +23,10 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-/**
- * Abstract consumer command support.
- */
public abstract class ConsumerSupport extends ClusterCommandSupport {
protected static final String OUTPUT_FORMAT = "%-20s %s";
- /**
- * Executes the command.
- *
- * @return
- * @throws Exception
- */
protected Object doExecute(List<String> nodes, SwitchStatus status) throws Exception {
ConsumerSwitchCommand command = new ConsumerSwitchCommand(clusterManager.generateId());
Set<Node> recipientList = clusterManager.listNodes(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=1239022&r1=1239021&r2=1239022&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 Wed Feb 1 09:36:22 2012
@@ -16,21 +16,12 @@ package org.apache.karaf.cellar.shell.gr
import org.apache.felix.gogo.commands.Argument;
import org.apache.felix.gogo.commands.Command;
-/**
- * Group create command.
- */
-@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 name of the group", required = false, multiValued = false)
+ @Argument(index = 0, name = "group", description = "The cluster group name.", required = false, multiValued = false)
String group;
- /**
- * Executes the command.
- *
- * @return
- * @throws Exception
- */
@Override
protected Object doExecute() throws Exception {
return groupManager.createGroup(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=1239022&r1=1239021&r2=1239022&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 Wed Feb 1 09:36:22 2012
@@ -22,21 +22,12 @@ import org.apache.felix.gogo.commands.Co
import java.util.LinkedList;
import java.util.List;
-/**
- * Group delete command.
- */
-@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 name of the group", required = false, multiValued = false)
+ @Argument(index = 0, name = "group", description = "The cluster group name.", required = false, multiValued = false)
String group;
- /**
- * Executes the command.
- *
- * @return
- * @throws Exception
- */
@Override
protected Object doExecute() throws Exception {
ClassLoader originalClassLoader = Thread.currentThread().getContextClassLoader();
@@ -44,7 +35,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=1239022&r1=1239021&r2=1239022&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 Wed Feb 1 09:36:22 2012
@@ -19,24 +19,15 @@ import org.apache.felix.gogo.commands.Co
import java.util.List;
-/**
- * Group join command.
- */
-@Command(scope = "cluster", name = "group-join", description = "Join node(s) to a cluster group")
+@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", required = false, multiValued = false)
+ @Argument(index = 0, name = "group", description = "The cluster group name.", required = false, multiValued = false)
String group;
- @Argument(index = 1, name = "node", description = "The ID of the node(s)", required = false, multiValued = true)
+ @Argument(index = 1, name = "node", description = "The node(s) ID.", required = false, multiValued = true)
List<String> nodes;
- /**
- * Executes the command.
- *
- * @return
- * @throws Exception
- */
@Override
protected Object doExecute() throws Exception {
return doExecute(ManageGroupAction.JOIN, group, nodes,false);
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=1239022&r1=1239021&r2=1239022&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 Wed Feb 1 09:36:22 2012
@@ -19,21 +19,12 @@ import org.apache.felix.gogo.commands.Co
import java.util.List;
-/**
- * Group list command.
- */
-@Command(scope = "cluster", name = "group-list", description = "List the cluster 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)", required = false, multiValued = true)
+ @Argument(index = 0, name = "node", description = "The node(s) ID.", required = false, multiValued = true)
List<String> nodes;
- /**
- * Executes the command.
- *
- * @return
- * @throws Exception
- */
@Override
protected Object doExecute() throws Exception {
return doExecute(ManageGroupAction.LIST, null, nodes,false);
Modified: karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupPickCommand.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupPickCommand.java?rev=1239022&r1=1239021&r2=1239022&view=diff
==============================================================================
--- karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupPickCommand.java (original)
+++ karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupPickCommand.java Wed Feb 1 09:36:22 2012
@@ -24,16 +24,16 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Set;
-@Command(scope = "cluster", name = "group-pick", description = "Picks a number of nodes from one group and moves them into an other")
+@Command(scope = "cluster", name = "group-pick", description = "Picks a number of nodes from one cluster group and moves them into an other.")
public class GroupPickCommand extends GroupSupport {
- @Argument(index = 0, name = "sourceGroupName", description = "The name of the source group that will act as a selection pool", required = true, multiValued = false)
+ @Argument(index = 0, name = "sourceGroupName", description = "The source cluster group name.", required = true, multiValued = false)
String sourceGroupName;
- @Argument(index = 1, name = "targetGroupName", description = "The name of the the destination group", required = true, multiValued = false)
+ @Argument(index = 1, name = "targetGroupName", 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
@@ -66,7 +66,7 @@ public class GroupPickCommand extends Gr
doExecute(ManageGroupAction.LIST, null, new ArrayList(), false);
- } else System.err.println("Cannot find source group with name:" + sourceGroupName);
+ } else System.err.println("Cannot find source group with name: " + sourceGroupName);
return null;
}
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=1239022&r1=1239021&r2=1239022&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 Wed Feb 1 09:36:22 2012
@@ -19,24 +19,15 @@ import org.apache.felix.gogo.commands.Co
import java.util.List;
-/**
- * Group quit command.
- */
-@Command(scope = "cluster", name = "group-quit", description = "Quit node(s) from a cluster group")
+@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", required = false, multiValued = false)
+ @Argument(index = 0, name = "group", description = "The cluster group name.", required = false, multiValued = false)
String group;
- @Argument(index = 1, name = "node", description = "The ID of the node(s)", required = false, multiValued = true)
+ @Argument(index = 1, name = "node", description = "The node(s) ID.", required = false, multiValued = true)
List<String> nodes;
- /**
- * Executes the command.
- *
- * @return
- * @throws Exception
- */
@Override
protected Object doExecute() throws Exception {
return doExecute(ManageGroupAction.QUIT, group, nodes,false);
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=1239022&r1=1239021&r2=1239022&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 Wed Feb 1 09:36:22 2012
@@ -19,24 +19,15 @@ import org.apache.felix.gogo.commands.Co
import java.util.List;
-/**
- * Group set command.
- */
-@Command(scope = "cluster", name = "group-set", description = "Set the target nodes to a group")
+@Command(scope = "cluster", name = "group-set", description = "Set the target nodes to a cluster group.")
public class GroupSetCommand extends GroupSupport {
- @Argument(index = 0, name = "group", description = "The name of the group", required = false, multiValued = false)
+ @Argument(index = 0, name = "group", description = "The cluster group name.", required = false, multiValued = false)
String group;
- @Argument(index = 1, name = "node", description = "The ID of the node(s)", required = false, multiValued = true)
+ @Argument(index = 1, name = "node", description = "The node(s) ID.", required = false, multiValued = true)
List<String> nodes;
- /**
- * Executes the command.
- *
- * @return
- * @throws Exception
- */
@Override
protected Object doExecute() throws Exception {
return doExecute(ManageGroupAction.SET, group, nodes,false);
Modified: karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupSupport.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupSupport.java?rev=1239022&r1=1239021&r2=1239022&view=diff
==============================================================================
--- karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupSupport.java (original)
+++ karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupSupport.java Wed Feb 1 09:36:22 2012
@@ -25,34 +25,14 @@ import java.util.HashSet;
import java.util.Map;
import java.util.Set;
-/**
- * Group command support.
- */
public abstract class GroupSupport extends ClusterCommandSupport {
protected static final String OUTPUT_FORMAT = "%1s %-20s %s";
- /**
- * 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);
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=1239022&r1=1239021&r2=1239022&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 Wed Feb 1 09:36:22 2012
@@ -13,31 +13,20 @@
*/
package org.apache.karaf.cellar.shell.handler;
-import org.apache.karaf.cellar.core.ClusterManager;
-import org.apache.karaf.cellar.core.command.ExecutionContext;
import org.apache.felix.gogo.commands.Argument;
import org.apache.felix.gogo.commands.Command;
import java.util.List;
-/**
- * Handlers command.
- */
-@Command(scope = "cluster", name = "handlers", description = "Starts an event handler")
+@Command(scope = "cluster", name = "handlers", description = "Start an event handler.")
public class HandlersStartCommand extends HandlersSupport {
- @Argument(index = 0, name = "handler-start", description = "The ID of the event handler", required = false, multiValued = false)
+ @Argument(index = 0, name = "handler", description = "The event handler ID.", 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 node(s) ID.", required = false, multiValued = true)
List<String> nodes;
- /**
- * Executes the command.
- *
- * @return
- * @throws Exception
- */
@Override
protected Object doExecute() throws Exception {
return doExecute(handler, nodes, Boolean.TRUE);
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=1239022&r1=1239021&r2=1239022&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 Wed Feb 1 09:36:22 2012
@@ -13,31 +13,20 @@
*/
package org.apache.karaf.cellar.shell.handler;
-import org.apache.karaf.cellar.core.ClusterManager;
-import org.apache.karaf.cellar.core.command.ExecutionContext;
import org.apache.felix.gogo.commands.Argument;
import org.apache.felix.gogo.commands.Command;
import java.util.List;
-/**
- * Handlers status command.
- */
-@Command(scope = "cluster", name = "handler-status", description = "Status of a given event handler")
+@Command(scope = "cluster", name = "handler-status", description = "Status of a given event handler.")
public class HandlersStatusCommand extends HandlersSupport {
- @Argument(index = 0, name = "handler-start", description = "The ID of the event handler", required = false, multiValued = false)
+ @Argument(index = 0, name = "handler", description = "The event handler ID.", 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 node(s) ID.", required = false, multiValued = true)
List<String> nodes;
- /**
- * Executes the command.
- *
- * @return
- * @throws Exception
- */
@Override
protected Object doExecute() throws Exception {
return doExecute(handler, nodes, null);
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=1239022&r1=1239021&r2=1239022&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 Wed Feb 1 09:36:22 2012
@@ -13,31 +13,20 @@
*/
package org.apache.karaf.cellar.shell.handler;
-import org.apache.karaf.cellar.core.ClusterManager;
-import org.apache.karaf.cellar.core.command.ExecutionContext;
import org.apache.felix.gogo.commands.Argument;
import org.apache.felix.gogo.commands.Command;
import java.util.List;
-/**
- * Handlers stop command.
- */
-@Command(scope = "cluster", name = "handler-stop", description = "Stop an event handler")
+@Command(scope = "cluster", name = "handler-stop", description = "Stop an event handler.")
public class HandlersStopCommand extends HandlersSupport {
- @Argument(index = 0, name = "handler", description = "The ID of the event handler", required = false, multiValued = false)
+ @Argument(index = 0, name = "handler", description = "The event handler ID.", 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 node(s) ID.", required = false, multiValued = true)
List<String> nodes;
- /**
- * Executes the command.
- *
- * @return
- * @throws Exception
- */
@Override
protected Object doExecute() throws Exception {
return doExecute(handler, nodes, Boolean.FALSE);
Modified: karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/handler/HandlersSupport.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/handler/HandlersSupport.java?rev=1239022&r1=1239021&r2=1239022&view=diff
==============================================================================
--- karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/handler/HandlersSupport.java (original)
+++ karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/handler/HandlersSupport.java Wed Feb 1 09:36:22 2012
@@ -22,19 +22,10 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-/**
- * Handlers command support.
- */
public abstract class HandlersSupport extends ClusterCommandSupport {
protected static final String OUTPUT_FORMAT = "%-20s %-7s %s";
- /**
- * Executes the command.
- *
- * @return
- * @throws Exception
- */
protected Object doExecute(String handlerName, List<String> nodes, Boolean status) throws Exception {
ManageHandlersCommand command = new ManageHandlersCommand(clusterManager.generateId());
Set<Node> recipientList = clusterManager.listNodes(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=1239022&r1=1239021&r2=1239022&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 Wed Feb 1 09:36:22 2012
@@ -19,21 +19,12 @@ import org.apache.felix.gogo.commands.Co
import java.util.List;
-/**
- * Producer start command.
- */
-@Command(scope = "cluster", name = "producer-start", description = "Start an event producer")
+@Command(scope = "cluster", name = "producer-start", description = "Start an event producer.")
public class ProducerStartCommand extends ProducerSupport {
- @Argument(index = 0, name = "node", description = "The ID of the node(s)", required = false, multiValued = true)
+ @Argument(index = 0, name = "node", description = "The node(s) ID.", required = false, multiValued = true)
List<String> nodes;
- /**
- * Executes the command.
- *
- * @return
- * @throws Exception
- */
@Override
protected Object doExecute() throws Exception {
return doExecute(nodes, SwitchStatus.ON);
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=1239022&r1=1239021&r2=1239022&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 Wed Feb 1 09:36:22 2012
@@ -18,21 +18,12 @@ import org.apache.felix.gogo.commands.Co
import java.util.List;
-/**
- * Producer start command.
- */
-@Command(scope = "cluster", name = "producer-start", description = "Status of an event producer")
+@Command(scope = "cluster", name = "producer-status", description = "Status of an event producer.")
public class ProducerStatusCommand extends ProducerSupport {
- @Argument(index = 0, name = "node", description = "The ID of the node(s)", required = false, multiValued = true)
+ @Argument(index = 0, name = "node", description = "The node(s) ID.", required = false, multiValued = true)
List<String> nodes;
- /**
- * Executes the command.
- *
- * @return
- * @throws Exception
- */
@Override
protected Object doExecute() throws Exception {
return doExecute(nodes, null);
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=1239022&r1=1239021&r2=1239022&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 Wed Feb 1 09:36:22 2012
@@ -19,21 +19,12 @@ import org.apache.felix.gogo.commands.Co
import java.util.List;
-/**
- * Producer stop command.
- */
-@Command(scope = "cluster", name = "producer-stop", description = "Stop an event producer")
+@Command(scope = "cluster", name = "producer-stop", description = "Stop an event producer.")
public class ProducerStopCommand extends ProducerSupport {
- @Argument(index = 0, name = "node", description = "The ID of the node(s)", required = false, multiValued = true)
+ @Argument(index = 0, name = "node", description = "The node(s) ID.", required = false, multiValued = true)
List<String> nodes;
- /**
- * Executes the command.
- *
- * @return
- * @throws Exception
- */
@Override
protected Object doExecute() throws Exception {
return doExecute(nodes, SwitchStatus.OFF);
Modified: karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/producer/ProducerSupport.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/producer/ProducerSupport.java?rev=1239022&r1=1239021&r2=1239022&view=diff
==============================================================================
--- karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/producer/ProducerSupport.java (original)
+++ karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/producer/ProducerSupport.java Wed Feb 1 09:36:22 2012
@@ -23,19 +23,10 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-/**
- * Producer command support.
- */
public abstract class ProducerSupport extends ClusterCommandSupport {
protected static final String OUTPUT_FORMAT = "%-20s %s";
- /**
- * Executes the command.
- *
- * @return
- * @throws Exception
- */
protected Object doExecute(List<String> nodes, SwitchStatus status) throws Exception {
ProducerSwitchCommand command = new ProducerSwitchCommand(clusterManager.generateId());
Set<Node> recipientList = clusterManager.listNodes(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=1239022&r1=1239021&r2=1239022&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 Wed Feb 1 09:36:22 2012
@@ -17,7 +17,7 @@
<!-- Command Bundle -->
<command-bundle xmlns="http://karaf.apache.org/xmlns/shell/v1.0.0">
- <command name="cluster/nodes-list">
+ <command name="cluster/node-list">
<action class="org.apache.karaf.cellar.shell.NodesListCommand">
<property name="clusterManager" ref="clusterManager"/>
</action>
Modified: karaf/cellar/trunk/utils/src/main/java/org/apache/karaf/cellar/utils/ping/Ping.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/utils/src/main/java/org/apache/karaf/cellar/utils/ping/Ping.java?rev=1239022&r1=1239021&r2=1239022&view=diff
==============================================================================
--- karaf/cellar/trunk/utils/src/main/java/org/apache/karaf/cellar/utils/ping/Ping.java (original)
+++ karaf/cellar/trunk/utils/src/main/java/org/apache/karaf/cellar/utils/ping/Ping.java Wed Feb 1 09:36:22 2012
@@ -15,9 +15,6 @@ package org.apache.karaf.cellar.utils.pi
import org.apache.karaf.cellar.core.command.Command;
-/**
- * Ping.
- */
public class Ping extends Command<Pong> {
public Ping(String id) {