1) clustering fixed

2) navigation to room fixed

git-svn-id: http://svn.igniterealtime.org/svn/repos/openfire/branches@10331 b35dd754-fafc-0310-a699-88a17e54d16e

openfire_3_5_2/src/plugins/monitoring/changelog.html

@@ -44,12 +44,18 @@
 Monitoring Plugin Changelog
 </h1>
 
+<p><b>1.0.1</b> -- May 1, 2008</p>
+
+<ul>
+     <li>Dashboard was not working when running in a cluster.</li>
+     <li>Fixed navitation to room from dashboard.</li>
+</ul>
+
 <p><b>1.0.0</b> -- April 24, 2008</p>
 
 <ul>
      <li>Initial release. </li>
 </ul>
 
-
 </body>
 </html>

openfire_3_5_2/src/plugins/monitoring/plugin.xml

@@ -5,8 +5,8 @@
     <name>Monitoring Service</name>
     <description>Monitors conversations and statistics of the server.</description>
     <author>Jive Software</author>
-    <version>1.0.0</version>
-    <date>4/24/2008</date>
+    <version>1.0.1</version>
+    <date>5/1/2008</date>
     <minServerVersion>3.5.1</minServerVersion>
     <databaseKey>monitoring</databaseKey>
     <databaseVersion>0</databaseVersion>

openfire_3_5_2/src/plugins/monitoring/src/java/org/jivesoftware/openfire/reporting/stats/StatsEngine.java

@@ -274,7 +274,17 @@ public class StatsEngine implements Startable {
 
         public void run() {
             if (!ClusterManager.isSeniorClusterMember()) {
-                // Do not create new samples of the statistics since we are not the senior cluster member
+                // Create statistics definitions but do not sample them since we are not the senior cluster member
+                for (Map.Entry<String, Statistic> statisticEntry : statsManager.getAllStatistics()) {
+                    String key = statisticEntry.getKey();
+                    StatDefinition def = createDefintion(key);
+                    // Check to see if this stat belongs to a multi-stat and if that multi-stat group
+                    // has been completly defined
+                    String group = statsManager.getMultistatGroup(key);
+                    if (group != null) {
+                        checkAndCreateGroup(group, def, false);
+                    }
+                }
                 return;
             }
             long newTime = getLastMinute();
@@ -528,4 +538,4 @@ public class StatsEngine implements Startable {
             return min;
         }
     }
-}
\ No newline at end of file
+}

openfire_3_5_2/src/plugins/monitoring/src/web/stats-dashboard.jsp

@@ -764,13 +764,13 @@ function createCookie(name,value,days) {
                                                    // Display "group conversation" with a link to the room occupants
                                                    /*participantNames = LocaleUtils.getLocalizedString(
                                                            "archive.group_conversation", "monitoring", Arrays.asList(
-                                                           "<a href='../../muc-room-occupants.jsp?roomName=" +
-                                                                   URLEncoder.encode(conversation.getRoom().getNode(),
+                                                           "<a href='../../muc-room-occupants.jsp?roomJID=" +
+                                                                   URLEncoder.encode(conversation.getRoom().toBareJID(),
                                                                            "UTF-8") + "'>", "</a>"));*/
 
                                                    participantNames = LocaleUtils.getLocalizedString("dashboard.group_conversation", "monitoring");
                                                    participantNames += "<br/>";
-                                                   participantNames += "(<i>" + LocaleUtils.getLocalizedString("muc.room.summary.room") + ": <a href='../../muc-room-occupants.jsp?roomName=" + URLEncoder.encode(conversation.getRoom().getNode(),"UTF-8") + "'>" + conversation.getRoom().getNode() + "</a></i>)";
+                                                   participantNames += "(<i>" + LocaleUtils.getLocalizedString("muc.room.summary.room") + ": <a href='../../muc-room-occupants.jsp?roomJID=" + URLEncoder.encode(conversation.getRoom().toBareJID(),"UTF-8") + "'>" + conversation.getRoom().getNode() + "</a></i>)";
                                                }
                                                activityTime =
                                                        StatsAction.formatTimeLong(conversation.getLastActivity());
@@ -834,4 +834,4 @@ function createCookie(name,value,days) {
     };
 
 
-%>
\ No newline at end of file
+%>