geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ecr...@apache.org
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 GMT
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<Long, Long> 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<String>) 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();
     }
     %>
     



Mime
View raw message