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 [5/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/monitoringPopUpGraph.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/monitoringPopUpGraph.jsp?rev=720024&r1=720023&r2=720024&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/monitoringPopUpGraph.jsp (original)
+++ geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/monitoringPopUpGraph.jsp Sun Nov 23 10:32:00 2008
@@ -16,24 +16,16 @@
--%>
<%@ 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="org.apache.geronimo.monitoring.console.util.DBManager" %>
-<%@page import="org.apache.geronimo.monitoring.console.GraphsBuilder"%>
-<%@page import="org.apache.geronimo.monitoring.console.StatsGraph"%>
<%@page import="org.apache.geronimo.monitoring.console.Constants"%>
+<%@page import="org.apache.geronimo.monitoring.console.StatsGraph"%>
<portlet:defineObjects/>
<html>
<head>
<%
-Connection con = (new DBManager()).getConnection();
-GraphsBuilder graphBuilder = new GraphsBuilder();
-String graph_id = request.getParameter("graph_id");
-StatsGraph graph = graphBuilder.buildOneDB(Integer.parseInt(graph_id));
+StatsGraph graph = (StatsGraph) request.getAttribute("statsGraph");
String graphString = graph.getJS();
String divImplString = graph.getDivImplement();
String divNameString = graph.getName();
-String xAxis = graph.getXAxis();
-String yAxis = graph.getYAxis();
%>
<script type='text/javascript' src='<%=Constants.DOJO_JS%>' djConfig='isDebug: false, parseOnLoad: true'></script>
Modified: geronimo/server/trunk/plugins/monitoring/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/pom.xml?rev=720024&r1=720023&r2=720024&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/pom.xml (original)
+++ geronimo/server/trunk/plugins/monitoring/pom.xml Sun Nov 23 10:32:00 2008
@@ -31,14 +31,6 @@
<description> Geronimo Monitoring and Management </description>
- <properties>
- <!--
- FIXME: WTF are these for? Drop them...
- -->
- <monitoringConsoleVersion>2.2-SNAPSHOT</monitoringConsoleVersion>
- <consoleVersion>2.2-SNAPSHOT</consoleVersion>
- </properties>
-
<modules>
<module>agent</module>
<module>agent-ds</module>
@@ -48,9 +40,10 @@
<module>agent-car-jmx</module>
<module>agent-sql</module>
<module>mconsole-ds</module>
+ <module>mconsole-war</module>
<module>mconsole-jetty</module>
+ <module>mconsole-jetty-server</module>
<module>mconsole-tomcat</module>
- <module>mconsole-war</module>
</modules>
<build>
Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=720024&r1=720023&r2=720024&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Sun Nov 23 10:32:00 2008
@@ -93,6 +93,8 @@
<txmanagerVersion>2.1.1</txmanagerVersion>
<!--<txmanagerVersion>2.2-SNAPSHOT</txmanagerVersion>-->
+ <monitoringConsoleVersion>2.2-SNAPSHOT</monitoringConsoleVersion>
+
<!-- Deployers -->
<gbeanDeployerBootstrap>org.apache.geronimo.framework/geronimo-gbean-deployer-bootstrap/${version}/car</gbeanDeployerBootstrap>
<gbeanDeployer>org.apache.geronimo.framework/geronimo-gbean-deployer/${version}/car</gbeanDeployer>