summaryrefslogtreecommitdiff
path: root/java/src
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2017-01-27 18:06:18 -0500
committerBernard Normier <bernard@zeroc.com>2017-01-27 18:06:18 -0500
commit9f26cd293b220ed83d16cdcec5782f01c1860865 (patch)
tree5bbb239a26d08d5e9baa993129482cb6bcd589e2 /java/src
parentC++ build failure (diff)
downloadice-9f26cd293b220ed83d16cdcec5782f01c1860865.tar.bz2
ice-9f26cd293b220ed83d16cdcec5782f01c1860865.tar.xz
ice-9f26cd293b220ed83d16cdcec5782f01c1860865.zip
ICE-7112: add ability to start/stop all servers on a node
Diffstat (limited to 'java/src')
-rw-r--r--java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Coordinator.java3
-rw-r--r--java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveActions.java20
-rwxr-xr-xjava/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/Node.java31
-rw-r--r--java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/TreeNode.java14
4 files changed, 65 insertions, 3 deletions
diff --git a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Coordinator.java b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Coordinator.java
index 1802757ac1e..9c2dc4736b2 100644
--- a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Coordinator.java
+++ b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Coordinator.java
@@ -438,6 +438,9 @@ public class Coordinator
_nodeMenu.add(_liveActionsForMenu.get(com.zeroc.IceGridGUI.LiveDeployment.TreeNode.RETRIEVE_STDOUT));
_nodeMenu.add(_liveActionsForMenu.get(com.zeroc.IceGridGUI.LiveDeployment.TreeNode.RETRIEVE_STDERR));
_nodeMenu.addSeparator();
+ _nodeMenu.add(_liveActionsForMenu.get(com.zeroc.IceGridGUI.LiveDeployment.TreeNode.START_ALL_SERVERS));
+ _nodeMenu.add(_liveActionsForMenu.get(com.zeroc.IceGridGUI.LiveDeployment.TreeNode.STOP_ALL_SERVERS));
+ _nodeMenu.addSeparator();
_nodeMenu.add(_liveActionsForMenu.get(com.zeroc.IceGridGUI.LiveDeployment.TreeNode.SHUTDOWN_NODE));
//
diff --git a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveActions.java b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveActions.java
index b61253780a2..371c54d40e5 100644
--- a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveActions.java
+++ b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveActions.java
@@ -124,7 +124,7 @@ public class LiveActions
};
_array[TreeNode.WRITE_MESSAGE].putValue(Action.SHORT_DESCRIPTION, "Write message to stdout or stderr");
-
+
_array[TreeNode.RETRIEVE_ICE_LOG] = new AbstractAction("Retrieve Ice log")
{
@Override
@@ -228,6 +228,24 @@ public class LiveActions
_target.enableMetricsView(false);
}
};
+
+ _array[TreeNode.START_ALL_SERVERS] = new AbstractAction("Start All Servers")
+ {
+ @Override
+ public void actionPerformed(ActionEvent e)
+ {
+ _target.startAllServers();
+ }
+ };
+
+ _array[TreeNode.STOP_ALL_SERVERS] = new AbstractAction("Stop All Servers")
+ {
+ @Override
+ public void actionPerformed(ActionEvent e)
+ {
+ _target.stopAllServers();
+ }
+ };
}
private TreeNode _target;
diff --git a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/Node.java b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/Node.java
index 89e179c317e..e546b8f920b 100755
--- a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/Node.java
+++ b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/Node.java
@@ -36,6 +36,8 @@ class Node extends ListTreeNode
actions[RETRIEVE_ICE_LOG] = _up;
actions[RETRIEVE_STDOUT] = _up;
actions[RETRIEVE_STDERR] = _up;
+ actions[START_ALL_SERVERS] = _up;
+ actions[STOP_ALL_SERVERS] = _up;
return actions;
}
@@ -160,6 +162,32 @@ class Node extends ListTreeNode
}
@Override
+ public void startAllServers()
+ {
+ for(Object obj : _children)
+ {
+ Server server = (Server)obj;
+ if(server.getAvailableActions()[START])
+ {
+ server.start();
+ }
+ }
+ }
+
+ @Override
+ public void stopAllServers()
+ {
+ for(Object obj : _children)
+ {
+ Server server = (Server)obj;
+ if(server.getAvailableActions()[STOP])
+ {
+ server.stop();
+ }
+ }
+ }
+
+ @Override
public JPopupMenu getPopupMenu()
{
LiveActions la = getCoordinator().getLiveActionsForPopup();
@@ -171,6 +199,9 @@ class Node extends ListTreeNode
_popup.add(la.get(RETRIEVE_STDOUT));
_popup.add(la.get(RETRIEVE_STDERR));
_popup.addSeparator();
+ _popup.add(la.get(START_ALL_SERVERS));
+ _popup.add(la.get(STOP_ALL_SERVERS));
+ _popup.addSeparator();
_popup.add(la.get(SHUTDOWN_NODE));
}
diff --git a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/TreeNode.java b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/TreeNode.java
index dee7468efe0..8c455213d3e 100644
--- a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/TreeNode.java
+++ b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/TreeNode.java
@@ -64,7 +64,10 @@ public abstract class TreeNode extends TreeNodeBase
public static final int ENABLE_METRICS_VIEW = 21;
public static final int DISABLE_METRICS_VIEW = 22;
- public static final int ACTION_COUNT = 23;
+ public static final int START_ALL_SERVERS = 23;
+ public static final int STOP_ALL_SERVERS = 24;
+
+ public static final int ACTION_COUNT = 25;
public boolean[] getAvailableActions()
{
@@ -127,11 +130,18 @@ public abstract class TreeNode extends TreeNodeBase
{
assert false;
}
-
public void enableMetricsView(boolean enabled)
{
assert false;
}
+ public void startAllServers()
+ {
+ assert false;
+ }
+ public void stopAllServers()
+ {
+ assert false;
+ }
public void clearShowIceLogDialog()
{