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 [2/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...
Modified: karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/handler/HandlersStatusCommand.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/handler/HandlersStatusCommand.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/HandlersStatusCommand.java (original)
+++ karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/handler/HandlersStatusCommand.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 status command.
- */
-@Command(scope = "cluster", name = "handler-status", description = "Status of an event handlers")
+@Command(scope = "cluster", name = "handler-status", description = "Status of an 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/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/handler/HandlersStopCommand.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/handler/HandlersStopCommand.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/HandlersStopCommand.java (original)
+++ karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/handler/HandlersStopCommand.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 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/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/handler/HandlersSupport.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/handler/HandlersSupport.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/HandlersSupport.java (original)
+++ karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/handler/HandlersSupport.java Thu Jan 26 17:27:44 2012
@@ -22,9 +22,6 @@ 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";
Modified: karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/producer/ProducerStartCommand.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/producer/ProducerStartCommand.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/producer/ProducerStartCommand.java (original)
+++ karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/producer/ProducerStartCommand.java Thu Jan 26 17:27:44 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/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/producer/ProducerStatusCommand.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/producer/ProducerStatusCommand.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/producer/ProducerStatusCommand.java (original)
+++ karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/producer/ProducerStatusCommand.java Thu Jan 26 17:27:44 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-start", 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/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/producer/ProducerStopCommand.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/producer/ProducerStopCommand.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/producer/ProducerStopCommand.java (original)
+++ karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/producer/ProducerStopCommand.java Thu Jan 26 17:27:44 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")
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/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/producer/ProducerSupport.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/producer/ProducerSupport.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/producer/ProducerSupport.java (original)
+++ karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/producer/ProducerSupport.java Thu Jan 26 17:27:44 2012
@@ -23,9 +23,6 @@ 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";
Modified: karaf/cellar/branches/cellar-2.2.x/shell/src/main/resources/OSGI-INF/blueprint/shell-cluster.xml
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/shell/src/main/resources/OSGI-INF/blueprint/shell-cluster.xml?rev=1236300&r1=1236299&r2=1236300&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/shell/src/main/resources/OSGI-INF/blueprint/shell-cluster.xml (original)
+++ karaf/cellar/branches/cellar-2.2.x/shell/src/main/resources/OSGI-INF/blueprint/shell-cluster.xml Thu Jan 26 17:27:44 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/branches/cellar-2.2.x/utils/src/main/java/org/apache/karaf/cellar/utils/ping/Ping.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/utils/src/main/java/org/apache/karaf/cellar/utils/ping/Ping.java?rev=1236300&r1=1236299&r2=1236300&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/utils/src/main/java/org/apache/karaf/cellar/utils/ping/Ping.java (original)
+++ karaf/cellar/branches/cellar-2.2.x/utils/src/main/java/org/apache/karaf/cellar/utils/ping/Ping.java Thu Jan 26 17:27:44 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) {
Modified: karaf/cellar/branches/cellar-2.2.x/utils/src/main/java/org/apache/karaf/cellar/utils/ping/PingHandler.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/utils/src/main/java/org/apache/karaf/cellar/utils/ping/PingHandler.java?rev=1236300&r1=1236299&r2=1236300&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/utils/src/main/java/org/apache/karaf/cellar/utils/ping/PingHandler.java (original)
+++ karaf/cellar/branches/cellar-2.2.x/utils/src/main/java/org/apache/karaf/cellar/utils/ping/PingHandler.java Thu Jan 26 17:27:44 2012
@@ -17,9 +17,6 @@ import org.apache.karaf.cellar.core.comm
import org.apache.karaf.cellar.core.control.BasicSwitch;
import org.apache.karaf.cellar.core.control.Switch;
-/**
- * Ping handler.
- */
public class PingHandler extends CommandHandler<Ping, Pong> {
public static final String SWITCH_ID = "org.apache.karaf.cellar.command.ping.switch";
Modified: karaf/cellar/branches/cellar-2.2.x/utils/src/main/java/org/apache/karaf/cellar/utils/ping/Pong.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/utils/src/main/java/org/apache/karaf/cellar/utils/ping/Pong.java?rev=1236300&r1=1236299&r2=1236300&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/utils/src/main/java/org/apache/karaf/cellar/utils/ping/Pong.java (original)
+++ karaf/cellar/branches/cellar-2.2.x/utils/src/main/java/org/apache/karaf/cellar/utils/ping/Pong.java Thu Jan 26 17:27:44 2012
@@ -15,9 +15,6 @@ package org.apache.karaf.cellar.utils.pi
import org.apache.karaf.cellar.core.command.Result;
-/**
- * Pong result.
- */
public class Pong extends Result {
public Pong(String id) {
Modified: karaf/cellar/branches/cellar-2.2.x/utils/src/main/java/org/apache/karaf/cellar/utils/ping/PongHandler.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/utils/src/main/java/org/apache/karaf/cellar/utils/ping/PongHandler.java?rev=1236300&r1=1236299&r2=1236300&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/utils/src/main/java/org/apache/karaf/cellar/utils/ping/PongHandler.java (original)
+++ karaf/cellar/branches/cellar-2.2.x/utils/src/main/java/org/apache/karaf/cellar/utils/ping/PongHandler.java Thu Jan 26 17:27:44 2012
@@ -15,9 +15,6 @@ package org.apache.karaf.cellar.utils.pi
import org.apache.karaf.cellar.core.command.ResultHandler;
-/**
- * Pong result handler.
- */
public class PongHandler extends ResultHandler<Pong> {
@Override