You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2008/11/23 19:32:02 UTC
svn commit: r720024 [4/5] - in /geronimo/server/trunk: ./
plugingroups/javaee5-jetty/ plugingroups/javaee5-jetty/src/main/history/
plugingroups/javaee5-tomcat/ plugingroups/javaee5-tomcat/src/main/history/
plugins/monitoring/ plugins/monitoring/agent-c...
Modified: geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringEditServer.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringEditServer.jsp?rev=720024&r1=720023&r2=720024&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringEditServer.jsp (original)
+++ geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringEditServer.jsp Sun Nov 23 10:32:00 2008
@@ -18,91 +18,43 @@
--%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
-<%@ page import="java.lang.String" %>
-<%@ page import="java.sql.Connection" %>
-<%@ page import="java.sql.PreparedStatement" %>
-<%@ page import="java.sql.ResultSet" %>
-<%@ page import="org.apache.geronimo.monitoring.console.util.DBManager" %>
-<%@ page import="org.apache.geronimo.monitoring.console.MRCConnector" %>
-<%@ page import="org.apache.geronimo.crypto.EncryptionManager" %>
+<%@ page import="java.util.List" %>
<%@ page import="org.apache.geronimo.monitoring.console.Constants" %>
+<%@ page import="org.apache.geronimo.monitoring.console.MRCConnector" %>
+<%@ page import="org.apache.geronimo.monitoring.console.data.Node" %>
<portlet:defineObjects/>
<%
-String server_id = (String) request.getAttribute("server_id");
+ Node node = (Node) request.getAttribute("node");
String message = (String) request.getAttribute("message");
-String name = (String) request.getAttribute("name");
-String ip = (String) request.getAttribute("ip");
-String username = (String) request.getAttribute("username");
-String password = (String) request.getAttribute("password");
-String password2 = (String) request.getAttribute("password2");
String snapshot = (String) request.getAttribute("snapshot");
String retention = (String) request.getAttribute("retention");
-String port = (String)request.getAttribute("port");
-String protocol = (String) request.getAttribute("protocol");
if(message == null) message = "";
-if(name == null) name = "";
-if(ip == null) ip = "";
-if(username == null) username = "";
-if(password == null) password = "";
-if(password2 == null) password2 = "";
if(snapshot == null) snapshot = "";
if(retention == null) retention = "";
-if(protocol == null) protocol = "";
-if(protocol.equals("1"))
-{
- if(port == null) port = "4201";
-}
-else if(protocol.equals("2"))
+if(node.getProtocol() == null || node.getProtocol().equals("EJB"))
{
- if(port == null) port = "1099";
+ node.setProtocol("EJB");
+ if(node.getPort() == 0) node.setPort(4201);
}
else
{
- protocol = "1";
- if(port == null) port = "4201";
+ if(node.getPort() == 0) node.setPort(1099);
}
-
-DBManager DBase = new DBManager();
-Connection con = DBase.getConnection();
-
-PreparedStatement pStmt = con.prepareStatement("SELECT * FROM servers WHERE server_id="+server_id);
-ResultSet rs = pStmt.executeQuery();
MRCConnector mrc = null;
boolean isOnline = true;
-String added = "";
-String modified = "";
-String last_seen = "";
-boolean enabled = true;
-String dbPassword = "";
-
-if (rs.next()) {
- // name == "" when user has not submitted anything
- if(name.equals("")) {
- // store the information from db into the variables
- name = rs.getString("name");
- username = rs.getString("username");
- ip = rs.getString("ip");
- port = rs.getString("port");
- protocol = rs.getString("protocol");
- dbPassword = (String)EncryptionManager.decrypt(rs.getString("password"));
- }
- added = rs.getString("added");
- modified = rs.getString("modified");
- last_seen = rs.getString("last_seen");
- enabled = rs.getInt("enabled") == 1 ? true : false;
+
+if (node != null) {
try {
- // close connection before using the MRCConnector
- con.close();
- mrc = new MRCConnector(ip, username, password, Integer.parseInt(port), Integer.parseInt(protocol));
+ mrc = new MRCConnector(node);
} catch (Exception e) {
// the password supplied by the user doesn't work
try {
if(retention.equals("") || snapshot.equals("")) {
- mrc = new MRCConnector(ip, username, dbPassword, Integer.parseInt(port), Integer.parseInt(protocol));
+ mrc = new MRCConnector(node);
// get the snapshot on the first call or any subsequent valid connections
snapshot = snapshot == "" ? "" + mrc.getSnapshotDuration() / 1000 / 60 : snapshot;
// get the retention on the first call or any subsequent valid connection
@@ -184,7 +136,7 @@
{
%>
<div align="left" style="width: 500px">
-<%=message %></b><br>
+<%=message %><br>
</div>
<%} %>
<table>
@@ -193,55 +145,55 @@
<td width="90%" align="left" valign="top">
<p>
<font face="Verdana" size="+1">
- Editing: <%=name%> (<%=ip%>)
+ Editing: <%=node.getName()%> (<%=node.getHost()%>)
</font>
</p>
<p>
<form name="editServer" method="POST" action="<portlet:actionURL/>">
<table cellpadding="1" cellspacing="1">
- <tr>
- <td>Added:</td>
- <td> </td>
- <td align="right"><%=added.substring(0,16)%></td>
- <td></td>
- </tr>
- <tr>
- <td>Last Modified:</td>
- <td> </td>
- <td align="right"><%=modified.substring(0,16)%></td>
- <td></td>
- </tr>
- <tr>
- <td>Last Seen:</td>
- <td> </td>
- <td align="right"><%=last_seen.substring(0,16)%></td>
- <td></td>
- </tr>
+ <%--<tr>--%>
+ <%--<td>Added:</td>--%>
+ <%--<td> </td>--%>
+ <%--<td align="right"><%=added.substring(0,16)%></td>--%>
+ <%--<td></td>--%>
+ <%--</tr>--%>
+ <%--<tr>--%>
+ <%--<td>Last Modified:</td>--%>
+ <%--<td> </td>--%>
+ <%--<td align="right"><%=modified.substring(0,16)%></td>--%>
+ <%--<td></td>--%>
+ <%--</tr>--%>
+ <%--<tr>--%>
+ <%--<td>Last Seen:</td>--%>
+ <%--<td> </td>--%>
+ <%--<td align="right"><%=last_seen.substring(0,16)%></td>--%>
+ <%--<td></td>--%>
+ <%--</tr>--%>
<tr>
<td><label for="<portlet:namespace/>name">Name</label>:</td>
<td> </td>
- <td align="right"><input type="text" name="name" id="<portlet:namespace/>name" value=<%= "\"" + name + "\"" %>></td>
+ <td align="right"><input type="text" name="name" id="<portlet:namespace/>name" value=<%= "\"" + node.getName() + "\"" %>></td>
<td></td>
</tr>
<tr>
<td><label for="<portlet:namespace/>ip">IP/Hostname</label>:</td>
<td> </td>
- <td align="right"><input type="text" name="ip" id="<portlet:namespace/>ip" value=<%= "\"" + ip + "\"" %>/></td>
+ <td align="right"><input type="text" name="ip" id="<portlet:namespace/>ip" value=<%= "\"" + node.getHost() + "\"" %>/></td>
<td></td>
</tr>
<tr>
- <td>Protocol</label></td>
+ <td>Protocol</td>
<td> </td>
<td align="right">
- <input type="radio" name="protocol" id="<portlet:namespace/>protocol1" onchange='setPort()' value="1" <%if (protocol.equals("1")){ %>checked="checked"<%} %>><label for="<portlet:namespace/>protocol1">EJB</label>
- <input type="radio" name="protocol" id="<portlet:namespace/>protocol2" onchange='setPort()' value="2" <%if (protocol.equals("2")){ %>checked="checked"<%} %>><label for="<portlet:namespace/>protocol2">JMX</label>
+ <input type="radio" name="protocol" id="<portlet:namespace/>protocol1" onchange='setPort()' value="EJB" <%if (node.getProtocol().equals("EJB")){ %>checked="checked"<%} %>><label for="<portlet:namespace/>protocol1">EJB</label>
+ <input type="radio" name="protocol" id="<portlet:namespace/>protocol2" onchange='setPort()' value="JMX" <%if (node.getProtocol().equals("JMX")){ %>checked="checked"<%} %>><label for="<portlet:namespace/>protocol2">JMX</label>
</td>
<td></td>
</tr>
<tr>
<td><label for="<portlet:namespace/>port">Port</label>:</td>
<td> </td>
- <td align="right"><input type="text" name="port" id="<portlet:namespace/>port" onKeyUp='noAlpha(this)' onKeyPress='noAlpha(this)' value=<%= "\"" + port + "\"" %>/></td>
+ <td align="right"><input type="text" name="port" id="<portlet:namespace/>port" onKeyUp='noAlpha(this)' onKeyPress='noAlpha(this)' value=<%= "\"" + node.getPort() + "\"" %>/></td>
<td></td>
</tr>
<%
@@ -285,35 +237,33 @@
<tr>
<td><label for="<portlet:namespace/>username">Username</label>:</td>
<td> </td>
- <td align="right"><input type="text" name="username" id="<portlet:namespace/>username" value=<%= "\"" + username + "\"" %>/></td>
+ <td align="right"><input type="text" name="username" id="<portlet:namespace/>username" value=<%= "\"" + node.getUserName() + "\"" %>/></td>
<td></td>
</tr>
<tr>
<td><label for="<portlet:namespace/>password">Password</label>:</td>
<td> </td>
- <td align="right"><input type="password" name="password" id="<portlet:namespace/>password" value=<%= "\"" + password + "\"" %>/></td>
+ <td align="right"><input type="password" name="password" id="<portlet:namespace/>password" value=<%= "\"" + node.getPassword() + "\"" %>/></td>
<td></td>
</tr>
<tr>
<td><label for="<portlet:namespace/>password2">Password (verify)</label>:</td>
<td> </td>
- <td align="right"><input type="password" name="password2" id="<portlet:namespace/>password2" value=<%= "\"" + password2 + "\"" %>/></td>
+ <td align="right"><input type="password" name="password2" id="<portlet:namespace/>password2" value=<%= "\"" + node.getPassword() + "\"" %>/></td>
<td></td>
</tr>
<tr><td colspan="2"><font size="-2"> </font></td></tr>
<tr>
<input type="hidden" name="mode" value="" />
<input type="hidden" name="action" value="" />
- <input type="hidden" name="server_id" value=<%= "\"" + server_id + "\"" %> />
+ <input type="hidden" name="server_id" value=<%= "\"" + node.getName() + "\"" %> />
<td colspan="1" align="left"><button type="button" value="Cancel" onclick="javascript:history.go(-1)">Cancel</button></td>
<td> </td>
<td colspan="1" align="right"><input type="button" value="Save" onclick="document.editServer.action.value='saveEditServer'; document.editServer.mode.value='edit'; if(validate()) document.editServer.submit();" /></td>
<td></td>
</tr>
</table>
-
- </p>
-
+ </form>
</td>
<td> </td>
@@ -352,18 +302,18 @@
<br />
<ul>
<li><a onclick="document.editServer.action.value='testEditServerConnection'; document.editServer.mode.value='edit'; if(validateTest()) document.editServer.submit();" href="#">Test these settings</a></li>
- <%
- if(enabled) {
+ <%
+ if(node.isEnabled()) {
%>
- <li><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="disableEditServer" /><portlet:param name="server_id" value="<%=server_id%>" /></portlet:actionURL>">Disable this server</a></li>
+ <li><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="disableEditServer" /><portlet:param name="server_id" value="<%=node.getName()%>" /></portlet:actionURL>">Disable this server</a></li>
<%
} else {
%>
- <li><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="enableEditServer" /><portlet:param name="server_id" value="<%=server_id%>" /></portlet:actionURL>">Enable this server</a></li>
+ <li><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="enableEditServer" /><portlet:param name="server_id" value="<%=node.getName()%>" /></portlet:actionURL>">Enable this server</a></li>
<%
}
%>
- <li><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="deleteServer" /><portlet:param name="server_id" value="<%=server_id%>" /></portlet:actionURL>">Delete this server</a></li>
+ <li><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="deleteServer" /><portlet:param name="server_id" value="<%=node.getName()%>" /></portlet:actionURL>">Delete this server</a></li>
<li><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="showAddServer" /></portlet:actionURL>">Add a new server</a></li>
</ul>
<br />
@@ -372,14 +322,11 @@
</table>
</td>
- </form>
</tr>
</table>
<%
-con.close();
-}
- else
- {%>
+} else {
+%>
<table>
<tr>
<!-- Body -->
Modified: geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringEditView.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringEditView.jsp?rev=720024&r1=720023&r2=720024&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringEditView.jsp (original)
+++ geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringEditView.jsp Sun Nov 23 10:32:00 2008
@@ -16,39 +16,17 @@
--%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
-<%@ page import="java.util.ArrayList" %>
-<%@ page import="java.lang.String" %>
-<%@ page import="java.sql.Connection" %>
-<%@ page import="java.sql.PreparedStatement" %>
-<%@ page import="java.sql.ResultSet" %>
-<%@ page import="org.apache.geronimo.monitoring.console.util.DBManager" %>
<%@ page import="org.apache.geronimo.monitoring.console.Constants" %>
+<%@ page import="org.apache.geronimo.monitoring.console.data.Graph" %>
+<%@ page import="org.apache.geronimo.monitoring.console.data.View" %>
<portlet:defineObjects/>
<%
-String view_id = (String) request.getAttribute("view_id");
-String message = (String) request.getAttribute("message");
+ String message = (String) request.getAttribute("message");
-
-DBManager DBase = new DBManager();
-Connection con = DBase.getConnection();
-
-PreparedStatement pStmt = con.prepareStatement("SELECT * FROM views WHERE view_id="+view_id);
-ResultSet rs = pStmt.executeQuery();
-
-if (message == null)
- message = new String("");
-
-if (rs.next())
-{
- String added = rs.getString("added").substring(0,16);
- String modified = rs.getString("modified").substring(0,16);
- Integer enabled = rs.getInt("enabled");
- String name = rs.getString("name");
- String description = rs.getString("description");
- Integer graph_count = rs.getInt("graph_count");
- rs.close();
+ View view = (View) request.getAttribute("view");
+ if (view != null) {
%>
<!-- <head> -->
@@ -82,7 +60,7 @@
<!-- </head> -->
<%
- if (!message.equals(""))
+ if (message != null && !message.equals(""))
{
%>
<div align="left" style="width: 650px">
@@ -95,49 +73,36 @@
<td width="100%" align="left" valign="top">
<p>
<font face="Verdana" size="+1">
- Editing: <%=name%>
+ Editing: <%=view.getName()%>
</font>
</p>
<p>
- <form onsubmit="return validate();" name="editView" method="POST" action="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="saveEditView"/><portlet:param name="view_id" value="<%=view_id%>"/></portlet:actionURL>">
+ <form onsubmit="return validate();" name="editView" method="POST" action="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="saveEditView"/><portlet:param name="view_id" value="<%=view.getIdString()%>"/></portlet:actionURL>">
<table cellpadding="1" cellspacing="1">
- <tr>
- <td>Added:</td>
- <td> </td>
- <td align="right"><%=added%></td>
- </tr>
- <tr>
- <td>Last Modified:</td>
- <td> </td>
- <td align="right"><%=modified%></td>
- </tr>
+ <%--<tr>--%>
+ <%--<td>Added:</td>--%>
+ <%--<td> </td>--%>
+ <%--<td align="right"><%=added%></td>--%>
+ <%--</tr>--%>
+ <%--<tr>--%>
+ <%--<td>Last Modified:</td>--%>
+ <%--<td> </td>--%>
+ <%--<td align="right"><%=modified%></td>--%>
+ <%--</tr>--%>
<tr>
<td><label for="<portlet:namespace/>name">Name</label>:</td>
<td> </td>
- <td align="right"><input size="50" type="text" name="name" id="<portlet:namespace/>name" value="<%=name%>"></td>
+ <td align="right"><input size="50" type="text" name="name" id="<portlet:namespace/>name" value="<%=view.getName()%>"></td>
</tr>
<tr>
<td><label for="<portlet:namespace/>description">Description</label>:</td>
<td> </td>
- <td align="right"><textarea rows="5" cols="50" name="description" id="<portlet:namespace/>description"><%=description%></textarea></td>
+ <td align="right"><textarea rows="5" cols="50" name="description" id="<portlet:namespace/>description"><%=view.getDescription()%></textarea></td>
</tr>
<tr>
<td valign="top">Graphs:</td>
<td> </td>
<td align="right">
- <%
- DBase = new DBManager();
- con = DBase.getConnection();
- pStmt = con.prepareStatement("SELECT * FROM graphs");
- rs = pStmt.executeQuery();
- pStmt = con.prepareStatement("SELECT * FROM views_graphs WHERE view_id="+view_id);
- ResultSet rs2 = pStmt.executeQuery();
- ArrayList<Integer> graphsList = new ArrayList<Integer>();
- while (rs2.next())
- {
- graphsList.add(rs2.getInt("graph_id"));
- }
- %>
<table cellpadding="1" cellspacing="1">
<tr>
<th width="5%"></th>
@@ -147,26 +112,22 @@
<th>Edit</th>
</tr>
<%
- while (rs.next())
- {
- pStmt = con.prepareStatement("SELECT name FROM servers WHERE server_id="+rs.getString("server_id"));
- rs2 = pStmt.executeQuery();
- if (rs2.next())
+ for (Graph graph: view.getGraphs()) {
+ if (graph.getNode() != null)
{
%>
<tr>
- <td align="left" width="5%"><input type="checkbox" name="graph_ids" title="<%=rs.getString("name")%> - <%=rs2.getString("name")%>" id="<portlet:namespace/>graph_ids" value='<%=rs.getString("graph_id")%>' <%if (graphsList.contains(rs.getInt("graph_id"))){%> checked<%}%>></td>
- <td align="left"><a href="javascript: void(0)" onClick="openNewWindow('/monitoring/monitoringPopUpGraph.jsp?graph_id=<%=rs.getString("graph_id")%>','graph','width=800,height=300','title=<%=rs.getString("name") %>')"><%=rs.getString("name")%></a></td>
- <td align="left"><%=rs.getString("timeframe")%> min.</td>
- <td align="left"><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="showServer" /><portlet:param name="server_id" value='<%=rs.getString("server_id")%>' /></portlet:actionURL>"><%=rs2.getString("name")%></a></td>
- <td align="center"><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="showEditGraph" /><portlet:param name="graph_id" value='<%=rs.getString("graph_id")%>' /></portlet:actionURL>"><img border=0 src="/monitoring/images/edit-b.png" alt="edit"></a></td>
+ <%--<td align="left" width="5%"><input type="checkbox" name="graph_ids" title="<%=graph.getGraphName1()%> - <%=graph.getNode().getName()%>" id="<portlet:namespace/>graph_ids" value='<%=graph.getIdString()%>' <%if (graphsList.contains(rs.getInt("graph_id"))){%> checked<%}%>></td>--%>
+ <td align="left" width="5%"><input type="checkbox" name="graph_ids" title="<%=graph.getGraphName1()%> - <%=graph.getNode().getName()%>" id="<portlet:namespace/>graph_ids" value='<%=graph.getIdString()%>' <%if (true){%> checked<%}%>></td>
+ <td align="left"><a href="javascript: void(0)" onClick="openNewWindow('/monitoring/popUpGraph?graph_id=<%=graph.getIdString()%>','graph','width=800,height=300','title=<%=graph.getGraphName1() %>')"><%=graph.getGraphName1()%></a></td>
+ <td align="left"><%="" + graph.getTimeFrame()%> min.</td>
+ <td align="left"><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="showServer" /><portlet:param name="server_id" value='<%=graph.getNode().getName()%>' /></portlet:actionURL>"><%=graph.getNode().getName()%></a></td>
+ <td align="center"><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="showEditGraph" /><portlet:param name="graph_id" value='<%=graph.getIdString()%>' /></portlet:actionURL>"><img border=0 src="/monitoring/images/edit-b.png" alt="edit"></a></td>
</tr>
<%
}
- rs2.close();
}
- rs.close();
%>
</table>
</td>
@@ -180,7 +141,6 @@
</table>
</form>
- </p>
</td>
@@ -219,9 +179,9 @@
<td bgcolor="#FFFFFF" nowrap>
<br />
<ul>
- <li><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="showView" /><portlet:param name="view_id" value="<%=view_id%>" /></portlet:actionURL>">Show this view</a></li>
+ <li><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="showView" /><portlet:param name="view_id" value="<%=view.getIdString()%>" /></portlet:actionURL>">Show this view</a></li>
<li><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="showAddGraph" /></portlet:actionURL>">Create a new graph</a></li>
- <li><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="deleteView" /><portlet:param name="view_id" value="<%=view_id%>" /></portlet:actionURL>">Delete this view</a></li>
+ <li><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="deleteView" /><portlet:param name="view_id" value="<%=view.getIdString()%>" /></portlet:actionURL>">Delete this view</a></li>
<li><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="showAddView" /></portlet:actionURL>">Add a new view</a></li>
</ul>
<br />
@@ -232,11 +192,7 @@
</td>
</tr>
</table>
-<%
-con.close();
-}
- else
- {%>
+<%} else {%>
<table>
<tr>
<!-- Body -->
Modified: geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringGraphs.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringGraphs.jsp?rev=720024&r1=720023&r2=720024&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringGraphs.jsp (original)
+++ geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringGraphs.jsp Sun Nov 23 10:32:00 2008
@@ -17,11 +17,8 @@
--%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
-<%@ page import="java.util.ArrayList" %>
-<%@ page import="java.sql.Connection" %>
-<%@ page import="java.sql.PreparedStatement" %>
-<%@ page import="java.sql.ResultSet" %>
-<%@ page import="org.apache.geronimo.monitoring.console.util.DBManager" %>
+<%@ page import="java.util.List" %>
+<%@ page import="org.apache.geronimo.monitoring.console.data.Graph" %>
<portlet:defineObjects/>
<script language="JavaScript" type="text/javascript">
<!--
@@ -50,59 +47,10 @@
<th class="DarkBackground" width="20%">Data Series</th>
<th class="DarkBackground" width="15%">Actions</th>
</tr>
- <%
- DBManager DBase = new DBManager();
- Connection con = DBase.getConnection();
-
- PreparedStatement pStmt = con.prepareStatement("SELECT * FROM graphs");
- ResultSet rs = pStmt.executeQuery();
- // data structure to store the graph's info
- class GraphInfo {
- public String name;
- public String server_name;
- public String server_id;
- public String graph_id;
- public String timeframe;
- public String dataname1;
- public String operation;
- public String dataname2;
- public boolean enabled;
- }
-
- ArrayList<GraphInfo> graphInfo = new ArrayList<GraphInfo>();
- // for each graph, save the information locally
- while(rs.next()) {
- pStmt = con.prepareStatement("SELECT name FROM servers WHERE server_id="+rs.getInt("server_id"));
- ResultSet rs2 = pStmt.executeQuery();
- if (rs2.next())
- {
- GraphInfo s = new GraphInfo();
- s.server_name = rs2.getString("name");
- s.name = rs.getString("name");
- s.timeframe = rs.getString("timeframe");
- s.dataname1 = rs.getString("dataname1");
- s.operation = rs.getString("operation");
- s.dataname2 = rs.getString("dataname2");
- s.server_id = rs.getString("server_id");
- s.graph_id = rs.getString("graph_id");
- s.enabled = rs.getInt("enabled") == 1 ? true : false;
- graphInfo.add( s );
- }
- rs2.close();
- }
- // close connection
- con.close();
- // for each graph, draw it
- for(int i = 0 ; i < graphInfo.size(); i++) {
- String name = graphInfo.get(i).name;
- String server_name = graphInfo.get(i).server_name;
- String timeframe = graphInfo.get(i).timeframe;
- String dataname1 = graphInfo.get(i).dataname1;
- String operation = graphInfo.get(i).operation;
- String dataname2 = graphInfo.get(i).dataname2;
- String server_id = graphInfo.get(i).server_id;
- String graph_id = graphInfo.get(i).graph_id;
- boolean enabled = graphInfo.get(i).enabled;
+ <%
+
+ List<Graph> graphs = (List<Graph>) request.getAttribute("graphs");
+ for (Graph graph: graphs) {
%>
<c:set var="backgroundClass" value='MediumBackground'/>
<c:choose>
@@ -115,37 +63,32 @@
</c:choose>
<tr>
<%
- if (enabled)
+ if (graph.getNode().isEnabled())
{
%>
<td class="${backgroundClass}" width="30%" align="center">
- <a href="javascript: void(0)" onClick="openNewWindow('/monitoring/monitoringPopUpGraph.jsp?graph_id=<%=graph_id%>','graph','width=800,height=300','title=<%=name %>')"><%=name %></a>
+ <a href="javascript: void(0)" onClick="openNewWindow('/monitoring/popUpGraph?graph_id=<%=graph.getIdString()%>','graph','width=800,height=300','title=<%=graph.getGraphName1() %>')"><%=graph.getGraphName1() %></a>
</td>
- <td class="${backgroundClass}" width="20%" align="center"><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="showServer" /><portlet:param name="server_id" value="<%=server_id%>" /></portlet:actionURL>"><%=server_name%></a></td>
- <td class="${backgroundClass}" width="15%" align="center"><%=timeframe%></td>
- <td class="${backgroundClass}" width="20%" align="center"><%=dataname1%><%if (operation != null && !operation.equals("null")){%><%=operation%><%}%><%if (dataname2 != null && !dataname2.equals("null")){%><%=dataname2%><%}%></td>
- <td class="${backgroundClass}" width="15%" align="center"><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="showEditGraph" /><portlet:param name="graph_id" value="<%=graph_id%>" /></portlet:actionURL>"><img border=0 src="/monitoring/images/edit-b.png" alt="Edit">Edit</a></td>
+ <td class="${backgroundClass}" width="20%" align="center"><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="showServer" /><portlet:param name="server_id" value="<%=graph.getNode().getName()%>" /></portlet:actionURL>"><%=graph.getNode().getName()%></a></td>
+ <td class="${backgroundClass}" width="15%" align="center"><%=graph.getTimeFrame()%></td>
+ <td class="${backgroundClass}" width="20%" align="center"><%=graph.getDataName1()%><%if (graph.getOperation() != null && !graph.getOperation().equals("null")){%><%=graph.getOperation()%><%}%><%if (graph.getDataName2() != null && !graph.getDataName2().equals("null")){%><%=graph.getDataName2()%><%}%></td>
+ <td class="${backgroundClass}" width="15%" align="center"><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="showEditGraph" /><portlet:param name="graph_id" value="<%=graph.getIdString()%>" /></portlet:actionURL>"><img border=0 src="/monitoring/images/edit-b.png" alt="Edit">Edit</a></td>
<%}
else
{
%>
- <td class="${backgroundClass}" width="30%" align="center"><%=name%></td>
- <td class="${backgroundClass}" width="20%" align="center"><%=server_name%></td>
- <td class="${backgroundClass}" width="15%" align="center"><%=timeframe%></td>
- <td class="${backgroundClass}" width="20%" align="center"><%=dataname1%><%if (operation != null && !operation.equals("null")){%><%=operation%><%}%><%if (dataname2 != null && !dataname2.equals("null")){%><%=dataname2%><%}%></td>
+ <td class="${backgroundClass}" width="30%" align="center"><%=graph.getGraphName1()%></td>
+ <td class="${backgroundClass}" width="20%" align="center"><%=graph.getNode().getName()%></td>
+ <td class="${backgroundClass}" width="15%" align="center"><%=graph.getTimeFrame()%></td>
+ <td class="${backgroundClass}" width="20%" align="center"><%=graph.getDataName1()%><%if (graph.getOperation() != null && !graph.getOperation().equals("null")){%><%=graph.getOperation()%><%}%><%if (graph.getDataName2() != null && !graph.getDataName2().equals("null")){%><%=graph.getDataName2()%><%}%></td>
<td class="${backgroundClass}" width="15%" align="center"><img
border=0 src="/monitoring/images/edit-b.png" alt="edit">Edit</td>
<%
-}%>
+}
+ }%>
</tr>
- <%}
-%>
</table>
<div align="right"><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="showAddGraph" /></portlet:actionURL>"><img border=0 src="/monitoring/images/max-b.png" alt="Add Graph">Add Graph</a></div>
-<%
- // close connection
- con.close();
-%>
</td>
<td> </td>
Modified: geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringNormal.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringNormal.jsp?rev=720024&r1=720023&r2=720024&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringNormal.jsp (original)
+++ geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringNormal.jsp Sun Nov 23 10:32:00 2008
@@ -17,14 +17,11 @@
--%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
-<%@ page import="java.util.ArrayList" %>
-<%@ page import="java.sql.Connection" %>
-<%@ page import="java.sql.DatabaseMetaData" %>
-<%@ page import="java.sql.PreparedStatement" %>
-<%@ page import="java.sql.ResultSet" %>
-<%@ page import="java.sql.SQLException" %>
+<%@ page import="java.util.List" %>
<%@ page import="org.apache.geronimo.monitoring.console.MRCConnector" %>
-<%@ page import="org.apache.geronimo.monitoring.console.util.DBManager" %>
+<%@ page import="org.apache.geronimo.monitoring.console.data.Graph" %>
+<%@ page import="org.apache.geronimo.monitoring.console.data.Node" %>
+<%@ page import="org.apache.geronimo.monitoring.console.data.View" %>
<portlet:defineObjects/>
<script type = "text/javascript">
<!--
@@ -51,14 +48,9 @@
<th scope="col" class="DarkBackground" width="30%" colspan="2">Actions</th>
</tr>
<%
- DBManager DBase = new DBManager();
- Connection con = DBase.getConnection();
-
- PreparedStatement pStmt = con.prepareStatement("SELECT view_id, name, description, graph_count, added, modified FROM views");
- ResultSet rs = pStmt.executeQuery();
- while (rs.next())
- {
- String view_id = rs.getString("view_id");
+
+ List<View> views = (List<View>) request.getAttribute("views");
+ for (View view: views) {
%>
<c:set var="backgroundClass" value='MediumBackground'/>
<c:choose>
@@ -70,15 +62,15 @@
</c:otherwise>
</c:choose>
<tr>
- <td class="${backgroundClass}" width="30%" align="center"><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="showView" /><portlet:param name="view_id" value='<%=rs.getString("view_id")%>' /></portlet:actionURL>"><%=rs.getString("name")%></a></td>
- <td class="${backgroundClass}" width="10%" align="center"><%=rs.getString("graph_count")%></td>
- <td class="${backgroundClass}" width="15%" align="center"><%=rs.getString("added").substring(0,16)%></td>
- <td class="${backgroundClass}" width="15%" align="center"><%=rs.getString("modified").substring(0,16)%></td>
- <td class="${backgroundClass}" width="15%" align="center"><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="showEditView" /><portlet:param name="view_id" value='<%=rs.getString("view_id")%>' /></portlet:actionURL>"><img border=0 src="/monitoring/images/edit-b.png" alt="Edit">Edit</a></td>
+ <td class="${backgroundClass}" width="30%" align="center"><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="showView" /><portlet:param name="view_id" value='<%=view.getIdString()%>' /></portlet:actionURL>"><%=view.getName()%></a></td>
+ <td class="${backgroundClass}" width="10%" align="center"><%="" + view.getGraphs().size()%></td>
+ <%--<td class="${backgroundClass}" width="15%" align="center"><%=rs.getString("added").substring(0,16)%></td>--%>
+ <%--<td class="${backgroundClass}" width="15%" align="center"><%=rs.getString("modified").substring(0,16)%></td>--%>
+ <td class="${backgroundClass}" width="15%" align="center"><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="showEditView" /><portlet:param name="view_id" value='<%=view.getIdString()%>' /></portlet:actionURL>"><img border=0 src="/monitoring/images/edit-b.png" alt="Edit">Edit</a></td>
</tr>
<%
}
- rs.close();
+// rs.close();
%>
</table>
<div align="right"><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="showAddView" /></portlet:actionURL>"><img border=0 src="/monitoring/images/max-b.png" alt="Create View">Create View</a></div>
@@ -92,53 +84,16 @@
<th scope="col" class="DarkBackground" width="30%" colspan="3">Actions</th>
</tr>
<%
-
- pStmt = con.prepareStatement("SELECT * FROM servers");
- rs = pStmt.executeQuery();
-
- // data structure to store the server's info
- class ServerInfo {
- public String ip;
- public int port;
- public int protocol;
- public String username;
- public String password;
- public String server_id;
- public boolean enabled;
- public String name;
- }
-
- ArrayList<ServerInfo> serverInfos = new ArrayList<ServerInfo>();
- // for each server, save the information locally
- while(rs.next()) {
- ServerInfo s = new ServerInfo();
- s.ip = rs.getString("ip");
- s.username = rs.getString("username");
- s.password = rs.getString("password");
- s.server_id = rs.getString("server_id");
- s.name = rs.getString("name");
- s.enabled = rs.getInt("enabled") == 1 ? true : false;
- s.port = rs.getInt("port");
- s.protocol = rs.getInt("protocol");
- serverInfos.add( s );
- }
- // for each server, draw it
- for(int i = 0 ; i < serverInfos.size(); i++) {
- String ip = serverInfos.get(i).ip;
- int port = serverInfos.get(i).port;
- int protocol = serverInfos.get(i).protocol;
- String username = serverInfos.get(i).username;
- String password = serverInfos.get(i).password;
- String server_id = serverInfos.get(i).server_id;
- boolean enabled = serverInfos.get(i).enabled;
- String name = serverInfos.get(i).name;
+
+ List<Node> nodes = (List<Node>) request.getAttribute("nodes");
+ for (Node node: nodes) {
boolean online = false;
Integer collecting = 0;
MRCConnector mrc = null;
Long snapshotDuration = new Long(0);
- if (enabled) {
+ if (node.isEnabled()) {
try {
- mrc = new MRCConnector(ip, username, password, port, protocol);
+ mrc = new MRCConnector(node);
online = true;
} catch (Exception e) {
online = false;
@@ -163,23 +118,23 @@
</c:choose>
<tr>
<%
-if(enabled){
+if(node.isEnabled()){
%>
- <td class="${backgroundClass}" width="30%" align="center"><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="showServer" /><portlet:param name="server_id" value="<%=server_id%>" /></portlet:actionURL>"><%=name%></a></td>
- <td class="${backgroundClass}" width="10%" align="center"><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="showServer" /><portlet:param name="server_id" value="<%=server_id%>" /></portlet:actionURL>"><%=ip%></a></td>
+ <td class="${backgroundClass}" width="30%" align="center"><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="showServer" /><portlet:param name="server_id" value="<%=node.getName()%>" /></portlet:actionURL>"><%=node.getName()%></a></td>
+ <td class="${backgroundClass}" width="10%" align="center"><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="showServer" /><portlet:param name="server_id" value="<%=node.getName()%>" /></portlet:actionURL>"><%=node.getHost()%></a></td>
<%
}
else{
%>
- <td class="${backgroundClass}" width="30%" align="center"><%=name%></td>
- <td class="${backgroundClass}" width="10%" align="center"><%=ip%></td>
+ <td class="${backgroundClass}" width="30%" align="center"><%=node.getName()%></td>
+ <td class="${backgroundClass}" width="10%" align="center"><%=node.getHost()%></td>
<%
}
if (online) { // online
%>
<td class="${backgroundClass}" width="15%" align="center" bgcolor="#cccccc">Online</td>
<%
-} else if(enabled){ // offline
+} else if(node.isEnabled()){ // offline
%>
<td class="${backgroundClass}" width="15%" align="center"><font color="red"><img border=0 src="/monitoring/images/help-b.png" alt="Offline">Offline</font></td>
<%
@@ -192,9 +147,9 @@
%>
<td class="${backgroundClass}" width="15%" align="center"><font color="red">(stopped)</font></td>
<%
- if(enabled) { // enable the links
+ if(node.isEnabled()) { // enable the links
%>
- <td class="${backgroundClass}" width="10%" align="center"><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="startThread" /><portlet:param name="server_id" value="<%=server_id%>" /><portlet:param name="snapshotDuration" value="<%=java.lang.Long.toString(snapshotDuration)%>" /></portlet:actionURL>"><img border=0 src="/monitoring/images/max-b.png" alt="Enable Query">Enable Query</a></td>
+ <td class="${backgroundClass}" width="10%" align="center"><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="startThread" /><portlet:param name="server_id" value="<%=node.getName()%>" /><portlet:param name="snapshotDuration" value="<%=java.lang.Long.toString(snapshotDuration)%>" /></portlet:actionURL>"><img border=0 src="/monitoring/images/max-b.png" alt="Enable Query">Enable Query</a></td>
<%
} else { // do not provide links
%>
@@ -202,14 +157,14 @@
<%
}
%>
- <td class="${backgroundClass}" width="10%" align="center"><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="showEditServer" /><portlet:param name="server_id" value="<%=server_id%>" /></portlet:actionURL>"><img border=0 src="/monitoring/images/edit-b.png" alt="Edit">Edit</a></td>
+ <td class="${backgroundClass}" width="10%" align="center"><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="showEditServer" /><portlet:param name="server_id" value="<%=node.getName()%>" /></portlet:actionURL>"><img border=0 src="/monitoring/images/edit-b.png" alt="Edit">Edit</a></td>
<%
}
else if (collecting == -1) { // not collecting statistics
%>
<td class="${backgroundClass}" width="15%" align="center"><font color="red">Stopping...</font></td>
<%
- if(enabled) { // enable the links
+ if(node.isEnabled()) { // enable the links
%>
<td class="${backgroundClass}" width="10%" align="center"><img border=0 src="/monitoring/images/close-b.png" alt="Disable Query">Disable Query</td>
<%
@@ -219,16 +174,16 @@
<%
}
%>
- <td class="${backgroundClass}" width="10%" align="center"><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="showEditServer" /><portlet:param name="server_id" value="<%=server_id%>" /></portlet:actionURL>"><img border=0 src="/monitoring/images/edit-b.png" alt="Edit">Edit</a></td>
+ <td class="${backgroundClass}" width="10%" align="center"><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="showEditServer" /><portlet:param name="server_id" value="<%=node.getName()%>" /></portlet:actionURL>"><img border=0 src="/monitoring/images/edit-b.png" alt="Edit">Edit</a></td>
<%
}
else { // collecting statistics
- if (enabled)
+ if (node.isEnabled())
{
%>
<td class="${backgroundClass}" width="15%" align="center"><%=snapshotDuration/1000/60+" min. (running)"%></td>
- <td class="${backgroundClass}" width="10%" align="center"><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="stopThread" /><portlet:param name="server_id" value="<%=server_id%>" /></portlet:actionURL>"><img border=0 src="/monitoring/images/close-b.png" alt="Disable Query">Disable Query</a></td>
- <td class="${backgroundClass}" width="10%" align="center"><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="showEditServer" /><portlet:param name="server_id" value="<%=server_id%>" /></portlet:actionURL>"><img border=0 src="/monitoring/images/edit-b.png" alt="Edit">Edit</a></td>
+ <td class="${backgroundClass}" width="10%" align="center"><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="stopThread" /><portlet:param name="server_id" value="<%=node.getName()%>" /></portlet:actionURL>"><img border=0 src="/monitoring/images/close-b.png" alt="Disable Query">Disable Query</a></td>
+ <td class="${backgroundClass}" width="10%" align="center"><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="showEditServer" /><portlet:param name="server_id" value="<%=node.getName()%>" /></portlet:actionURL>"><img border=0 src="/monitoring/images/edit-b.png" alt="Edit">Edit</a></td>
<%
}
else
@@ -236,17 +191,17 @@
%>
<td class="${backgroundClass}" width="15%" align="center">Stopped</td>
<td class="${backgroundClass}" width="10%" align="center"><img border=0 src="/monitoring/images/close-b.png" alt="Disable Query">Disable Query</td>
- <td class="${backgroundClass}" width="10%" align="center"><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="showEditServer" /><portlet:param name="server_id" value="<%=server_id%>" /></portlet:actionURL>"><img border=0 src="/monitoring/images/edit-b.png" alt="Edit">Edit</a></td>
+ <td class="${backgroundClass}" width="10%" align="center"><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="showEditServer" /><portlet:param name="server_id" value="<%=node.getName()%>" /></portlet:actionURL>"><img border=0 src="/monitoring/images/edit-b.png" alt="Edit">Edit</a></td>
<%
}
}
-if(enabled) { // enabled server
+if(node.isEnabled()) { // enabled server
%>
- <td class="${backgroundClass}" width="10%" align="center"><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="disableServer" /><portlet:param name="server_id" value="<%=server_id%>" /></portlet:actionURL>"><img border=0 src="/monitoring/images/close-b.png" alt="Disable">Disable</a></td>
+ <td class="${backgroundClass}" width="10%" align="center"><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="disableServer" /><portlet:param name="server_id" value="<%=node.getName()%>" /></portlet:actionURL>"><img border=0 src="/monitoring/images/close-b.png" alt="Disable">Disable</a></td>
<%
} else { // disabled server
%>
- <td class="${backgroundClass}" width="10%" align="center"><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="enableServer" /><portlet:param name="server_id" value="<%=server_id%>" /></portlet:actionURL>"><img border=0 src="/monitoring/images/max-b.png" alt="Enable">Enable</a></td>
+ <td class="${backgroundClass}" width="10%" align="center"><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="enableServer" /><portlet:param name="server_id" value="<%=node.getName()%>" /></portlet:actionURL>"><img border=0 src="/monitoring/images/max-b.png" alt="Enable">Enable</a></td>
<%
}
%>
@@ -266,56 +221,8 @@
</tr>
<%
- pStmt = con.prepareStatement("SELECT * FROM graphs");
- rs = pStmt.executeQuery();
-
- // data structure to store the graph's info
- class GraphInfo {
- public String name;
- public String server_name;
- public String server_id;
- public String graph_id;
- public String timeframe;
- public String dataname1;
- public String operation;
- public String dataname2;
- public boolean enabled;
- }
-
- ArrayList<GraphInfo> graphInfo = new ArrayList<GraphInfo>();
- // for each graph, save the information locally
- while(rs.next()) {
- pStmt = con.prepareStatement("SELECT name FROM servers WHERE server_id="+rs.getInt("server_id"));
- ResultSet rs2 = pStmt.executeQuery();
- if (rs2.next())
- {
- GraphInfo s = new GraphInfo();
- s.server_name = rs2.getString("name");
- s.name = rs.getString("name");
- s.timeframe = rs.getString("timeframe");
- s.dataname1 = rs.getString("dataname1");
- s.operation = rs.getString("operation");
- s.dataname2 = rs.getString("dataname2");
- s.server_id = rs.getString("server_id");
- s.graph_id = rs.getString("graph_id");
- s.enabled = rs.getInt("enabled") == 1 ? true : false;
- graphInfo.add( s );
- }
- rs2.close();
- }
- // close connection
- con.close();
- // for each graph, draw it
- for(int i = 0 ; i < graphInfo.size(); i++) {
- String name = graphInfo.get(i).name;
- String server_name = graphInfo.get(i).server_name;
- String timeframe = graphInfo.get(i).timeframe;
- String dataname1 = graphInfo.get(i).dataname1;
- String operation = graphInfo.get(i).operation;
- String dataname2 = graphInfo.get(i).dataname2;
- String server_id = graphInfo.get(i).server_id;
- String graph_id = graphInfo.get(i).graph_id;
- boolean enabled = graphInfo.get(i).enabled;
+ List<Graph> graphs = (List<Graph>) request.getAttribute("graphs");
+ for (Graph graph: graphs) {
%>
<c:set var="backgroundClass" value='MediumBackground'/>
<c:choose>
@@ -328,24 +235,24 @@
</c:choose>
<tr>
<%
- if (enabled)
+ if (graph.getNode().isEnabled())
{
%>
<td class="${backgroundClass}" width="30%" align="center">
- <a href="javascript: void(0)" onClick="openNewWindow('/monitoring/monitoringPopUpGraph.jsp?graph_id=<%=graph_id%>','graph','width=800,height=300','title=<%=name %>')"><%=name %></a>
+ <a href="javascript: void(0)" onClick="openNewWindow('/monitoring/popUpGraph?graph_id=<%=graph.getId()%>','graph','width=800,height=300','title=<%=graph.getGraphName1() %>')"><%=graph.getGraphName1() %></a>
</td>
- <td class="${backgroundClass}" width="20%" align="center"><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="showServer" /><portlet:param name="server_id" value="<%=server_id%>" /></portlet:actionURL>"><%=server_name%></a></td>
- <td class="${backgroundClass}" width="15%" align="center"><%=timeframe%></td>
- <td class="${backgroundClass}" width="20%" align="center"><%=dataname1%><%if (operation != null && !operation.equals("null")){%><%=operation%><%}%><%if (dataname2 != null && !dataname2.equals("null")){%><%=dataname2%><%}%></td>
- <td class="${backgroundClass}" width="15%" align="center"><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="showEditGraph" /><portlet:param name="graph_id" value="<%=graph_id%>" /></portlet:actionURL>"><img border=0 src="/monitoring/images/edit-b.png" alt="Edit">Edit</a></td>
+ <td class="${backgroundClass}" width="20%" align="center"><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="showServer" /><portlet:param name="server_id" value="<%=graph.getNode().getName()%>" /></portlet:actionURL>"><%=graph.getNode().getName()%></a></td>
+ <td class="${backgroundClass}" width="15%" align="center"><%=graph.getTimeFrame()%></td>
+ <td class="${backgroundClass}" width="20%" align="center"><%=graph.getDataName1()%><%if (graph.getOperation() != null && !graph.getOperation().equals("null")){%><%=graph.getOperation()%><%}%><%if (graph.getDataName2() != null && !graph.getDataName2().equals("null")){%><%=graph.getDataName2()%><%}%></td>
+ <td class="${backgroundClass}" width="15%" align="center"><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="showEditGraph" /><portlet:param name="graph_id" value="<%=graph.getIdString()%>" /></portlet:actionURL>"><img border=0 src="/monitoring/images/edit-b.png" alt="Edit">Edit</a></td>
<%}
else
{
%>
- <td class="${backgroundClass}" width="30%" align="center"><%=name%></td>
- <td class="${backgroundClass}" width="20%" align="center"><%=server_name%></td>
- <td class="${backgroundClass}" width="15%" align="center"><%=timeframe%></td>
- <td class="${backgroundClass}" width="20%" align="center"><%=dataname1%><%if (operation != null && !operation.equals("null")){%><%=operation%><%}%><%if (dataname2 != null && !dataname2.equals("null")){%><%=dataname2%><%}%></td>
+ <td class="${backgroundClass}" width="30%" align="center"><%=graph.getGraphName1()%></td>
+ <td class="${backgroundClass}" width="20%" align="center"><%=graph.getNode().getName()%></td>
+ <td class="${backgroundClass}" width="15%" align="center"><%=graph.getTimeFrame()%></td>
+ <td class="${backgroundClass}" width="20%" align="center"><%=graph.getDataName1()%><%if (graph.getOperation() != null && !graph.getOperation().equals("null")){%><%=graph.getOperation()%><%}%><%if (graph.getDataName2() != null && !graph.getDataName2().equals("null")){%><%=graph.getDataName2()%><%}%></td>
<td class="${backgroundClass}" width="15%" align="center"><img border=0 src="/monitoring/images/edit-b.png" alt="Edit">Edit</td>
<%
}%>
Modified: geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringPage.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringPage.jsp?rev=720024&r1=720023&r2=720024&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringPage.jsp (original)
+++ geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringPage.jsp Sun Nov 23 10:32:00 2008
@@ -16,62 +16,19 @@
--%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
-<%@ page import="org.apache.geronimo.monitoring.console.StatsGraph" %>
-<%@ page import="org.apache.geronimo.monitoring.console.GraphsBuilder" %>
-<%@ page import="java.util.ArrayList" %>
-<%@ page import="java.sql.Connection" %>
-<%@ page import="java.sql.PreparedStatement" %>
-<%@ page import="java.sql.ResultSet" %>
-<%@ page import="org.apache.geronimo.monitoring.console.util.DBManager" %>
+<%@ page import="java.util.List" %>
<%@ page import="org.apache.geronimo.monitoring.console.Constants" %>
+<%@ page import="org.apache.geronimo.monitoring.console.StatsGraph" %>
+<%@ page import="org.apache.geronimo.monitoring.console.data.View" %>
<portlet:defineObjects/>
<%
-
-String view_id = (String) request.getAttribute("view_id");
-
-DBManager DBase = new DBManager();
-Connection con = DBase.getConnection();
-
-PreparedStatement pStmt = con.prepareStatement("SELECT view_id, name, description, graph_count, added, modified FROM views WHERE enabled=1 AND view_id="+view_id);
-ResultSet rs = pStmt.executeQuery();
-GraphsBuilder run = new GraphsBuilder();
String errors = "";
-if (rs.next())
-{
- String name = rs.getString("name");
- String description = rs.getString("description");
- pStmt = con.prepareStatement("SELECT * FROM views_graphs WHERE view_id="+view_id);
- ResultSet rs2 = pStmt.executeQuery();
- ArrayList<Integer> ids = new ArrayList<Integer>();
- while(rs2.next()) {
- ids.add( new Integer(rs2.getInt("graph_id")) );
- }
-
- rs.close();
- rs2.close();
+ View view = (View) request.getAttribute("view");
+ List<StatsGraph> statsGraphs = (List<StatsGraph>) request.getAttribute("statsGraphs");
+ if (view != null && statsGraphs != null) {
- try {
- if(con != null) {
- con.close();
- }
- } catch(Exception e) {
-
- }
-
- ArrayList <StatsGraph> graphs = new ArrayList<StatsGraph>();
- for(int i = 0 ; i < ids.size(); i++) {
- try {
- StatsGraph graph = run.buildOneDB( ids.get(i).intValue() );
- if(graph != null) {
- graphs.add( graph );
- }
- } catch (Exception e) {
- errors = errors + "<li>Graph " + ids.get(i) + " could not be drawn due to server being offline</li>";
- }
- }
-
%>
<!-- <head> -->
<script type='text/javascript' src='<%=Constants.DOJO_JS%>' djConfig='isDebug: false, parseOnLoad: true'>
@@ -92,7 +49,7 @@
dojo.require("dojox.fx.easing");
makeObjects = function(){
- <% for (StatsGraph graph : graphs)
+ <% for (StatsGraph graph : statsGraphs)
out.println(graph.getJS());
%>
@@ -114,21 +71,20 @@
<td width="90%" align="left" valign="top">
<p>
<font face="Verdana" size="+1">
- <%=name%>
+ <%=view.getName()%>
</font>
</p>
- <p><%=description%></p>
+ <p><%=view.getDescription()%></p>
<%
try
{
-for (StatsGraph graph : graphs)
+for (StatsGraph graph : statsGraphs)
{
%>
<p>
<div id="<%=graph.getDivName()%>Head" style="background-color: #f2f2f2; border-top: 1px solid #2581c7; margin: 0px; width: 100%; height: 16px;"><div align="left" style="background-color: #f2f2f2; float:left; text-align:left; width:75%; height: 20px;"><%=graph.getName() %></div><div align=right style="background-color: #f2f2f2; float:left; width:25%; text-align:right;"><a href="#" onClick="hide('<%=graph.getDivName()%>');hide('<%=graph.getDivName()%>Sub');"><img border=0 src="/monitoring/images/min-b.png" alt="hide"></a> <a href="#" onClick="show('<%=graph.getDivName()%>');show('<%=graph.getDivName()%>Sub');"><img border=0 src="/monitoring/images/max-b.png" alt="show"></a></div></div>
<%=graph.getDivImplement()%>
-</p>
<%
}
}
@@ -183,8 +139,8 @@
<td bgcolor="#FFFFFF" nowrap>
<br />
<ul>
- <li><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="showEditView" /><portlet:param name="view_id" value="<%=view_id%>" /></portlet:actionURL>">Modify this view</a></li>
- <li><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="disableView" /><portlet:param name="view_id" value="<%=view_id%>" /></portlet:actionURL>">Disable this view</a></li>
+ <li><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="showEditView" /><portlet:param name="view_id" value="<%=view.getIdString()%>" /></portlet:actionURL>">Modify this view</a></li>
+ <li><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="disableView" /><portlet:param name="view_id" value="<%=view.getIdString()%>" /></portlet:actionURL>">Disable this view</a></li>
<li><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="showAddView" /></portlet:actionURL>">Create a new view</a></li>
</ul>
<br />
@@ -196,9 +152,8 @@
</tr>
</table>
<%
-}
- else
- {%>
+} else {
+%>
<table>
<tr>
<!-- Body -->
Modified: geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringServers.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringServers.jsp?rev=720024&r1=720023&r2=720024&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringServers.jsp (original)
+++ geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringServers.jsp Sun Nov 23 10:32:00 2008
@@ -16,12 +16,9 @@
--%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
-<%@ page import="java.util.ArrayList" %>
-<%@ page import="java.sql.Connection" %>
-<%@ page import="java.sql.PreparedStatement" %>
-<%@ page import="java.sql.ResultSet" %>
+<%@ page import="java.util.List" %>
<%@ page import="org.apache.geronimo.monitoring.console.MRCConnector" %>
-<%@ page import="org.apache.geronimo.monitoring.console.util.DBManager" %>
+<%@ page import="org.apache.geronimo.monitoring.console.data.Node" %>
<portlet:defineObjects/>
<%
String message = (String) request.getAttribute("message");
@@ -36,13 +33,6 @@
<tr>
<!-- Body -->
<td width="100%" align="left" valign="top">
-<%
- DBManager DBase = new DBManager();
- Connection con = DBase.getConnection();
-
- PreparedStatement pStmt = con.prepareStatement("SELECT * FROM servers");
- ResultSet rs = pStmt.executeQuery();
-%>
<table width="100%" style="border-style: solid;
border-width: 1px;">
<thead align="center"><strong>Servers</strong></thead>
@@ -54,49 +44,15 @@
<th class="DarkBackground" width="30%" colspan="3">Actions</th>
</tr>
<%
- // data structure to store the server's info
- class ServerInfo {
- public String ip;
- public int port;
- public int protocol;
- public String username;
- public String password;
- public String server_id;
- public boolean enabled;
- public String name;
- }
-
- ArrayList<ServerInfo> serverInfos = new ArrayList<ServerInfo>();
- // for each server, save the information locally
- while(rs.next()) {
- ServerInfo s = new ServerInfo();
- s.ip = rs.getString("ip");
- s.username = rs.getString("username");
- s.password = rs.getString("password");
- s.server_id = rs.getString("server_id");
- s.name = rs.getString("name");
- s.enabled = rs.getInt("enabled") == 1 ? true : false;
- s.port = rs.getInt("port");
- s.protocol = rs.getInt("protocol");
- serverInfos.add( s );
- }
- // for each server, draw it
- for(int i = 0 ; i < serverInfos.size(); i++) {
- String ip = serverInfos.get(i).ip;
- String username = serverInfos.get(i).username;
- String password = serverInfos.get(i).password;
- String server_id = serverInfos.get(i).server_id;
- int port = serverInfos.get(i).port;
- int protocol = serverInfos.get(i).protocol;
- boolean enabled = serverInfos.get(i).enabled;
- String name = serverInfos.get(i).name;
- boolean online = false;
- Integer collecting = 0;
- MRCConnector mrc = null;
- Long snapshotDuration = new Long(0);
- if (enabled) {
+ List<Node> nodes = (List<Node>) request.getAttribute("nodes");
+ for (Node node: nodes) {
+ boolean online = false;
+ Integer collecting = 0;
+ MRCConnector mrc = null;
+ Long snapshotDuration = new Long(0);
+ if (node.isEnabled()) {
try {
- mrc = new MRCConnector(ip, username, password, port, protocol);
+ mrc = new MRCConnector(node);
online = true;
} catch (Exception e) {
online = false;
@@ -121,23 +77,23 @@
</c:choose>
<tr>
<%
-if(enabled){
+if(node.isEnabled()){
%>
- <td class="${backgroundClass}" width="30%" align="center"><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="showServer" /><portlet:param name="server_id" value="<%=server_id%>" /></portlet:actionURL>"><%=name%></a></td>
- <td class="${backgroundClass}" width="10%" align="center"><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="showServer" /><portlet:param name="server_id" value="<%=server_id%>" /></portlet:actionURL>"><%=ip%></a></td>
+ <td class="${backgroundClass}" width="30%" align="center"><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="showServer" /><portlet:param name="server_id" value="<%=node.getName()%>" /></portlet:actionURL>"><%=node.getName()%></a></td>
+ <td class="${backgroundClass}" width="10%" align="center"><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="showServer" /><portlet:param name="server_id" value="<%=node.getName()%>" /></portlet:actionURL>"><%=node.getHost()%></a></td>
<%
}
else{
%>
- <td class="${backgroundClass}" width="30%" align="center"><%=name%></td>
- <td class="${backgroundClass}" width="10%" align="center"><%=ip%></td>
+ <td class="${backgroundClass}" width="30%" align="center"><%=node.getName()%></td>
+ <td class="${backgroundClass}" width="10%" align="center"><%=node.getHost()%></td>
<%
}
if (online) { // online
%>
<td class="${backgroundClass}" width="15%" align="center" bgcolor="#cccccc">Online</td>
<%
-} else if(enabled){ // offline
+} else if(node.isEnabled()){ // offline
%>
<td class="${backgroundClass}" width="15%" align="center"><font color="red"><img border=0 src="/monitoring/images/help-b.png" alt="Offline">Offline</font></td>
<%
@@ -150,9 +106,9 @@
%>
<td class="${backgroundClass}" width="15%" align="center"><font color="red">(stopped)</font></td>
<%
- if(enabled) { // enable the links
+ if(node.isEnabled()) { // enable the links
%>
- <td class="${backgroundClass}" width="10%" align="center"><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="startThread" /><portlet:param name="server_id" value="<%=server_id%>" /><portlet:param name="snapshotDuration" value="<%=java.lang.Long.toString(snapshotDuration)%>" /></portlet:actionURL>"><img border=0 src="/monitoring/images/max-b.png" alt="Enable Query">Enable Query</a></td>
+ <td class="${backgroundClass}" width="10%" align="center"><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="startThread" /><portlet:param name="server_id" value="<%=node.getName()%>" /><portlet:param name="snapshotDuration" value="<%=java.lang.Long.toString(snapshotDuration)%>" /></portlet:actionURL>"><img border=0 src="/monitoring/images/max-b.png" alt="Enable Query">Enable Query</a></td>
<%
} else { // do not provide links
%>
@@ -160,14 +116,14 @@
<%
}
%>
- <td class="${backgroundClass}" width="10%" align="center"><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="showEditServer" /><portlet:param name="server_id" value="<%=server_id%>" /></portlet:actionURL>"><img border=0 src="/monitoring/images/edit-b.png" alt="Edit">Edit</a></td>
+ <td class="${backgroundClass}" width="10%" align="center"><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="showEditServer" /><portlet:param name="server_id" value="<%=node.getName()%>" /></portlet:actionURL>"><img border=0 src="/monitoring/images/edit-b.png" alt="Edit">Edit</a></td>
<%
}
else if (collecting == -1) { // not collecting statistics
%>
<td class="${backgroundClass}" width="15%" align="center"><font color="red">Stopping...</font></td>
<%
- if(enabled) { // enable the links
+ if(node.isEnabled()) { // enable the links
%>
<td class="${backgroundClass}" width="10%" align="center"><img border=0 src="/monitoring/images/close-b.png" alt="Disable Query">Disable Query</td>
<%
@@ -177,16 +133,16 @@
<%
}
%>
- <td class="${backgroundClass}" width="10%" align="center"><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="showEditServer" /><portlet:param name="server_id" value="<%=server_id%>" /></portlet:actionURL>"><img border=0 src="/monitoring/images/edit-b.png" alt="Edit">Edit</a></td>
+ <td class="${backgroundClass}" width="10%" align="center"><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="showEditServer" /><portlet:param name="server_id" value="<%=node.getName()%>" /></portlet:actionURL>"><img border=0 src="/monitoring/images/edit-b.png" alt="Edit">Edit</a></td>
<%
}
else { // collecting statistics
- if (enabled)
+ if (node.isEnabled())
{
%>
<td class="${backgroundClass}" width="15%" align="center"><%=snapshotDuration/1000/60+" min. (running)"%></td>
- <td class="${backgroundClass}" width="10%" align="center"><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="stopThread" /><portlet:param name="server_id" value="<%=server_id%>" /></portlet:actionURL>"><img border=0 src="/monitoring/images/close-b.png" alt="Disable Query">Disable Query</a></td>
- <td class="${backgroundClass}" width="10%" align="center"><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="showEditServer" /><portlet:param name="server_id" value="<%=server_id%>" /></portlet:actionURL>"><img border=0 src="/monitoring/images/edit-b.png" alt="Edit">Edit</a></td>
+ <td class="${backgroundClass}" width="10%" align="center"><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="stopThread" /><portlet:param name="server_id" value="<%=node.getName()%>" /></portlet:actionURL>"><img border=0 src="/monitoring/images/close-b.png" alt="Disable Query">Disable Query</a></td>
+ <td class="${backgroundClass}" width="10%" align="center"><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="showEditServer" /><portlet:param name="server_id" value="<%=node.getName()%>" /></portlet:actionURL>"><img border=0 src="/monitoring/images/edit-b.png" alt="Edit">Edit</a></td>
<%
}
else
@@ -194,17 +150,17 @@
%>
<td class="${backgroundClass}" width="15%" align="center">Stopped</td>
<td class="${backgroundClass}" width="10%" align="center"><img border=0 src="/monitoring/images/close-b.png" alt="Disable Query">Disable Query</td>
- <td class="${backgroundClass}" width="10%" align="center"><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="showEditServer" /><portlet:param name="server_id" value="<%=server_id%>" /></portlet:actionURL>"><img border=0 src="/monitoring/images/edit-b.png" alt="Edit">Edit</a></td>
+ <td class="${backgroundClass}" width="10%" align="center"><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="showEditServer" /><portlet:param name="server_id" value="<%=node.getName()%>" /></portlet:actionURL>"><img border=0 src="/monitoring/images/edit-b.png" alt="Edit">Edit</a></td>
<%
}
}
-if(enabled) { // enabled server
+if(node.isEnabled()) { // enabled server
%>
- <td class="${backgroundClass}" width="10%" align="center"><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="disableServer" /><portlet:param name="server_id" value="<%=server_id%>" /></portlet:actionURL>"><img border=0 src="/monitoring/images/close-b.png" alt="Disable">Disable</a></td>
+ <td class="${backgroundClass}" width="10%" align="center"><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="disableServer" /><portlet:param name="server_id" value="<%=node.getName()%>" /></portlet:actionURL>"><img border=0 src="/monitoring/images/close-b.png" alt="Disable">Disable</a></td>
<%
} else { // disabled server
%>
- <td class="${backgroundClass}" width="10%" align="center"><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="enableServer" /><portlet:param name="server_id" value="<%=server_id%>" /></portlet:actionURL>"><img border=0 src="/monitoring/images/max-b.png" alt="Enable">Enable</a></td>
+ <td class="${backgroundClass}" width="10%" align="center"><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="enableServer" /><portlet:param name="server_id" value="<%=node.getName()%>" /></portlet:actionURL>"><img border=0 src="/monitoring/images/max-b.png" alt="Enable">Enable</a></td>
<%
}
%>
@@ -213,10 +169,6 @@
%>
</table>
<div align="right"><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="showAddServer" /></portlet:actionURL>"><img border=0 src="/monitoring/images/max-b.png" alt="Add Server">Add Server</a></div>
-<%
- // close connection
- con.close();
-%>
</td>
<td> </td>
Modified: geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringViewServer.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringViewServer.jsp?rev=720024&r1=720023&r2=720024&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringViewServer.jsp (original)
+++ geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringViewServer.jsp Sun Nov 23 10:32:00 2008
@@ -17,27 +17,19 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
<%@ page import="java.util.ArrayList" %>
-<%@ page import="java.util.Set" %>
<%@ page import="java.util.HashMap" %>
<%@ page import="java.util.Iterator" %>
+<%@ page import="java.util.Set" %>
<%@ page import="java.util.TreeMap" %>
-<%@ page import="java.lang.String" %>
-<%@ page import="java.sql.Connection" %>
-<%@ page import="java.sql.PreparedStatement" %>
-<%@ page import="java.sql.ResultSet" %>
<%@ page import="javax.management.InstanceNotFoundException" %>
-<%@ page import="org.apache.geronimo.monitoring.console.util.DBManager" %>
<%@ page import="org.apache.geronimo.monitoring.console.MRCConnector" %>
+<%@ page import="org.apache.geronimo.monitoring.console.data.Node" %>
<portlet:defineObjects/>
<%
-String server_id = (String) request.getAttribute("server_id");
String message = (String) request.getAttribute("message");
-DBManager DBase = new DBManager();
-Connection con = DBase.getConnection();
-
MRCConnector mrc = null;
boolean isOnline = true;
@@ -47,27 +39,13 @@
if (message == null)
message = new String("");
-DBase = new DBManager();
-con = DBase.getConnection();
-PreparedStatement pStmt = con.prepareStatement("SELECT * FROM servers WHERE enabled=1 AND server_id="+server_id);
-ResultSet rs = pStmt.executeQuery();
-
-if (rs.next()) {
+ Node node = (Node) request.getAttribute("node");
+if (node != null) {
TreeMap <String,String> availableBeansMap = null;
TreeMap <String,String> trackedBeansMap = null;
- String ip = rs.getString("ip");
- int port = rs.getInt("port");
- int protocol = rs.getInt("protocol");
- String username = rs.getString("username");
- String name = rs.getString("name");
- String password = rs.getString("password");
- String last_seen = rs.getString("last_seen").substring(0,16);
- String added = rs.getString("added").substring(0,16);
- String modified = rs.getString("modified").substring(0,16);
long retention = -1;
- rs.close();
try {
- mrc = new MRCConnector(ip, username, password, port, protocol);
+ mrc = new MRCConnector(node);
availableBeansMap = mrc.getFreeStatisticsProviderBeanNamesMap();
retention = mrc.getSnapshotRetention();
trackedBeansMap = mrc.getTrackedBeansMap();
@@ -106,7 +84,7 @@
<td width="90%" align="left" valign="top">
<p>
<font face="Verdana" size="+1">
- <%=name%>
+ <%=node.getName()%>
</font>
</p>
<p>
@@ -141,25 +119,25 @@
</td>
</tr>
- <tr>
- <th align="left">Added:</th>
- <td> </td>
- <td align="right"><%=added%></td>
- </tr>
- <tr>
- <th align="left">Modified:</th>
- <td> </td>
- <td align="right"><%=modified%></td>
- </tr>
- <tr>
- <th align="left">Last seen:</th>
- <td> </td>
- <td align="right"><%=last_seen%></td>
- </tr>
+ <%--<tr>--%>
+ <%--<th align="left">Added:</th>--%>
+ <%--<td> </td>--%>
+ <%--<td align="right"><%=added%></td>--%>
+ <%--</tr>--%>
+ <%--<tr>--%>
+ <%--<th align="left">Modified:</th>--%>
+ <%--<td> </td>--%>
+ <%--<td align="right"><%=modified%></td>--%>
+ <%--</tr>--%>
+ <%--<tr>--%>
+ <%--<th align="left">Last seen:</th>--%>
+ <%--<td> </td>--%>
+ <%--<td align="right"><%=last_seen%></td>--%>
+ <%--</tr>--%>
<tr>
<th align="left">IP/Hostname:</th>
<td> </td>
- <td align="right"><%=ip%></td>
+ <td align="right"><%=node.getHost()%></td>
</tr>
<tr>
<th align="left">Snapshot Duration:</th>
@@ -188,7 +166,6 @@
<%} %>
</tr>
</table>
- </p>
<table>
<thead><font size="+1">Live Statistics</font></thead>
<%
@@ -223,7 +200,7 @@
{
String dataName = itt.next().toString();
%>
- <tr><td><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="showAddGraph" /><portlet:param name="server_id" value="<%=server_id%>" /><portlet:param name="mbean" value="<%=trackedBeansMap.get(prettyBean)%>" /><portlet:param name="dataname" value="<%=dataName%>" /></portlet:actionURL>"><%=dataName%></a></td><td><%=beanStats.get(dataName) %></td></tr>
+ <tr><td><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="showAddGraph" /><portlet:param name="server_id" value="<%=node.getName()%>" /><portlet:param name="mbean" value="<%=trackedBeansMap.get(prettyBean)%>" /><portlet:param name="dataname" value="<%=dataName%>" /></portlet:actionURL>"><%=dataName%></a></td><td><%=beanStats.get(dataName) %></td></tr>
<%
}
} else {
@@ -293,17 +270,17 @@
<td bgcolor="#FFFFFF" nowrap>
<br />
<ul>
- <li><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="showEditServer" /><portlet:param name="server_id" value="<%=server_id%>" /></portlet:actionURL>">Modify this server</a></li>
- <li><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="disableServer" /><portlet:param name="server_id" value="<%=server_id%>" /></portlet:actionURL>">Disable this server</a></li>
+ <li><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="showEditServer" /><portlet:param name="server_id" value="<%=node.getName()%>" /></portlet:actionURL>">Modify this server</a></li>
+ <li><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="disableServer" /><portlet:param name="server_id" value="<%=node.getName()%>" /></portlet:actionURL>">Disable this server</a></li>
<li><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="showAddServer" /></portlet:actionURL>">Add a new server</a></li>
<%
if(collecting == 1) {
%>
- <li><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="disableServerViewQuery" /><portlet:param name="server_id" value="<%=server_id%>" /></portlet:actionURL>">Disable Query</a></li>
+ <li><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="disableServerViewQuery" /><portlet:param name="server_id" value="<%=node.getName()%>" /></portlet:actionURL>">Disable Query</a></li>
<%
} else if (collecting == 0){
%>
- <li><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="enableServerViewQuery" /><portlet:param name="server_id" value="<%=server_id%>" /><portlet:param name="snapshotDuration" value='<%= "" + (snapshotDuration * 1000 * 60) %>' /></portlet:actionURL>">Enable Query</a></li>
+ <li><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="enableServerViewQuery" /><portlet:param name="server_id" value="<%=node.getName()%>" /><portlet:param name="snapshotDuration" value='<%= "" + (snapshotDuration * 1000 * 60) %>' /></portlet:actionURL>">Enable Query</a></li>
<%
}
else if (collecting == -1){
@@ -372,7 +349,7 @@
<tr>
<td width=95% bgcolor="#FFFFFF" nowrap><%=prettyBean%></td>
<td align="right" width=5% bgcolor="#f2f2f2" nowrap>
- <a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="stopTrackingMbean" /><portlet:param name="server_id" value="<%=server_id%>" /><portlet:param name="mbean" value="<%=mbeanList.get(i)%>" /></portlet:actionURL>"><img border=0 src="/monitoring/images/close-b.png" alt="stop tracking mbean"></a><br>
+ <a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="stopTrackingMbean" /><portlet:param name="server_id" value="<%=node.getName()%>" /><portlet:param name="mbean" value="<%=mbeanList.get(i)%>" /></portlet:actionURL>"><img border=0 src="/monitoring/images/close-b.png" alt="stop tracking mbean"></a><br>
</td>
</tr>
<%
@@ -438,7 +415,7 @@
<tr>
<td width=95% bgcolor="#FFFFFF" nowrap><%=prettyBean%></td>
<td align="right" width=5% bgcolor="#f2f2f2" nowrap>
- <a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="startTrackingMbean" /><portlet:param name="server_id" value="<%=server_id%>" /><portlet:param name="mbean" value="<%=mbeanList.get(i)%>" /></portlet:actionURL>"><img border=0 src="/monitoring/images/max-b.png" alt="start tracking mbean"></a><br>
+ <a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="startTrackingMbean" /><portlet:param name="server_id" value="<%=node.getName()%>" /><portlet:param name="mbean" value="<%=mbeanList.get(i)%>" /></portlet:actionURL>"><img border=0 src="/monitoring/images/max-b.png" alt="start tracking mbean"></a><br>
</td>
</tr>
<%
@@ -513,10 +490,8 @@
</td>
</tr>
</table>
- <%
- rs.close();
- }%>
-
+ <!--rs.close();-->
+ <% }%>
Modified: geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringViews.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringViews.jsp?rev=720024&r1=720023&r2=720024&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringViews.jsp (original)
+++ geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringViews.jsp Sun Nov 23 10:32:00 2008
@@ -17,10 +17,8 @@
--%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
-<%@ page import="java.sql.Connection" %>
-<%@ page import="java.sql.PreparedStatement" %>
-<%@ page import="java.sql.ResultSet" %>
-<%@ page import="org.apache.geronimo.monitoring.console.util.DBManager" %>
+<%@ page import="java.util.List" %>
+<%@ page import="org.apache.geronimo.monitoring.console.data.View" %>
<portlet:defineObjects/>
<%
String message = (String) request.getAttribute("message");
@@ -46,14 +44,8 @@
<th class="DarkBackground" width="30%" colspan="2">Actions</th>
</tr>
<%
- DBManager DBase = new DBManager();
- Connection con = DBase.getConnection();
-
- PreparedStatement pStmt = con.prepareStatement("SELECT view_id, name, description, graph_count, added, modified FROM views");
- ResultSet rs = pStmt.executeQuery();
- while (rs.next())
- {
- String view_id = rs.getString("view_id");
+ List<View> views = (List<View>) request.getAttribute("views");
+ for (View view: views) {
%>
<c:set var="backgroundClass" value='MediumBackground'/>
<c:choose>
@@ -65,22 +57,18 @@
</c:otherwise>
</c:choose>
<tr>
- <td class="${backgroundClass}" width="30%" align="center"><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="showView" /><portlet:param name="view_id" value='<%=rs.getString("view_id")%>' /></portlet:actionURL>"><%=rs.getString("name")%></a></td>
- <td class="${backgroundClass}" width="10%" align="center"><%=rs.getString("graph_count")%></td>
- <td class="${backgroundClass}" width="15%" align="center"><%=rs.getString("added").substring(0,16)%></td>
- <td class="${backgroundClass}" width="15%" align="center"><%=rs.getString("modified").substring(0,16)%></td>
- <td class="${backgroundClass}" width="15%" align="center"><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="showEditView" /><portlet:param name="view_id" value='<%=rs.getString("view_id")%>' /></portlet:actionURL>"><img border=0 src="/monitoring/images/edit-b.png" alt="Edit">Edit</a></td>
+ <td class="${backgroundClass}" width="30%" align="center"><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="showView" /><portlet:param name="view_id" value='<%=view.getIdString()%>' /></portlet:actionURL>"><%=view.getName()%></a></td>
+ <td class="${backgroundClass}" width="10%" align="center"><%=view.getGraphs().size()%></td>
+ <%--<td class="${backgroundClass}" width="15%" align="center"><%=rs.getString("added").substring(0,16)%></td>--%>
+ <%--<td class="${backgroundClass}" width="15%" align="center"><%=rs.getString("modified").substring(0,16)%></td>--%>
+ <td class="${backgroundClass}" width="15%" align="center"><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="showEditView" /><portlet:param name="view_id" value='<%=view.getIdString()%>' /></portlet:actionURL>"><img border=0 src="/monitoring/images/edit-b.png" alt="Edit">Edit</a></td>
</tr>
<%
}
- rs.close();
+// rs.close();
%>
</table>
<div align="right"><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="showAddView" /></portlet:actionURL>"><img border=0 src="/monitoring/images/max-b.png" alt="Create View">Create View</a></div>
-<%
- // close connection
- con.close();
-%>
</td>
<td> </td>
Modified: geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/web.xml?rev=720024&r1=720023&r2=720024&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/web.xml (original)
+++ geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/web.xml Sun Nov 23 10:32:00 2008
@@ -20,6 +20,17 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
<servlet>
+ <servlet-name>popUpGraph</servlet-name>
+ <servlet-class>org.apache.geronimo.monitoring.console.PopUpGraphServlet</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>popUpGraph</servlet-name>
+ <url-pattern>/popUpGraph</url-pattern>
+ </servlet-mapping>
+
+ <servlet>
<servlet-name>monitoring</servlet-name>
<servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
<init-param>
@@ -34,11 +45,16 @@
<url-pattern>/PlutoInvoker/monitoring</url-pattern>
</servlet-mapping>
<!-- reference name exposed as a datasource -->
- <resource-ref>
- <res-ref-name>MonitoringClientDS</res-ref-name>
- <res-type>javax.sql.DataSource</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
+ <!--<resource-ref>-->
+ <!--<res-ref-name>MonitoringClientDS</res-ref-name>-->
+ <!--<res-type>javax.sql.DataSource</res-type>-->
+ <!--<res-auth>Container</res-auth>-->
+ <!--<res-sharing-scope>Shareable</res-sharing-scope>-->
+ <!--</resource-ref>-->
+
+ <persistence-context-ref>
+ <persistence-context-ref-name>jpa/monitoring</persistence-context-ref-name>
+ <persistence-unit-name>jpa/monitoring</persistence-unit-name>
+ </persistence-context-ref>
</web-app>