Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 86291 invoked from network); 2 Feb 2008 05:23:55 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 2 Feb 2008 05:23:55 -0000 Received: (qmail 12682 invoked by uid 500); 2 Feb 2008 05:23:46 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 12642 invoked by uid 500); 2 Feb 2008 05:23:46 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 12631 invoked by uid 99); 2 Feb 2008 05:23:46 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 01 Feb 2008 21:23:46 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 02 Feb 2008 05:23:26 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 540251A9832; Fri, 1 Feb 2008 21:23:33 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r617750 - in /geronimo/server/trunk/plugins/monitoring: agent-jmx/src/main/java/org/apache/geronimo/monitoring/ mconsole-war/src/main/java/org/apache/geronimo/monitoring/console/ mconsole-war/src/main/webapp/WEB-INF/view/ Date: Sat, 02 Feb 2008 05:23:32 -0000 To: scm@geronimo.apache.org From: ecraig@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080202052333.540251A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ecraig Date: Fri Feb 1 21:23:22 2008 New Revision: 617750 URL: http://svn.apache.org/viewvc?rev=617750&view=rev Log: GERONIMO-3804 monitoring pluging: mconsole-graphs does not detect any servers that was connected through jmx Modified: geronimo/server/trunk/plugins/monitoring/agent-jmx/src/main/java/org/apache/geronimo/monitoring/MasterRemoteControlJMX.java geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/java/org/apache/geronimo/monitoring/console/MRCConnector.java geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringAddGraph.jsp Modified: geronimo/server/trunk/plugins/monitoring/agent-jmx/src/main/java/org/apache/geronimo/monitoring/MasterRemoteControlJMX.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/agent-jmx/src/main/java/org/apache/geronimo/monitoring/MasterRemoteControlJMX.java?rev=617750&r1=617749&r2=617750&view=diff ============================================================================== --- geronimo/server/trunk/plugins/monitoring/agent-jmx/src/main/java/org/apache/geronimo/monitoring/MasterRemoteControlJMX.java (original) +++ geronimo/server/trunk/plugins/monitoring/agent-jmx/src/main/java/org/apache/geronimo/monitoring/MasterRemoteControlJMX.java Fri Feb 1 21:23:22 2008 @@ -466,10 +466,10 @@ */ public TreeMap getSpecificStatistics( String mbeanName, String statsName, - int numberOfSnapshots, - int everyNthSnapshot, - boolean showArchived) { - return snapshotDBHelper.getSpecificStatistics(mbeanName, statsName, numberOfSnapshots, everyNthSnapshot, showArchived); + Integer numberOfSnapshots, + Integer everyNthSnapshot, + Boolean showArchived) { + return snapshotDBHelper.getSpecificStatistics(mbeanName, statsName, numberOfSnapshots.intValue(), everyNthSnapshot.intValue(), showArchived); } /** @@ -507,6 +507,8 @@ infoFactory.addOperation("getSnapshotRetention", new Class[] {}, "Integer"); infoFactory.addOperation("setSnapshotRetention", new Class[] {Integer.class}, "void"); infoFactory.addOperation("isSnapshotRunning", new Class[] {}, "Boolean"); + infoFactory.addOperation("getSpecificStatistics", new Class[] {String.class, String.class, Integer.class, Integer.class, Boolean.class}, "TreeMap"); + infoFactory.addOperation("getTrackedMBeans", new Class[] {}, "Set"); infoFactory.setConstructor(new String[] {}); GBEAN_INFO = infoFactory.getBeanInfo(); } Modified: geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/java/org/apache/geronimo/monitoring/console/MRCConnector.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/java/org/apache/geronimo/monitoring/console/MRCConnector.java?rev=617750&r1=617749&r2=617750&view=diff ============================================================================== --- geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/java/org/apache/geronimo/monitoring/console/MRCConnector.java (original) +++ geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/java/org/apache/geronimo/monitoring/console/MRCConnector.java Fri Feb 1 21:23:22 2008 @@ -541,7 +541,7 @@ } else { return (Set) mbServerConn.invoke(new ObjectName(PATH), - "getTrackedBeans", new Object[] {}, new String[] {}); + "getTrackedMBeans", new Object[] {}, new String[] {}); } } Modified: geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringAddGraph.jsp URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringAddGraph.jsp?rev=617750&r1=617749&r2=617750&view=diff ============================================================================== --- geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringAddGraph.jsp (original) +++ geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringAddGraph.jsp Fri Feb 1 21:23:22 2008 @@ -113,7 +113,7 @@ } catch (Exception e) { - + e.printStackTrace(); } %>