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/04/30 19:19:02 UTC
svn commit: r1332301 - in /karaf/cellar/trunk:
core/src/main/java/org/apache/karaf/cellar/core/control/
management/src/main/java/org/apache/karaf/cellar/management/internal/
shell/src/main/java/org/apache/karaf/cellar/shell/handler/
Author: jbonofre
Date: Mon Apr 30 17:19:01 2012
New Revision: 1332301
URL: http://svn.apache.org/viewvc?rev=1332301&view=rev
Log:
[KARAF-1413] Fix handler status rendering and check
Modified:
karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/control/ManageHandlersCommand.java
karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/control/ManageHandlersCommandHandler.java
karaf/cellar/trunk/management/src/main/java/org/apache/karaf/cellar/management/internal/CellarMBeanImpl.java
karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/handler/HandlersSupport.java
Modified: karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/control/ManageHandlersCommand.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/control/ManageHandlersCommand.java?rev=1332301&r1=1332300&r2=1332301&view=diff
==============================================================================
--- karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/control/ManageHandlersCommand.java (original)
+++ karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/control/ManageHandlersCommand.java Mon Apr 30 17:19:01 2012
@@ -20,7 +20,7 @@ import org.apache.karaf.cellar.core.comm
*/
public class ManageHandlersCommand extends Command<ManageHandlersResult> {
- private String handlesName;
+ private String handlerName;
private Boolean status = Boolean.TRUE;
/**
@@ -32,12 +32,12 @@ public class ManageHandlersCommand exten
super(id);
}
- public String getHandlesName() {
- return handlesName;
+ public String getHandlerName() {
+ return handlerName;
}
- public void setHandlesName(String handlesName) {
- this.handlesName = handlesName;
+ public void setHandlerName(String handlerName) {
+ this.handlerName = handlerName;
}
public Boolean getStatus() {
Modified: karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/control/ManageHandlersCommandHandler.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/control/ManageHandlersCommandHandler.java?rev=1332301&r1=1332300&r2=1332301&view=diff
==============================================================================
--- karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/control/ManageHandlersCommandHandler.java (original)
+++ karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/control/ManageHandlersCommandHandler.java Mon Apr 30 17:19:01 2012
@@ -53,13 +53,15 @@ public class ManageHandlersCommandHandle
if (references != null && references.length > 0) {
for (ServiceReference ref : references) {
EventHandler handler = (EventHandler) bundleContext.getService(ref);
- if (command.getHandlesName() != null && command.getHandlesName().equals(handler.getClass().getName())) {
- if (command.getStatus()) {
- handler.getSwitch().turnOn();
- } else handler.getSwitch().turnOff();
+ if (command.getHandlerName() == null) {
+ result.getHandlers().put(handler.getClass().getName(), handler.getSwitch().getStatus().name());
+ } else {
+ if (command.getHandlerName().equals(handler.getClass().getName())) {
+ result.getHandlers().put(handler.getClass().getName(), handler.getSwitch().getStatus().name());
+ break;
+ }
}
- result.getHandlers().put(handler.getClass().getName(), handler.getSwitch().getStatus().name());
}
}
} catch (InvalidSyntaxException e) {
Modified: karaf/cellar/trunk/management/src/main/java/org/apache/karaf/cellar/management/internal/CellarMBeanImpl.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/management/src/main/java/org/apache/karaf/cellar/management/internal/CellarMBeanImpl.java?rev=1332301&r1=1332300&r2=1332301&view=diff
==============================================================================
--- karaf/cellar/trunk/management/src/main/java/org/apache/karaf/cellar/management/internal/CellarMBeanImpl.java (original)
+++ karaf/cellar/trunk/management/src/main/java/org/apache/karaf/cellar/management/internal/CellarMBeanImpl.java Mon Apr 30 17:19:01 2012
@@ -68,7 +68,9 @@ public class CellarMBeanImpl extends Sta
public TabularData handlerStatus() throws Exception {
ManageHandlersCommand command = new ManageHandlersCommand(clusterManager.generateId());
- command.setHandlesName(null);
+
+ command.setDestination(clusterManager.listNodes());
+ command.setHandlerName(null);
command.setStatus(null);
Map<Node, ManageHandlersResult> results = executionContext.execute(command);
@@ -104,7 +106,7 @@ public class CellarMBeanImpl extends Sta
List<String> nodeIds = new ArrayList<String>();
nodeIds.add(nodeId);
Set<Node> nodes = clusterManager.listNodes(nodeIds);
- command.setHandlesName(handlerId);
+ command.setHandlerName(handlerId);
command.setDestination(nodes);
command.setStatus(Boolean.TRUE);
}
@@ -114,7 +116,7 @@ public class CellarMBeanImpl extends Sta
List<String> nodeIds = new ArrayList<String>();
nodeIds.add(nodeId);
Set<Node> nodes = clusterManager.listNodes(nodeIds);
- command.setHandlesName(handlerId);
+ command.setHandlerName(handlerId);
command.setDestination(nodes);
command.setStatus(Boolean.FALSE);
}
Modified: karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/handler/HandlersSupport.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/handler/HandlersSupport.java?rev=1332301&r1=1332300&r2=1332301&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 Apr 30 17:19:01 2012
@@ -28,14 +28,16 @@ public abstract class HandlersSupport ex
protected Object doExecute(String handlerName, List<String> nodes, Boolean status) throws Exception {
ManageHandlersCommand command = new ManageHandlersCommand(clusterManager.generateId());
- Set<Node> recipientList = clusterManager.listNodes(nodes);
- //Set the recipient list
- if (recipientList != null && !recipientList.isEmpty()) {
- command.setDestination(recipientList);
+ Set<Node> recipientList;
+ if (nodes == null || nodes.isEmpty()) {
+ recipientList = clusterManager.listNodes();
+ } else {
+ recipientList = clusterManager.listNodes(nodes);
}
- command.setHandlesName(handlerName);
+ command.setDestination(recipientList);
+ command.setHandlerName(handlerName);
command.setStatus(status);
Map<Node, ManageHandlersResult> results = executionContext.execute(command);