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/01/26 18:27:46 UTC
svn commit: r1236300 [1/2] - in /karaf/cellar/branches/cellar-2.2.x:
bundle/src/main/java/org/apache/karaf/cellar/bundle/shell/
config/src/main/java/org/apache/karaf/cellar/config/shell/
dosgi/src/main/java/org/apache/karaf/cellar/dosgi/shell/ dosgi/sr...
Author: jbonofre
Date: Thu Jan 26 17:27:44 2012
New Revision: 1236300
URL: http://svn.apache.org/viewvc?rev=1236300&view=rev
Log:
[KARAF-1171] Consolidate Cellar shell commands
Modified:
karaf/cellar/branches/cellar-2.2.x/bundle/src/main/java/org/apache/karaf/cellar/bundle/shell/InstallBundleCommand.java
karaf/cellar/branches/cellar-2.2.x/bundle/src/main/java/org/apache/karaf/cellar/bundle/shell/ListBundleCommand.java
karaf/cellar/branches/cellar-2.2.x/bundle/src/main/java/org/apache/karaf/cellar/bundle/shell/StartBundleCommand.java
karaf/cellar/branches/cellar-2.2.x/bundle/src/main/java/org/apache/karaf/cellar/bundle/shell/StopBundleCommand.java
karaf/cellar/branches/cellar-2.2.x/bundle/src/main/java/org/apache/karaf/cellar/bundle/shell/UninstallBundleCommand.java
karaf/cellar/branches/cellar-2.2.x/config/src/main/java/org/apache/karaf/cellar/config/shell/ListCommand.java
karaf/cellar/branches/cellar-2.2.x/config/src/main/java/org/apache/karaf/cellar/config/shell/PropListCommand.java
karaf/cellar/branches/cellar-2.2.x/config/src/main/java/org/apache/karaf/cellar/config/shell/PropSetCommand.java
karaf/cellar/branches/cellar-2.2.x/dosgi/src/main/java/org/apache/karaf/cellar/dosgi/shell/ListDistributedServicesCommand.java
karaf/cellar/branches/cellar-2.2.x/dosgi/src/main/resources/OSGI-INF/blueprint/shell-dosgi.xml
karaf/cellar/branches/cellar-2.2.x/features/src/main/java/org/apache/karaf/cellar/features/shell/InstallFeatureCommand.java
karaf/cellar/branches/cellar-2.2.x/features/src/main/java/org/apache/karaf/cellar/features/shell/ListGroupFeatures.java
karaf/cellar/branches/cellar-2.2.x/features/src/main/java/org/apache/karaf/cellar/features/shell/UninstallFeatureCommand.java
karaf/cellar/branches/cellar-2.2.x/itests/src/test/java/org/apache/karaf/cellar/itests/CellarChildNodesTest.java
karaf/cellar/branches/cellar-2.2.x/itests/src/test/java/org/apache/karaf/cellar/itests/CellarFeaturesTest.java
karaf/cellar/branches/cellar-2.2.x/itests/src/test/java/org/apache/karaf/cellar/itests/CellarGroupsTest.java
karaf/cellar/branches/cellar-2.2.x/itests/src/test/java/org/apache/karaf/cellar/itests/CellarInstallationTest.java
karaf/cellar/branches/cellar-2.2.x/itests/src/test/java/org/apache/karaf/cellar/itests/CellarSampleCamelHazelcastTest.java
karaf/cellar/branches/cellar-2.2.x/itests/src/test/java/org/apache/karaf/cellar/itests/CellarSampleDosgiGreeterTest.java
karaf/cellar/branches/cellar-2.2.x/itests/src/test/java/org/apache/karaf/cellar/itests/CellarTestSupport.java
karaf/cellar/branches/cellar-2.2.x/management/src/main/resources/OSGI-INF/blueprint/blueprint.xml
karaf/cellar/branches/cellar-2.2.x/manual/src/main/webapp/user-guide/deploy.conf
karaf/cellar/branches/cellar-2.2.x/manual/src/main/webapp/user-guide/groups.conf
karaf/cellar/branches/cellar-2.2.x/manual/src/main/webapp/user-guide/obr.conf
karaf/cellar/branches/cellar-2.2.x/obr/src/main/java/org/apache/karaf/cellar/obr/shell/ObrAddUrlCommand.java
karaf/cellar/branches/cellar-2.2.x/obr/src/main/java/org/apache/karaf/cellar/obr/shell/ObrDeployCommand.java
karaf/cellar/branches/cellar-2.2.x/obr/src/main/java/org/apache/karaf/cellar/obr/shell/ObrListCommand.java
karaf/cellar/branches/cellar-2.2.x/obr/src/main/java/org/apache/karaf/cellar/obr/shell/ObrListUrlCommand.java
karaf/cellar/branches/cellar-2.2.x/obr/src/main/java/org/apache/karaf/cellar/obr/shell/ObrRemoveUrlCommand.java
karaf/cellar/branches/cellar-2.2.x/obr/src/main/resources/OSGI-INF/blueprint/shell-commands.xml
karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/README
karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/ClusterCommandSupport.java
karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/NodePingCommand.java
karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/NodesListCommand.java
karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/consumer/ConsumerStartCommand.java
karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/consumer/ConsumerStatusCommand.java
karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/consumer/ConsumerStopCommand.java
karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/consumer/ConsumerSupport.java
karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupCreateCommand.java
karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupDeleteCommand.java
karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupJoinCommand.java
karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupListCommand.java
karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupPickCommand.java
karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupQuitCommand.java
karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupSetCommand.java
karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupSupport.java
karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/handler/HandlersStartCommand.java
karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/handler/HandlersStatusCommand.java
karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/handler/HandlersStopCommand.java
karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/handler/HandlersSupport.java
karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/producer/ProducerStartCommand.java
karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/producer/ProducerStatusCommand.java
karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/producer/ProducerStopCommand.java
karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/producer/ProducerSupport.java
karaf/cellar/branches/cellar-2.2.x/shell/src/main/resources/OSGI-INF/blueprint/shell-cluster.xml
karaf/cellar/branches/cellar-2.2.x/utils/src/main/java/org/apache/karaf/cellar/utils/ping/Ping.java
karaf/cellar/branches/cellar-2.2.x/utils/src/main/java/org/apache/karaf/cellar/utils/ping/PingHandler.java
karaf/cellar/branches/cellar-2.2.x/utils/src/main/java/org/apache/karaf/cellar/utils/ping/Pong.java
karaf/cellar/branches/cellar-2.2.x/utils/src/main/java/org/apache/karaf/cellar/utils/ping/PongHandler.java
Modified: karaf/cellar/branches/cellar-2.2.x/bundle/src/main/java/org/apache/karaf/cellar/bundle/shell/InstallBundleCommand.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/bundle/src/main/java/org/apache/karaf/cellar/bundle/shell/InstallBundleCommand.java?rev=1236300&r1=1236299&r2=1236300&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/bundle/src/main/java/org/apache/karaf/cellar/bundle/shell/InstallBundleCommand.java (original)
+++ karaf/cellar/branches/cellar-2.2.x/bundle/src/main/java/org/apache/karaf/cellar/bundle/shell/InstallBundleCommand.java Thu Jan 26 17:27:44 2012
@@ -29,13 +29,13 @@ import java.util.Map;
import java.util.jar.JarInputStream;
import java.util.jar.Manifest;
-@Command(scope = "cluster", name = "bundle-install", description = "Install a bundle to a cluster group")
+@Command(scope = "cluster", name = "bundle-install", description = "Install a bundle assigned to a cluster group.")
public class InstallBundleCommand 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;
- @Argument(index = 1, name = "location", description = "The bundle location", required = true, multiValued = false)
+ @Argument(index = 1, name = "location", description = "The bundle location.", required = true, multiValued = false)
String location;
@Override
Modified: karaf/cellar/branches/cellar-2.2.x/bundle/src/main/java/org/apache/karaf/cellar/bundle/shell/ListBundleCommand.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/bundle/src/main/java/org/apache/karaf/cellar/bundle/shell/ListBundleCommand.java?rev=1236300&r1=1236299&r2=1236300&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/bundle/src/main/java/org/apache/karaf/cellar/bundle/shell/ListBundleCommand.java (original)
+++ karaf/cellar/branches/cellar-2.2.x/bundle/src/main/java/org/apache/karaf/cellar/bundle/shell/ListBundleCommand.java Thu Jan 26 17:27:44 2012
@@ -23,12 +23,12 @@ import org.osgi.framework.BundleEvent;
import java.util.Map;
-@Command(scope = "cluster", name = "bundle-list", description = "List the bundles that are assigned to a cluster group")
+@Command(scope = "cluster", name = "bundle-list", description = "List the bundles assigned to a cluster group.")
public class ListBundleCommand extends CellarCommandSupport {
protected static final String OUTPUT_FORMAT = "%-50s %-20s %-15s %-20s";
- @Argument(index = 0, name = "group", description = "The name of the cluster 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/branches/cellar-2.2.x/bundle/src/main/java/org/apache/karaf/cellar/bundle/shell/StartBundleCommand.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/bundle/src/main/java/org/apache/karaf/cellar/bundle/shell/StartBundleCommand.java?rev=1236300&r1=1236299&r2=1236300&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/bundle/src/main/java/org/apache/karaf/cellar/bundle/shell/StartBundleCommand.java (original)
+++ karaf/cellar/branches/cellar-2.2.x/bundle/src/main/java/org/apache/karaf/cellar/bundle/shell/StartBundleCommand.java Thu Jan 26 17:27:44 2012
@@ -21,16 +21,16 @@ import org.apache.karaf.cellar.core.even
import org.apache.karaf.cellar.core.shell.CellarCommandSupport;
import org.osgi.framework.BundleEvent;
-@Command(scope = "cluster", name = "bundle-start", description = "Start a bundle on a given cluster group")
+@Command(scope = "cluster", name = "bundle-start", description = "Start a bundle assigned to a cluster group.")
public class StartBundleCommand 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;
- @Argument(index = 1, name = "name", description = "The bundle symbolic name", required = true, multiValued = false)
+ @Argument(index = 1, name = "name", description = "The bundle symbolic name.", required = true, multiValued = false)
String name;
- @Argument(index = 2, name = "version", description = "The bundle version", required = true, multiValued = false)
+ @Argument(index = 2, name = "version", description = "The bundle version.", required = true, multiValued = false)
String version;
@Override
Modified: karaf/cellar/branches/cellar-2.2.x/bundle/src/main/java/org/apache/karaf/cellar/bundle/shell/StopBundleCommand.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/bundle/src/main/java/org/apache/karaf/cellar/bundle/shell/StopBundleCommand.java?rev=1236300&r1=1236299&r2=1236300&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/bundle/src/main/java/org/apache/karaf/cellar/bundle/shell/StopBundleCommand.java (original)
+++ karaf/cellar/branches/cellar-2.2.x/bundle/src/main/java/org/apache/karaf/cellar/bundle/shell/StopBundleCommand.java Thu Jan 26 17:27:44 2012
@@ -21,16 +21,16 @@ import org.apache.karaf.cellar.core.even
import org.apache.karaf.cellar.core.shell.CellarCommandSupport;
import org.osgi.framework.BundleEvent;
-@Command(scope = "cluster", name = "bundle-stop", description = "Stop a bundle on the given cluster group")
+@Command(scope = "cluster", name = "bundle-stop", description = "Stop a bundle assigned to a cluster group.")
public class StopBundleCommand 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;
- @Argument(index = 1, name = "name", description = "The bundle symbolic name", required = true, multiValued = false)
+ @Argument(index = 1, name = "name", description = "The bundle symbolic name.", required = true, multiValued = false)
String name;
- @Argument(index = 2, name = "version", description = "The bundle version", required = true, multiValued = false)
+ @Argument(index = 2, name = "version", description = "The bundle version.", required = true, multiValued = false)
String version;
@Override
Modified: karaf/cellar/branches/cellar-2.2.x/bundle/src/main/java/org/apache/karaf/cellar/bundle/shell/UninstallBundleCommand.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/bundle/src/main/java/org/apache/karaf/cellar/bundle/shell/UninstallBundleCommand.java?rev=1236300&r1=1236299&r2=1236300&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/bundle/src/main/java/org/apache/karaf/cellar/bundle/shell/UninstallBundleCommand.java (original)
+++ karaf/cellar/branches/cellar-2.2.x/bundle/src/main/java/org/apache/karaf/cellar/bundle/shell/UninstallBundleCommand.java Thu Jan 26 17:27:44 2012
@@ -21,16 +21,16 @@ import org.apache.karaf.cellar.core.even
import org.apache.karaf.cellar.core.shell.CellarCommandSupport;
import org.osgi.framework.BundleEvent;
-@Command(scope = "cluster", name = "bundle-uninstall", description = "Uninstall a bundle from a cluster group")
+@Command(scope = "cluster", name = "bundle-uninstall", description = "Uninstall a bundle assigned to a cluster group.")
public class UninstallBundleCommand 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;
- @Argument(index = 1, name = "name", description = "The bundle symbolic name", required = true, multiValued = false)
+ @Argument(index = 1, name = "name", description = "The bundle symbolic name.", required = true, multiValued = false)
String name;
- @Argument(index = 2, name = "version", description = "The bundle version", required = true, multiValued = false)
+ @Argument(index = 2, name = "version", description = "The bundle version.", required = true, multiValued = false)
String version;
@Override
Modified: karaf/cellar/branches/cellar-2.2.x/config/src/main/java/org/apache/karaf/cellar/config/shell/ListCommand.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/config/src/main/java/org/apache/karaf/cellar/config/shell/ListCommand.java?rev=1236300&r1=1236299&r2=1236300&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/config/src/main/java/org/apache/karaf/cellar/config/shell/ListCommand.java (original)
+++ karaf/cellar/branches/cellar-2.2.x/config/src/main/java/org/apache/karaf/cellar/config/shell/ListCommand.java Thu Jan 26 17:27:44 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 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/branches/cellar-2.2.x/config/src/main/java/org/apache/karaf/cellar/config/shell/PropListCommand.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/config/src/main/java/org/apache/karaf/cellar/config/shell/PropListCommand.java?rev=1236300&r1=1236299&r2=1236300&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/config/src/main/java/org/apache/karaf/cellar/config/shell/PropListCommand.java (original)
+++ karaf/cellar/branches/cellar-2.2.x/config/src/main/java/org/apache/karaf/cellar/config/shell/PropListCommand.java Thu Jan 26 17:27:44 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 configuration PIDs 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
@@ -56,7 +56,6 @@ public class PropListCommand extends Cel
} else System.err.print("No configuration PID found for group " + groupName);
} finally {
Thread.currentThread().setContextClassLoader(originalClassLoader);
-
}
return null;
}
Modified: karaf/cellar/branches/cellar-2.2.x/config/src/main/java/org/apache/karaf/cellar/config/shell/PropSetCommand.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/config/src/main/java/org/apache/karaf/cellar/config/shell/PropSetCommand.java?rev=1236300&r1=1236299&r2=1236300&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/config/src/main/java/org/apache/karaf/cellar/config/shell/PropSetCommand.java (original)
+++ karaf/cellar/branches/cellar-2.2.x/config/src/main/java/org/apache/karaf/cellar/config/shell/PropSetCommand.java Thu Jan 26 17:27:44 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 assigned to a cluster group.")
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/branches/cellar-2.2.x/dosgi/src/main/java/org/apache/karaf/cellar/dosgi/shell/ListDistributedServicesCommand.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/dosgi/src/main/java/org/apache/karaf/cellar/dosgi/shell/ListDistributedServicesCommand.java?rev=1236300&r1=1236299&r2=1236300&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/dosgi/src/main/java/org/apache/karaf/cellar/dosgi/shell/ListDistributedServicesCommand.java (original)
+++ karaf/cellar/branches/cellar-2.2.x/dosgi/src/main/java/org/apache/karaf/cellar/dosgi/shell/ListDistributedServicesCommand.java Thu Jan 26 17:27:44 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/branches/cellar-2.2.x/dosgi/src/main/resources/OSGI-INF/blueprint/shell-dosgi.xml
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/dosgi/src/main/resources/OSGI-INF/blueprint/shell-dosgi.xml?rev=1236300&r1=1236299&r2=1236300&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/dosgi/src/main/resources/OSGI-INF/blueprint/shell-dosgi.xml (original)
+++ karaf/cellar/branches/cellar-2.2.x/dosgi/src/main/resources/OSGI-INF/blueprint/shell-dosgi.xml Thu Jan 26 17:27:44 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/branches/cellar-2.2.x/features/src/main/java/org/apache/karaf/cellar/features/shell/InstallFeatureCommand.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/features/src/main/java/org/apache/karaf/cellar/features/shell/InstallFeatureCommand.java?rev=1236300&r1=1236299&r2=1236300&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/features/src/main/java/org/apache/karaf/cellar/features/shell/InstallFeatureCommand.java (original)
+++ karaf/cellar/branches/cellar-2.2.x/features/src/main/java/org/apache/karaf/cellar/features/shell/InstallFeatureCommand.java Thu Jan 26 17:27:44 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/branches/cellar-2.2.x/features/src/main/java/org/apache/karaf/cellar/features/shell/ListGroupFeatures.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/features/src/main/java/org/apache/karaf/cellar/features/shell/ListGroupFeatures.java?rev=1236300&r1=1236299&r2=1236300&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/features/src/main/java/org/apache/karaf/cellar/features/shell/ListGroupFeatures.java (original)
+++ karaf/cellar/branches/cellar-2.2.x/features/src/main/java/org/apache/karaf/cellar/features/shell/ListGroupFeatures.java Thu Jan 26 17:27:44 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
@@ -40,7 +37,7 @@ public class ListGroupFeatures extends F
Map<FeatureInfo, Boolean> features = clusterManager.getMap(Constants.FEATURES + Configurations.SEPARATOR + groupName);
if (features != null && !features.isEmpty()) {
- System.out.println(String.format("Features for group:" + groupName));
+ System.out.println(String.format("Features for group: " + groupName));
System.out.println(String.format(OUTPUT_FORMAT, "Name", "Version", "Status"));
for (FeatureInfo info : features.keySet()) {
String name = info.getName();
@@ -50,10 +47,9 @@ public class ListGroupFeatures extends F
version = "";
System.out.println(String.format(OUTPUT_FORMAT, name, version, status));
}
- } else System.err.print("No features found for group:" + groupName);
+ } else System.err.print("No features found for group: " + groupName);
} finally {
Thread.currentThread().setContextClassLoader(originalClassLoader);
-
}
return null;
}
Modified: karaf/cellar/branches/cellar-2.2.x/features/src/main/java/org/apache/karaf/cellar/features/shell/UninstallFeatureCommand.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/features/src/main/java/org/apache/karaf/cellar/features/shell/UninstallFeatureCommand.java?rev=1236300&r1=1236299&r2=1236300&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/features/src/main/java/org/apache/karaf/cellar/features/shell/UninstallFeatureCommand.java (original)
+++ karaf/cellar/branches/cellar-2.2.x/features/src/main/java/org/apache/karaf/cellar/features/shell/UninstallFeatureCommand.java Thu Jan 26 17:27:44 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 = "features-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/branches/cellar-2.2.x/itests/src/test/java/org/apache/karaf/cellar/itests/CellarChildNodesTest.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/itests/src/test/java/org/apache/karaf/cellar/itests/CellarChildNodesTest.java?rev=1236300&r1=1236299&r2=1236300&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/itests/src/test/java/org/apache/karaf/cellar/itests/CellarChildNodesTest.java (original)
+++ karaf/cellar/branches/cellar-2.2.x/itests/src/test/java/org/apache/karaf/cellar/itests/CellarChildNodesTest.java Thu Jan 26 17:27:44 2012
@@ -46,7 +46,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/branches/cellar-2.2.x/itests/src/test/java/org/apache/karaf/cellar/itests/CellarFeaturesTest.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/itests/src/test/java/org/apache/karaf/cellar/itests/CellarFeaturesTest.java?rev=1236300&r1=1236299&r2=1236300&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/itests/src/test/java/org/apache/karaf/cellar/itests/CellarFeaturesTest.java (original)
+++ karaf/cellar/branches/cellar-2.2.x/itests/src/test/java/org/apache/karaf/cellar/itests/CellarFeaturesTest.java Thu Jan 26 17:27:44 2012
@@ -69,21 +69,21 @@ public class CellarFeaturesTest extends
assertTrue(eventadminFeaturesStatus.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);
eventadminFeaturesStatus = executeCommand("admin:connect child1 features:list | grep eventadmin");
System.err.println(eventadminFeaturesStatus);
assertTrue(eventadminFeaturesStatus.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);
eventadminFeaturesStatus = executeCommand("admin:connect child1 features:list | grep eventadmin");
System.err.println(eventadminFeaturesStatus);
assertTrue(eventadminFeaturesStatus.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);
eventadminFeaturesStatus = executeCommand("admin:connect child1 features:list | grep eventadmin");
@@ -93,7 +93,7 @@ public class CellarFeaturesTest extends
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/branches/cellar-2.2.x/itests/src/test/java/org/apache/karaf/cellar/itests/CellarGroupsTest.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/itests/src/test/java/org/apache/karaf/cellar/itests/CellarGroupsTest.java?rev=1236300&r1=1236299&r2=1236300&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/itests/src/test/java/org/apache/karaf/cellar/itests/CellarGroupsTest.java (original)
+++ karaf/cellar/branches/cellar-2.2.x/itests/src/test/java/org/apache/karaf/cellar/itests/CellarGroupsTest.java Thu Jan 26 17:27:44 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/branches/cellar-2.2.x/itests/src/test/java/org/apache/karaf/cellar/itests/CellarInstallationTest.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/itests/src/test/java/org/apache/karaf/cellar/itests/CellarInstallationTest.java?rev=1236300&r1=1236299&r2=1236300&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/itests/src/test/java/org/apache/karaf/cellar/itests/CellarInstallationTest.java (original)
+++ karaf/cellar/branches/cellar-2.2.x/itests/src/test/java/org/apache/karaf/cellar/itests/CellarInstallationTest.java Thu Jan 26 17:27:44 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"));
}
@Configuration
Modified: karaf/cellar/branches/cellar-2.2.x/itests/src/test/java/org/apache/karaf/cellar/itests/CellarSampleCamelHazelcastTest.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/itests/src/test/java/org/apache/karaf/cellar/itests/CellarSampleCamelHazelcastTest.java?rev=1236300&r1=1236299&r2=1236300&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/itests/src/test/java/org/apache/karaf/cellar/itests/CellarSampleCamelHazelcastTest.java (original)
+++ karaf/cellar/branches/cellar-2.2.x/itests/src/test/java/org/apache/karaf/cellar/itests/CellarSampleCamelHazelcastTest.java Thu Jan 26 17:27:44 2012
@@ -49,7 +49,7 @@ public class CellarSampleCamelHazelcastT
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", nodes.size() >= 3);
@@ -67,8 +67,8 @@ public class CellarSampleCamelHazelcastT
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("osgi:list"));
Modified: karaf/cellar/branches/cellar-2.2.x/itests/src/test/java/org/apache/karaf/cellar/itests/CellarSampleDosgiGreeterTest.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/itests/src/test/java/org/apache/karaf/cellar/itests/CellarSampleDosgiGreeterTest.java?rev=1236300&r1=1236299&r2=1236300&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/itests/src/test/java/org/apache/karaf/cellar/itests/CellarSampleDosgiGreeterTest.java (original)
+++ karaf/cellar/branches/cellar-2.2.x/itests/src/test/java/org/apache/karaf/cellar/itests/CellarSampleDosgiGreeterTest.java Thu Jan 26 17:27:44 2012
@@ -55,7 +55,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());
@@ -73,11 +73,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);
assertEquals("Expected 10 greets", 10, countGreetsFromNode(greetOutput, node1));
@@ -86,7 +86,7 @@ public class CellarSampleDosgiGreeterTes
Thread.sleep(10000);
System.err.println(executeCommand("cluster:group-list"));
System.err.println(executeCommand("admin:connect child2 osgi:list -t 0"));
- System.err.println(executeCommand("cluster:list-services"));
+ System.err.println(executeCommand("cluster:service-list"));
greetOutput = executeCommand("dosgi-greeter:greet Hi 10");
System.err.println(greetOutput);
assertEquals("Expected 5 greets", 5, countGreetsFromNode(greetOutput, node1));
Modified: karaf/cellar/branches/cellar-2.2.x/itests/src/test/java/org/apache/karaf/cellar/itests/CellarTestSupport.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/itests/src/test/java/org/apache/karaf/cellar/itests/CellarTestSupport.java?rev=1236300&r1=1236299&r2=1236300&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/itests/src/test/java/org/apache/karaf/cellar/itests/CellarTestSupport.java (original)
+++ karaf/cellar/branches/cellar-2.2.x/itests/src/test/java/org/apache/karaf/cellar/itests/CellarTestSupport.java Thu Jan 26 17:27:44 2012
@@ -172,7 +172,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/branches/cellar-2.2.x/management/src/main/resources/OSGI-INF/blueprint/blueprint.xml
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/management/src/main/resources/OSGI-INF/blueprint/blueprint.xml?rev=1236300&r1=1236299&r2=1236300&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/management/src/main/resources/OSGI-INF/blueprint/blueprint.xml (original)
+++ karaf/cellar/branches/cellar-2.2.x/management/src/main/resources/OSGI-INF/blueprint/blueprint.xml Thu Jan 26 17:27:44 2012
@@ -62,7 +62,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=bundle,name=${karaf.name}" key-ref="cellarBundleMBean"/>
<entry value="org.apache.karaf.cellar:type=group,name=${karaf.name}" key-ref="cellarGroupMBean"/>
</map>
Modified: karaf/cellar/branches/cellar-2.2.x/manual/src/main/webapp/user-guide/deploy.conf
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/manual/src/main/webapp/user-guide/deploy.conf?rev=1236300&r1=1236299&r2=1236300&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/manual/src/main/webapp/user-guide/deploy.conf (original)
+++ karaf/cellar/branches/cellar-2.2.x/manual/src/main/webapp/user-guide/deploy.conf Thu Jan 26 17:27:44 2012
@@ -46,7 +46,8 @@ 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:features-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/branches/cellar-2.2.x/manual/src/main/webapp/user-guide/groups.conf
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/manual/src/main/webapp/user-guide/groups.conf?rev=1236300&r1=1236299&r2=1236300&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/manual/src/main/webapp/user-guide/groups.conf (original)
+++ karaf/cellar/branches/cellar-2.2.x/manual/src/main/webapp/user-guide/groups.conf Thu Jan 26 17:27:44 2012
@@ -178,8 +178,8 @@ 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 2.2.1 true
{code}
Modified: karaf/cellar/branches/cellar-2.2.x/manual/src/main/webapp/user-guide/obr.conf
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/manual/src/main/webapp/user-guide/obr.conf?rev=1236300&r1=1236299&r2=1236300&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/manual/src/main/webapp/user-guide/obr.conf (original)
+++ karaf/cellar/branches/cellar-2.2.x/manual/src/main/webapp/user-guide/obr.conf Thu Jan 26 17:27:44 2012
@@ -14,7 +14,7 @@ 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).
@@ -24,14 +24,14 @@ h2. Register repository URL in a cluster
The cluster:obr-addurl command registers a 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/branches/cellar-2.2.x/obr/src/main/java/org/apache/karaf/cellar/obr/shell/ObrAddUrlCommand.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/obr/src/main/java/org/apache/karaf/cellar/obr/shell/ObrAddUrlCommand.java?rev=1236300&r1=1236299&r2=1236300&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/obr/src/main/java/org/apache/karaf/cellar/obr/shell/ObrAddUrlCommand.java (original)
+++ karaf/cellar/branches/cellar-2.2.x/obr/src/main/java/org/apache/karaf/cellar/obr/shell/ObrAddUrlCommand.java Thu Jan 26 17:27:44 2012
@@ -26,16 +26,13 @@ import org.apache.karaf.cellar.obr.ObrUr
import java.util.Set;
-/**
- * cluster:obr-addurl command.
- */
-@Command(scope = "cluster", name = "obr-addurl", description = "Register a repository URL 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 URL 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 {
@@ -52,11 +49,11 @@ public class ObrAddUrlCommand extends Ob
urls.add(url);
// push the bundles in the OBR distributed set
Set<ObrBundleInfo> bundles = clusterManager.getSet(Constants.BUNDLES_DISTRIBUTED_SET_NAME + Configurations.SEPARATOR + groupName);
- synchronized(obrService) {
+ synchronized (obrService) {
Repository repository = obrService.addRepository(url);
Resource[] resources = repository.getResources();
for (Resource resource : resources) {
- ObrBundleInfo info = new ObrBundleInfo(resource.getPresentationName(),resource.getSymbolicName(), resource.getVersion().toString());
+ ObrBundleInfo info = new ObrBundleInfo(resource.getPresentationName(), resource.getSymbolicName(), resource.getVersion().toString());
bundles.add(info);
}
obrService.removeRepository(url);
Modified: karaf/cellar/branches/cellar-2.2.x/obr/src/main/java/org/apache/karaf/cellar/obr/shell/ObrDeployCommand.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/obr/src/main/java/org/apache/karaf/cellar/obr/shell/ObrDeployCommand.java?rev=1236300&r1=1236299&r2=1236300&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/obr/src/main/java/org/apache/karaf/cellar/obr/shell/ObrDeployCommand.java (original)
+++ karaf/cellar/branches/cellar-2.2.x/obr/src/main/java/org/apache/karaf/cellar/obr/shell/ObrDeployCommand.java Thu Jan 26 17:27:44 2012
@@ -26,19 +26,16 @@ import org.apache.karaf.cellar.obr.ObrBu
import java.util.Set;
-/**
- * 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 assigned to 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/branches/cellar-2.2.x/obr/src/main/java/org/apache/karaf/cellar/obr/shell/ObrListCommand.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/obr/src/main/java/org/apache/karaf/cellar/obr/shell/ObrListCommand.java?rev=1236300&r1=1236299&r2=1236300&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/obr/src/main/java/org/apache/karaf/cellar/obr/shell/ObrListCommand.java (original)
+++ karaf/cellar/branches/cellar-2.2.x/obr/src/main/java/org/apache/karaf/cellar/obr/shell/ObrListCommand.java Thu Jan 26 17:27:44 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/branches/cellar-2.2.x/obr/src/main/java/org/apache/karaf/cellar/obr/shell/ObrListUrlCommand.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/obr/src/main/java/org/apache/karaf/cellar/obr/shell/ObrListUrlCommand.java?rev=1236300&r1=1236299&r2=1236300&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/obr/src/main/java/org/apache/karaf/cellar/obr/shell/ObrListUrlCommand.java (original)
+++ karaf/cellar/branches/cellar-2.2.x/obr/src/main/java/org/apache/karaf/cellar/obr/shell/ObrListUrlCommand.java Thu Jan 26 17:27:44 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 assigned to a given 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/branches/cellar-2.2.x/obr/src/main/java/org/apache/karaf/cellar/obr/shell/ObrRemoveUrlCommand.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/obr/src/main/java/org/apache/karaf/cellar/obr/shell/ObrRemoveUrlCommand.java?rev=1236300&r1=1236299&r2=1236300&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/obr/src/main/java/org/apache/karaf/cellar/obr/shell/ObrRemoveUrlCommand.java (original)
+++ karaf/cellar/branches/cellar-2.2.x/obr/src/main/java/org/apache/karaf/cellar/obr/shell/ObrRemoveUrlCommand.java Thu Jan 26 17:27:44 2012
@@ -26,16 +26,13 @@ import org.apache.karaf.cellar.obr.ObrUr
import java.util.Set;
-/**
- * cluster:obr-removeurl command
- */
-@Command(scope = "cluster", name = "obr-removeurl", description = "Remove a repository URL from the distributed OBR service")
+@Command(scope = "cluster", name = "obr-remove-url", description = "Remove a repository URL from the distributed OBR service assigned to a cluster group.")
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 URL to add in the OBR service", required = true, multiValued = false)
+ @Argument(index = 1, name = "url", description = "The repository URL to add in the OBR service.", required = true, multiValued = false)
String url;
public Object doExecute() throws Exception {
@@ -52,11 +49,11 @@ public class ObrRemoveUrlCommand extends
urls.remove(url);
// remove bundles from the distributed map
Set<ObrBundleInfo> bundles = clusterManager.getSet(Constants.BUNDLES_DISTRIBUTED_SET_NAME + Configurations.SEPARATOR + groupName);
- synchronized(obrService) {
+ synchronized (obrService) {
Repository repository = obrService.addRepository(url);
Resource[] resources = repository.getResources();
for (Resource resource : resources) {
- ObrBundleInfo info = new ObrBundleInfo(resource.getPresentationName(),resource.getSymbolicName(), resource.getVersion().toString());
+ ObrBundleInfo info = new ObrBundleInfo(resource.getPresentationName(), resource.getSymbolicName(), resource.getVersion().toString());
bundles.remove(info);
}
obrService.removeRepository(url);
Modified: karaf/cellar/branches/cellar-2.2.x/obr/src/main/resources/OSGI-INF/blueprint/shell-commands.xml
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/obr/src/main/resources/OSGI-INF/blueprint/shell-commands.xml?rev=1236300&r1=1236299&r2=1236300&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/obr/src/main/resources/OSGI-INF/blueprint/shell-commands.xml (original)
+++ karaf/cellar/branches/cellar-2.2.x/obr/src/main/resources/OSGI-INF/blueprint/shell-commands.xml Thu Jan 26 17:27:44 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/branches/cellar-2.2.x/samples/dosgi-greeter/README
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/README?rev=1236300&r1=1236299&r2=1236300&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/README (original)
+++ karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/README Thu Jan 26 17:27:44 2012
@@ -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/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/ClusterCommandSupport.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/ClusterCommandSupport.java?rev=1236300&r1=1236299&r2=1236300&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/ClusterCommandSupport.java (original)
+++ karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/ClusterCommandSupport.java Thu Jan 26 17:27:44 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/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/NodePingCommand.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/NodePingCommand.java?rev=1236300&r1=1236299&r2=1236300&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/NodePingCommand.java (original)
+++ karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/NodePingCommand.java Thu Jan 26 17:27:44 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 in 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 node ID to ping.", required = true, multiValued = false)
String nodeId;
- @Argument(index = 1, name = "iterations", description = "The number of iterations to perform", required = false, multiValued = false)
+ @Argument(index = 1, name = "iterations", description = "The number of iterations to perform.", required = false, multiValued = false)
Integer iterations = 10;
- @Argument(index = 2, name = "interval", description = "The time in millis to wait between iterations", required = false, multiValued = false)
+ @Argument(index = 2, name = "interval", description = "The time in millis to wait between iterations.", required = false, multiValued = false)
Long interval = 1000L;
@Override
Modified: karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/NodesListCommand.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/NodesListCommand.java?rev=1236300&r1=1236299&r2=1236300&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/NodesListCommand.java (original)
+++ karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/NodesListCommand.java Thu Jan 26 17:27:44 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 of the cluster")
+@Command(scope = "cluster", name = "node-list", description = "List the cluster nodes.")
public class NodesListCommand extends ClusterCommandSupport {
private static final String LIST_FORMAT = "%1s %4s %-20s %5s %s";
Modified: karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/consumer/ConsumerStartCommand.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/consumer/ConsumerStartCommand.java?rev=1236300&r1=1236299&r2=1236300&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/consumer/ConsumerStartCommand.java (original)
+++ karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/consumer/ConsumerStartCommand.java Thu Jan 26 17:27:44 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/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/consumer/ConsumerStatusCommand.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/consumer/ConsumerStatusCommand.java?rev=1236300&r1=1236299&r2=1236300&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/consumer/ConsumerStatusCommand.java (original)
+++ karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/consumer/ConsumerStatusCommand.java Thu Jan 26 17:27:44 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/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/consumer/ConsumerStopCommand.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/consumer/ConsumerStopCommand.java?rev=1236300&r1=1236299&r2=1236300&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/consumer/ConsumerStopCommand.java (original)
+++ karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/consumer/ConsumerStopCommand.java Thu Jan 26 17:27:44 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/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/consumer/ConsumerSupport.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/consumer/ConsumerSupport.java?rev=1236300&r1=1236299&r2=1236300&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/consumer/ConsumerSupport.java (original)
+++ karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/consumer/ConsumerSupport.java Thu Jan 26 17:27:44 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/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupCreateCommand.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupCreateCommand.java?rev=1236300&r1=1236299&r2=1236300&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupCreateCommand.java (original)
+++ karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupCreateCommand.java Thu Jan 26 17:27:44 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/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupDeleteCommand.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupDeleteCommand.java?rev=1236300&r1=1236299&r2=1236300&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupDeleteCommand.java (original)
+++ karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupDeleteCommand.java Thu Jan 26 17:27:44 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();
Modified: karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupJoinCommand.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupJoinCommand.java?rev=1236300&r1=1236299&r2=1236300&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupJoinCommand.java (original)
+++ karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupJoinCommand.java Thu Jan 26 17:27:44 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 a cluster group")
+@Command(scope = "cluster", name = "group-join", description = "Join a cluster group.")
public class GroupJoinCommand extends GroupSupport {
- @Argument(index = 0, name = "group", description = "The 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/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupListCommand.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupListCommand.java?rev=1236300&r1=1236299&r2=1236300&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupListCommand.java (original)
+++ karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupListCommand.java Thu Jan 26 17:27:44 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 cluster groups")
+@Command(scope = "cluster", name = "group-list", description = "List 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/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupPickCommand.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupPickCommand.java?rev=1236300&r1=1236299&r2=1236300&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupPickCommand.java (original)
+++ karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupPickCommand.java Thu Jan 26 17:27:44 2012
@@ -24,16 +24,16 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Set;
-@Command(scope = "cluster", name = "group-pick", description = "Pick a number of nodes from one group and moves them into an other")
+@Command(scope = "cluster", name = "group-pick", description = "Pick a number of nodes from one cluster group and moves them into another.")
public class GroupPickCommand extends GroupSupport {
- @Argument(index = 0, name = "sourceGroupName", description = "The name of the source group that will act as a selection pool", required = true, multiValued = false)
+ @Argument(index = 0, name = "source", description = "The source cluster group name that will act as a selection pool.", required = true, multiValued = false)
String sourceGroupName;
- @Argument(index = 1, name = "targetGroupName", description = "The name of the the destination group", required = true, multiValued = false)
+ @Argument(index = 1, name = "destination", description = "The destination cluster group name.", required = true, multiValued = false)
String targetGroupName;
- @Argument(index = 2, name = "count", description = "The number of nodes to transfer", required = false, multiValued = false)
+ @Argument(index = 2, name = "count", description = "The number of nodes to transfer.", required = false, multiValued = false)
int count = 1;
@Override
@@ -52,9 +52,9 @@ public class GroupPickCommand extends Gr
}
if (eligibleMembers.size() == 0) {
- System.out.println("Could not find eligible members from transfer in group:" + sourceGroupName);
+ System.out.println("Could not find eligible members from transfer in group: " + sourceGroupName);
} else if (eligibleMembers.size() < count) {
- System.out.println("There are fewer(" + eligibleMembers.size() + ") eligible members for transfer in group:" + sourceGroupName);
+ System.out.println("There are fewer(" + eligibleMembers.size() + ") eligible members for transfer in group: " + sourceGroupName);
}
//TODO: The loop should not be necessary since the method already accepts a list. However this is breaks for some reason.
@@ -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/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupQuitCommand.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupQuitCommand.java?rev=1236300&r1=1236299&r2=1236300&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupQuitCommand.java (original)
+++ karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupQuitCommand.java Thu Jan 26 17:27:44 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 = "Quite a cluster group")
+@Command(scope = "cluster", name = "group-quit", description = "Quit a cluster group.")
public class GroupQuitCommand extends GroupSupport {
- @Argument(index = 0, name = "group", description = "The 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/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupSetCommand.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupSetCommand.java?rev=1236300&r1=1236299&r2=1236300&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupSetCommand.java (original)
+++ karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupSetCommand.java Thu Jan 26 17:27:44 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 for a specific cluster group")
+@Command(scope = "cluster", name = "group-set", description = "Set the target nodes for a specific cluster group.")
public class GroupSetCommand extends GroupSupport {
- @Argument(index = 0, name = "group", description = "The 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/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupSupport.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupSupport.java?rev=1236300&r1=1236299&r2=1236300&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupSupport.java (original)
+++ karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupSupport.java Thu Jan 26 17:27:44 2012
@@ -25,9 +25,6 @@ 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";
Modified: karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/handler/HandlersStartCommand.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/handler/HandlersStartCommand.java?rev=1236300&r1=1236299&r2=1236300&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/handler/HandlersStartCommand.java (original)
+++ karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/handler/HandlersStartCommand.java Thu Jan 26 17:27:44 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 = "Start an event handler")
+@Command(scope = "cluster", name = "handler-start", 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);