You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2011/05/09 12:53:10 UTC
svn commit: r1100950 [2/2] - in /karaf/cellar/trunk:
core/src/main/java/org/apache/karaf/cellar/core/
core/src/main/java/org/apache/karaf/cellar/core/completers/
core/src/main/java/org/apache/karaf/cellar/core/control/
core/src/main/java/org/apache/kar...
Modified: karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/consumer/ConsumerStartCommand.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/consumer/ConsumerStartCommand.java?rev=1100950&r1=1100949&r2=1100950&view=diff
==============================================================================
--- karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/consumer/ConsumerStartCommand.java (original)
+++ karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/consumer/ConsumerStartCommand.java Mon May 9 10:53:06 2011
@@ -11,10 +11,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.cellar.shell.consumer;
-
import org.apache.karaf.cellar.core.control.SwitchStatus;
import org.apache.felix.gogo.commands.Argument;
import org.apache.felix.gogo.commands.Command;
@@ -22,7 +20,7 @@ import org.apache.felix.gogo.commands.Co
import java.util.List;
/**
- * @author iocanel
+ * Consumer start command.
*/
@Command(scope = "cluster", name = "consumer-start", description = "Turns on/off the producer capabilities of a node.")
public class ConsumerStartCommand extends ConsumerSupport {
@@ -31,7 +29,7 @@ public class ConsumerStartCommand extend
List<String> nodes;
/**
- * Execut the command.
+ * Executes the command.
*
* @return
* @throws Exception
@@ -40,4 +38,5 @@ public class ConsumerStartCommand extend
protected Object doExecute() throws Exception {
return doExecute(nodes, SwitchStatus.ON);
}
+
}
Modified: karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/consumer/ConsumerStatusCommand.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/consumer/ConsumerStatusCommand.java?rev=1100950&r1=1100949&r2=1100950&view=diff
==============================================================================
--- karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/consumer/ConsumerStatusCommand.java (original)
+++ karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/consumer/ConsumerStatusCommand.java Mon May 9 10:53:06 2011
@@ -11,17 +11,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.cellar.shell.consumer;
-
import org.apache.felix.gogo.commands.Argument;
import org.apache.felix.gogo.commands.Command;
import java.util.List;
/**
- * @author iocanel
+ * Consumer status command.
*/
@Command(scope = "cluster", name = "consumer-status", description = "Turns on/off the producer capabilities of a node.")
public class ConsumerStatusCommand extends ConsumerSupport {
@@ -30,7 +28,7 @@ public class ConsumerStatusCommand exten
List<String> nodes;
/**
- * Execut the command.
+ * Executes the command.
*
* @return
* @throws Exception
@@ -39,4 +37,5 @@ public class ConsumerStatusCommand exten
protected Object doExecute() throws Exception {
return doExecute(nodes, null);
}
+
}
Modified: karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/consumer/ConsumerStopCommand.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/consumer/ConsumerStopCommand.java?rev=1100950&r1=1100949&r2=1100950&view=diff
==============================================================================
--- karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/consumer/ConsumerStopCommand.java (original)
+++ karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/consumer/ConsumerStopCommand.java Mon May 9 10:53:06 2011
@@ -11,10 +11,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.cellar.shell.consumer;
-
import org.apache.karaf.cellar.core.control.SwitchStatus;
import org.apache.felix.gogo.commands.Argument;
import org.apache.felix.gogo.commands.Command;
@@ -22,7 +20,7 @@ import org.apache.felix.gogo.commands.Co
import java.util.List;
/**
- * @author iocanel
+ * Consumer stop command.
*/
@Command(scope = "cluster", name = "consumer-stop", description = "Turns on/off the producer capabilities of a node.")
public class ConsumerStopCommand extends ConsumerSupport {
@@ -31,7 +29,7 @@ public class ConsumerStopCommand extends
List<String> nodes;
/**
- * Execut the command.
+ * Executes the command.
*
* @return
* @throws Exception
@@ -40,4 +38,5 @@ public class ConsumerStopCommand extends
protected Object doExecute() throws Exception {
return doExecute(nodes, SwitchStatus.OFF);
}
+
}
Modified: karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/consumer/ConsumerSupport.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/consumer/ConsumerSupport.java?rev=1100950&r1=1100949&r2=1100950&view=diff
==============================================================================
--- karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/consumer/ConsumerSupport.java (original)
+++ karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/consumer/ConsumerSupport.java Mon May 9 10:53:06 2011
@@ -11,30 +11,27 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.cellar.shell.consumer;
-
import org.apache.karaf.cellar.core.Node;
import org.apache.karaf.cellar.core.control.ConsumerSwitchCommand;
import org.apache.karaf.cellar.core.control.ConsumerSwitchResult;
import org.apache.karaf.cellar.core.control.SwitchStatus;
-import org.apache.karaf.cellar.shell.ClusterCommandSuppot;
+import org.apache.karaf.cellar.shell.ClusterCommandSupport;
import java.util.List;
import java.util.Map;
import java.util.Set;
/**
- * @author iocanel
+ * Abstract consumer command support.
*/
-
-public abstract class ConsumerSupport extends ClusterCommandSuppot {
+public abstract class ConsumerSupport extends ClusterCommandSupport {
protected static final String OUTPUT_FORMAT = "%-20s %s";
/**
- * Execute the command.
+ * Executes the command.
*
* @return
* @throws Exception
@@ -61,4 +58,5 @@ public abstract class ConsumerSupport ex
}
return null;
}
+
}
Modified: karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupCreateCommand.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupCreateCommand.java?rev=1100950&r1=1100949&r2=1100950&view=diff
==============================================================================
--- karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupCreateCommand.java (original)
+++ karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupCreateCommand.java Mon May 9 10:53:06 2011
@@ -11,25 +11,22 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.cellar.shell.group;
import org.apache.felix.gogo.commands.Argument;
import org.apache.felix.gogo.commands.Command;
/**
- * @author iocanel
+ * Group create command.
*/
@Command(scope = "cluster", name = "group-create", description = "Creates an empty group")
public class GroupCreateCommand extends GroupSupport {
-
@Argument(index = 0, name = "group", description = "The name of the group to join", required = false, multiValued = false)
String group;
-
/**
- * Execute the command.
+ * Executes the command.
*
* @return
* @throws Exception
@@ -38,4 +35,5 @@ public class GroupCreateCommand extends
protected Object doExecute() throws Exception {
return groupManager.createGroup(group);
}
+
}
Modified: karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupDeleteCommand.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupDeleteCommand.java?rev=1100950&r1=1100949&r2=1100950&view=diff
==============================================================================
--- karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupDeleteCommand.java (original)
+++ karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupDeleteCommand.java Mon May 9 10:53:06 2011
@@ -11,7 +11,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.cellar.shell.group;
import org.apache.karaf.cellar.core.Group;
@@ -24,17 +23,16 @@ import java.util.LinkedList;
import java.util.List;
/**
- * @author iocanel
+ * Group delete command.
*/
@Command(scope = "cluster", name = "group-delete", description = "Deletes a group")
public class GroupDeleteCommand extends GroupSupport {
-
@Argument(index = 0, name = "group", description = "The name of the group to delete", required = false, multiValued = false)
String group;
/**
- * Execute the command.
+ * Executes the command.
*
* @return
* @throws Exception
@@ -60,4 +58,5 @@ public class GroupDeleteCommand extends
}
return null;
}
+
}
Modified: karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupJoinCommand.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupJoinCommand.java?rev=1100950&r1=1100949&r2=1100950&view=diff
==============================================================================
--- karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupJoinCommand.java (original)
+++ karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupJoinCommand.java Mon May 9 10:53:06 2011
@@ -11,7 +11,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.cellar.shell.group;
import org.apache.karaf.cellar.core.control.ManageGroupAction;
@@ -21,12 +20,11 @@ import org.apache.felix.gogo.commands.Co
import java.util.List;
/**
- * @author iocanel
+ * Group join command.
*/
@Command(scope = "cluster", name = "group-join", description = "Manages nodes and groups")
public class GroupJoinCommand extends GroupSupport {
-
@Argument(index = 0, name = "group", description = "The name of the group to join", required = false, multiValued = false)
String group;
@@ -34,7 +32,7 @@ public class GroupJoinCommand extends Gr
List<String> nodes;
/**
- * Execute the command.
+ * Executes the command.
*
* @return
* @throws Exception
@@ -43,4 +41,5 @@ public class GroupJoinCommand extends Gr
protected Object doExecute() throws Exception {
return doExecute(ManageGroupAction.JOIN, group, nodes);
}
+
}
Modified: karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupListCommand.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupListCommand.java?rev=1100950&r1=1100949&r2=1100950&view=diff
==============================================================================
--- karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupListCommand.java (original)
+++ karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupListCommand.java Mon May 9 10:53:06 2011
@@ -11,7 +11,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.cellar.shell.group;
import org.apache.karaf.cellar.core.control.ManageGroupAction;
@@ -21,7 +20,7 @@ import org.apache.felix.gogo.commands.Co
import java.util.List;
/**
- * @author iocanel
+ * Group list command.
*/
@Command(scope = "cluster", name = "group-list", description = "Manages nodes and groups")
public class GroupListCommand extends GroupSupport {
@@ -30,7 +29,7 @@ public class GroupListCommand extends Gr
List<String> nodes;
/**
- * Execute the command.
+ * Executes the command.
*
* @return
* @throws Exception
@@ -39,4 +38,5 @@ public class GroupListCommand extends Gr
protected Object doExecute() throws Exception {
return doExecute(ManageGroupAction.LIST, null, nodes);
}
+
}
Modified: karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupQuitCommand.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupQuitCommand.java?rev=1100950&r1=1100949&r2=1100950&view=diff
==============================================================================
--- karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupQuitCommand.java (original)
+++ karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupQuitCommand.java Mon May 9 10:53:06 2011
@@ -11,7 +11,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.cellar.shell.group;
import org.apache.karaf.cellar.core.control.ManageGroupAction;
@@ -21,12 +20,11 @@ import org.apache.felix.gogo.commands.Co
import java.util.List;
/**
- * @author iocanel
+ * Group quit command.
*/
@Command(scope = "cluster", name = "group-quit", description = "Manages nodes and groups")
public class GroupQuitCommand extends GroupSupport {
-
@Argument(index = 0, name = "group", description = "The name of the group to join", required = false, multiValued = false)
String group;
@@ -34,7 +32,7 @@ public class GroupQuitCommand extends Gr
List<String> nodes;
/**
- * Execute the command.
+ * Executes the command.
*
* @return
* @throws Exception
@@ -43,4 +41,5 @@ public class GroupQuitCommand extends Gr
protected Object doExecute() throws Exception {
return doExecute(ManageGroupAction.QUIT, group, nodes);
}
+
}
Modified: karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupSetCommand.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupSetCommand.java?rev=1100950&r1=1100949&r2=1100950&view=diff
==============================================================================
--- karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupSetCommand.java (original)
+++ karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupSetCommand.java Mon May 9 10:53:06 2011
@@ -11,7 +11,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.cellar.shell.group;
import org.apache.karaf.cellar.core.control.ManageGroupAction;
@@ -21,12 +20,11 @@ import org.apache.felix.gogo.commands.Co
import java.util.List;
/**
- * @author: iocanel
+ * Group set command.
*/
@Command(scope = "cluster", name = "group-set", description = "Set the target nodes to a specific group")
public class GroupSetCommand extends GroupSupport {
-
@Argument(index = 0, name = "group", description = "The name of the group to join", required = false, multiValued = false)
String group;
@@ -34,7 +32,7 @@ public class GroupSetCommand extends Gro
List<String> nodes;
/**
- * Execute the command.
+ * Executes the command.
*
* @return
* @throws Exception
@@ -43,4 +41,5 @@ public class GroupSetCommand extends Gro
protected Object doExecute() throws Exception {
return doExecute(ManageGroupAction.SET, group, nodes);
}
+
}
Modified: karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupSupport.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupSupport.java?rev=1100950&r1=1100949&r2=1100950&view=diff
==============================================================================
--- karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupSupport.java (original)
+++ karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupSupport.java Mon May 9 10:53:06 2011
@@ -11,7 +11,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.cellar.shell.group;
import org.apache.karaf.cellar.core.Group;
@@ -19,7 +18,7 @@ import org.apache.karaf.cellar.core.Node
import org.apache.karaf.cellar.core.control.ManageGroupAction;
import org.apache.karaf.cellar.core.control.ManageGroupCommand;
import org.apache.karaf.cellar.core.control.ManageGroupResult;
-import org.apache.karaf.cellar.shell.ClusterCommandSuppot;
+import org.apache.karaf.cellar.shell.ClusterCommandSupport;
import java.util.Collection;
import java.util.HashSet;
@@ -27,14 +26,14 @@ import java.util.Map;
import java.util.Set;
/**
- * @author iocanel
+ * Group command support.
*/
-public abstract class GroupSupport extends ClusterCommandSuppot {
+public abstract class GroupSupport extends ClusterCommandSupport {
protected static final String OUTPUT_FORMAT = "%1s %-20s %s";
/**
- * Execut the command.
+ * Executes the command.
*
* @return
* @throws Exception
@@ -54,7 +53,6 @@ public abstract class GroupSupport exten
command.setAction(action);
-
if (group != null) {
command.setGroupName(group);
}
@@ -83,4 +81,5 @@ public abstract class GroupSupport exten
}
return null;
}
+
}
Modified: karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/handler/HandlersStartCommand.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/handler/HandlersStartCommand.java?rev=1100950&r1=1100949&r2=1100950&view=diff
==============================================================================
--- karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/handler/HandlersStartCommand.java (original)
+++ karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/handler/HandlersStartCommand.java Mon May 9 10:53:06 2011
@@ -11,7 +11,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.cellar.shell.handler;
import org.apache.karaf.cellar.core.ClusterManager;
@@ -22,7 +21,7 @@ import org.apache.felix.gogo.commands.Co
import java.util.List;
/**
- * @author iocanel
+ * Handlers command.
*/
@Command(scope = "cluster", name = "handlers", description = "Starts the handler of the specified nodes.")
public class HandlersStartCommand extends HandlersSupport {
@@ -38,9 +37,8 @@ public class HandlersStartCommand extend
@Argument(index = 1, name = "node", description = "The id of the node(s)", required = false, multiValued = true)
List<String> nodes;
-
/**
- * Execute the command.
+ * Executes the command.
*
* @return
* @throws Exception
@@ -65,4 +63,5 @@ public class HandlersStartCommand extend
public void setClusterManager(ClusterManager clusterManager) {
this.clusterManager = clusterManager;
}
+
}
Modified: karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/handler/HandlersStatusCommand.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/handler/HandlersStatusCommand.java?rev=1100950&r1=1100949&r2=1100950&view=diff
==============================================================================
--- karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/handler/HandlersStatusCommand.java (original)
+++ karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/handler/HandlersStatusCommand.java Mon May 9 10:53:06 2011
@@ -11,7 +11,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.cellar.shell.handler;
import org.apache.karaf.cellar.core.ClusterManager;
@@ -22,7 +21,7 @@ import org.apache.felix.gogo.commands.Co
import java.util.List;
/**
- * @author iocanel
+ * Handlers status command.
*/
@Command(scope = "cluster", name = "handler-status", description = "Lists the handlers of the specified nodes.")
public class HandlersStatusCommand extends HandlersSupport {
@@ -38,9 +37,8 @@ public class HandlersStatusCommand exten
@Argument(index = 1, name = "node", description = "The id of the node(s)", required = false, multiValued = true)
List<String> nodes;
-
/**
- * Execute the command.
+ * Executes the command.
*
* @return
* @throws Exception
@@ -65,4 +63,5 @@ public class HandlersStatusCommand exten
public void setClusterManager(ClusterManager clusterManager) {
this.clusterManager = clusterManager;
}
+
}
Modified: karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/handler/HandlersStopCommand.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/handler/HandlersStopCommand.java?rev=1100950&r1=1100949&r2=1100950&view=diff
==============================================================================
--- karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/handler/HandlersStopCommand.java (original)
+++ karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/handler/HandlersStopCommand.java Mon May 9 10:53:06 2011
@@ -11,7 +11,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.cellar.shell.handler;
import org.apache.karaf.cellar.core.ClusterManager;
@@ -22,7 +21,7 @@ import org.apache.felix.gogo.commands.Co
import java.util.List;
/**
- * @author iocanel
+ * Handlers stop command.
*/
@Command(scope = "cluster", name = "handler-stop", description = "Stops the handler of the specified nodes.")
public class HandlersStopCommand extends HandlersSupport {
@@ -38,9 +37,8 @@ public class HandlersStopCommand extends
@Argument(index = 1, name = "node", description = "The id of the node(s)", required = false, multiValued = true)
List<String> nodes;
-
/**
- * Execute the command.
+ * Executes the command.
*
* @return
* @throws Exception
@@ -65,4 +63,5 @@ public class HandlersStopCommand extends
public void setClusterManager(ClusterManager clusterManager) {
this.clusterManager = clusterManager;
}
+
}
Modified: karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/handler/HandlersSupport.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/handler/HandlersSupport.java?rev=1100950&r1=1100949&r2=1100950&view=diff
==============================================================================
--- karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/handler/HandlersSupport.java (original)
+++ karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/handler/HandlersSupport.java Mon May 9 10:53:06 2011
@@ -11,27 +11,26 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.cellar.shell.handler;
import org.apache.karaf.cellar.core.Node;
import org.apache.karaf.cellar.core.control.ManageHandlersCommand;
import org.apache.karaf.cellar.core.control.ManageHandlersResult;
-import org.apache.karaf.cellar.shell.ClusterCommandSuppot;
+import org.apache.karaf.cellar.shell.ClusterCommandSupport;
import java.util.List;
import java.util.Map;
import java.util.Set;
/**
- * @author iocanel
+ * Handlers command support.
*/
-public abstract class HandlersSupport extends ClusterCommandSuppot {
+public abstract class HandlersSupport extends ClusterCommandSupport {
protected static final String OUTPUT_FORMAT = "%-20s %-7s %s";
/**
- * Execute the command.
+ * Executes the command.
*
* @return
* @throws Exception
@@ -54,7 +53,6 @@ public abstract class HandlersSupport ex
command.setStatus(status);
-
Map<Node, ManageHandlersResult> results = executionContext.execute(command);
if (results == null || results.isEmpty()) {
System.out.println("No result received within given timeout");
@@ -72,4 +70,5 @@ public abstract class HandlersSupport ex
}
return null;
}
+
}
Modified: karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/producer/ProducerStartCommand.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/producer/ProducerStartCommand.java?rev=1100950&r1=1100949&r2=1100950&view=diff
==============================================================================
--- karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/producer/ProducerStartCommand.java (original)
+++ karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/producer/ProducerStartCommand.java Mon May 9 10:53:06 2011
@@ -11,7 +11,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.cellar.shell.producer;
import org.apache.karaf.cellar.core.control.SwitchStatus;
@@ -21,7 +20,7 @@ import org.apache.felix.gogo.commands.Co
import java.util.List;
/**
- * @author iocanel
+ * Producer start command.
*/
@Command(scope = "cluster", name = "producer-start", description = "Turns on the producer capabilities of a node.")
public class ProducerStartCommand extends ProducerSupport {
@@ -29,9 +28,8 @@ public class ProducerStartCommand extend
@Argument(index = 0, name = "node", description = "The id of the node(s) to turn on/off event producer", required = false, multiValued = true)
List<String> nodes;
-
/**
- * Execute the command.
+ * Executes the command.
*
* @return
* @throws Exception
@@ -40,4 +38,5 @@ public class ProducerStartCommand extend
protected Object doExecute() throws Exception {
return doExecute(nodes, SwitchStatus.ON);
}
+
}
Modified: karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/producer/ProducerStatusCommand.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/producer/ProducerStatusCommand.java?rev=1100950&r1=1100949&r2=1100950&view=diff
==============================================================================
--- karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/producer/ProducerStatusCommand.java (original)
+++ karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/producer/ProducerStatusCommand.java Mon May 9 10:53:06 2011
@@ -11,7 +11,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.cellar.shell.producer;
import org.apache.felix.gogo.commands.Argument;
@@ -20,7 +19,7 @@ import org.apache.felix.gogo.commands.Co
import java.util.List;
/**
- * @author iocanel
+ * Producer start command.
*/
@Command(scope = "cluster", name = "producer-start", description = "Displays the producer capabilities of a node.")
public class ProducerStatusCommand extends ProducerSupport {
@@ -28,9 +27,8 @@ public class ProducerStatusCommand exten
@Argument(index = 0, name = "node", description = "The id of the node(s) to turn on/off event producer", required = false, multiValued = true)
List<String> nodes;
-
/**
- * Execute the command.
+ * Executes the command.
*
* @return
* @throws Exception
@@ -39,4 +37,5 @@ public class ProducerStatusCommand exten
protected Object doExecute() throws Exception {
return doExecute(nodes, null);
}
+
}
Modified: karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/producer/ProducerStopCommand.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/producer/ProducerStopCommand.java?rev=1100950&r1=1100949&r2=1100950&view=diff
==============================================================================
--- karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/producer/ProducerStopCommand.java (original)
+++ karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/producer/ProducerStopCommand.java Mon May 9 10:53:06 2011
@@ -11,7 +11,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.cellar.shell.producer;
import org.apache.karaf.cellar.core.control.SwitchStatus;
@@ -21,7 +20,7 @@ import org.apache.felix.gogo.commands.Co
import java.util.List;
/**
- * @author iocanel
+ * Producer stop command.
*/
@Command(scope = "cluster", name = "producer-stop", description = "Turns off the producer capabilities of a node.")
public class ProducerStopCommand extends ProducerSupport {
@@ -29,9 +28,8 @@ public class ProducerStopCommand extends
@Argument(index = 0, name = "node", description = "The id of the node(s) to turn on/off event producer", required = false, multiValued = true)
List<String> nodes;
-
/**
- * Execute the command.
+ * Executes the command.
*
* @return
* @throws Exception
@@ -40,4 +38,5 @@ public class ProducerStopCommand extends
protected Object doExecute() throws Exception {
return doExecute(nodes, SwitchStatus.OFF);
}
+
}
Modified: karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/producer/ProducerSupport.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/producer/ProducerSupport.java?rev=1100950&r1=1100949&r2=1100950&view=diff
==============================================================================
--- karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/producer/ProducerSupport.java (original)
+++ karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/producer/ProducerSupport.java Mon May 9 10:53:06 2011
@@ -11,29 +11,27 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.cellar.shell.producer;
import org.apache.karaf.cellar.core.Node;
import org.apache.karaf.cellar.core.control.ProducerSwitchCommand;
import org.apache.karaf.cellar.core.control.ProducerSwitchResult;
import org.apache.karaf.cellar.core.control.SwitchStatus;
-import org.apache.karaf.cellar.shell.ClusterCommandSuppot;
+import org.apache.karaf.cellar.shell.ClusterCommandSupport;
import java.util.List;
import java.util.Map;
import java.util.Set;
/**
- * @author iocanel
+ * Producer command support.
*/
-
-public abstract class ProducerSupport extends ClusterCommandSuppot {
+public abstract class ProducerSupport extends ClusterCommandSupport {
protected static final String OUTPUT_FORMAT = "%-20s %s";
/**
- * Execut the command.
+ * Executes the command.
*
* @return
* @throws Exception
@@ -62,4 +60,5 @@ public abstract class ProducerSupport ex
}
return null;
}
+
}
Modified: karaf/cellar/trunk/shell/src/main/resources/OSGI-INF/blueprint/shell-cluster.xml
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/shell/src/main/resources/OSGI-INF/blueprint/shell-cluster.xml?rev=1100950&r1=1100949&r2=1100950&view=diff
==============================================================================
--- karaf/cellar/trunk/shell/src/main/resources/OSGI-INF/blueprint/shell-cluster.xml (original)
+++ karaf/cellar/trunk/shell/src/main/resources/OSGI-INF/blueprint/shell-cluster.xml Mon May 9 10:53:06 2011
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
+
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
@@ -12,8 +12,7 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
- -->
-
+-->
<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0" default-activation="lazy">
<!-- Command Bundle -->
@@ -111,7 +110,6 @@
</completers>
</command>
-
<command name="cluster/handler-status">
<action class="org.apache.karaf.cellar.shell.handler.HandlersStatusCommand">
<property name="clusterManager" ref="clusterManager"/>
Modified: karaf/cellar/trunk/src/main/resources/feature.xml
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/src/main/resources/feature.xml?rev=1100950&r1=1100949&r2=1100950&view=diff
==============================================================================
--- karaf/cellar/trunk/src/main/resources/feature.xml (original)
+++ karaf/cellar/trunk/src/main/resources/feature.xml Mon May 9 10:53:06 2011
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
+
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
@@ -11,8 +12,7 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
- -->
-
+-->
<features xmlns="http://karaf.apache.org/xmlns/features/v1.0.0">
<feature name='hazelcast' description='In memory data grid' version='${hazelcast.version}' resolver='(obr)'>
Modified: karaf/cellar/trunk/utils/src/main/java/org/apache/karaf/cellar/utils/ping/Ping.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/utils/src/main/java/org/apache/karaf/cellar/utils/ping/Ping.java?rev=1100950&r1=1100949&r2=1100950&view=diff
==============================================================================
--- karaf/cellar/trunk/utils/src/main/java/org/apache/karaf/cellar/utils/ping/Ping.java (original)
+++ karaf/cellar/trunk/utils/src/main/java/org/apache/karaf/cellar/utils/ping/Ping.java Mon May 9 10:53:06 2011
@@ -11,13 +11,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.cellar.utils.ping;
import org.apache.karaf.cellar.core.command.Command;
/**
- * @author iocanel
+ * Ping.
*/
public class Ping extends Command<Pong> {
Modified: karaf/cellar/trunk/utils/src/main/java/org/apache/karaf/cellar/utils/ping/PingHandler.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/utils/src/main/java/org/apache/karaf/cellar/utils/ping/PingHandler.java?rev=1100950&r1=1100949&r2=1100950&view=diff
==============================================================================
--- karaf/cellar/trunk/utils/src/main/java/org/apache/karaf/cellar/utils/ping/PingHandler.java (original)
+++ karaf/cellar/trunk/utils/src/main/java/org/apache/karaf/cellar/utils/ping/PingHandler.java Mon May 9 10:53:06 2011
@@ -11,7 +11,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.cellar.utils.ping;
import org.apache.karaf.cellar.core.command.CommandHandler;
@@ -19,7 +18,7 @@ import org.apache.karaf.cellar.core.cont
import org.apache.karaf.cellar.core.control.Switch;
/**
- * @author iocanel
+ * Ping handler.
*/
public class PingHandler extends CommandHandler<Ping, Pong> {
@@ -41,4 +40,5 @@ public class PingHandler extends Command
public Switch getSwitch() {
return commandSwitch;
}
+
}
Modified: karaf/cellar/trunk/utils/src/main/java/org/apache/karaf/cellar/utils/ping/Pong.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/utils/src/main/java/org/apache/karaf/cellar/utils/ping/Pong.java?rev=1100950&r1=1100949&r2=1100950&view=diff
==============================================================================
--- karaf/cellar/trunk/utils/src/main/java/org/apache/karaf/cellar/utils/ping/Pong.java (original)
+++ karaf/cellar/trunk/utils/src/main/java/org/apache/karaf/cellar/utils/ping/Pong.java Mon May 9 10:53:06 2011
@@ -11,17 +11,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.cellar.utils.ping;
import org.apache.karaf.cellar.core.command.Result;
/**
- * @author iocanel
+ * Pong result.
*/
public class Pong extends Result {
public Pong(String id) {
super(id);
}
+
}
Modified: karaf/cellar/trunk/utils/src/main/java/org/apache/karaf/cellar/utils/ping/PongHandler.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/utils/src/main/java/org/apache/karaf/cellar/utils/ping/PongHandler.java?rev=1100950&r1=1100949&r2=1100950&view=diff
==============================================================================
--- karaf/cellar/trunk/utils/src/main/java/org/apache/karaf/cellar/utils/ping/PongHandler.java (original)
+++ karaf/cellar/trunk/utils/src/main/java/org/apache/karaf/cellar/utils/ping/PongHandler.java Mon May 9 10:53:06 2011
@@ -11,13 +11,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.cellar.utils.ping;
import org.apache.karaf.cellar.core.command.ResultHandler;
/**
- * @author iocanel
+ * Pong result handler.
*/
public class PongHandler extends ResultHandler<Pong> {
@@ -25,4 +24,5 @@ public class PongHandler extends ResultH
public Class<Pong> getType() {
return Pong.class;
}
+
}
Modified: karaf/cellar/trunk/utils/src/main/resources/OSGI-INF/blueprint/blueprint.xml
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/utils/src/main/resources/OSGI-INF/blueprint/blueprint.xml?rev=1100950&r1=1100949&r2=1100950&view=diff
==============================================================================
--- karaf/cellar/trunk/utils/src/main/resources/OSGI-INF/blueprint/blueprint.xml (original)
+++ karaf/cellar/trunk/utils/src/main/resources/OSGI-INF/blueprint/blueprint.xml Mon May 9 10:53:06 2011
@@ -1,19 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
<bean id="pingHandler" class="org.apache.karaf.cellar.utils.ping.PingHandler">
@@ -33,4 +32,5 @@
<reference id="configurationAdmin" interface="org.osgi.service.cm.ConfigurationAdmin"/>
<reference id="commandStore" interface="org.apache.karaf.cellar.core.command.CommandStore"/>
<reference id="producer" interface="org.apache.karaf.cellar.core.event.EventProducer"/>
+
</blueprint>