You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ak...@apache.org on 2007/10/30 23:59:26 UTC

svn commit: r590502 [2/2] - in /geronimo/sandbox/monitoring/mrc-server: ./ mrc-car/ mrc-car/src/ mrc-car/src/main/ mrc-car/src/main/plan/ mrc-ds-car/ mrc-ds-car/src/ mrc-ds-car/src/main/ mrc-ds-car/src/main/plan/ mrc-ear/ mrc-ear/src/main/resources/MET...

Modified: geronimo/sandbox/monitoring/mrc-server/mrc-ejb/src/main/java/org/apache/geronimo/monitor/snapshot/SnapshotThread.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/monitoring/mrc-server/mrc-ejb/src/main/java/org/apache/geronimo/monitor/snapshot/SnapshotThread.java?rev=590502&r1=590501&r2=590502&view=diff
==============================================================================
--- geronimo/sandbox/monitoring/mrc-server/mrc-ejb/src/main/java/org/apache/geronimo/monitor/snapshot/SnapshotThread.java (original)
+++ geronimo/sandbox/monitoring/mrc-server/mrc-ejb/src/main/java/org/apache/geronimo/monitor/snapshot/SnapshotThread.java Tue Oct 30 15:59:24 2007
@@ -43,7 +43,7 @@
     private long SNAPSHOT_DURATION;
     private int SNAPSHOT_RETENTION;
     private MBeanServer mbServer = null;
-    private Set<ObjectName> allMBeans = null;
+    private Set<String> allMBeans = null;
     // list of mbean names that we will be taking snapshots of
     private ArrayList<String> mbeanNames;
     // credentials for getting authenticated to access MRC
@@ -55,7 +55,7 @@
     public SnapshotThread(    long snapshot_length, 
                               int snapshot_retention,
                               MBeanServer mbServer, 
-                              Set<ObjectName> allMBeans, 
+                              Set<String> allMBeans, 
                               final String username, 
                               final String password) {
         SNAPSHOT_DURATION = snapshot_length;
@@ -209,10 +209,10 @@
      * and "Tomcat"/"Jetty" or JVM.
      */
     private ArrayList<String> getDefaultMBeanList() {
-        Set<ObjectName> mbeans = allMBeans;
+        Set<String> mbeans = allMBeans;
         ArrayList<String> retval = new ArrayList<String>();
         for(Iterator it = mbeans.iterator(); it.hasNext(); ) {
-            String name = ((ObjectName)it.next()).getCanonicalName();
+            String name = (String)it.next();
             if(((name.contains("Connector") || name.contains("Container")) && (name.contains("Jetty") || name.contains("Tomcat")))
                                 || name.contains("JVM")) {
                 // this is a connector or JVM, so add to the list

Modified: geronimo/sandbox/monitoring/mrc-server/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/monitoring/mrc-server/pom.xml?rev=590502&r1=590501&r2=590502&view=diff
==============================================================================
--- geronimo/sandbox/monitoring/mrc-server/pom.xml (original)
+++ geronimo/sandbox/monitoring/mrc-server/pom.xml Tue Oct 30 15:59:24 2007
@@ -47,8 +47,10 @@
 
 
     <modules>
+        <module>mrc-ds-car</module>
         <module>mrc-ejb</module>
         <module>mrc-ear</module>
+        <module>mrc-car</module>
     </modules>
 
     <repositories>