OF-1482 & OF-1483: Fixes for Monitoring plugin (#1019)

* OF-1482: Monitoring plugin: MUC MAM responses should have a 'from'.

* OF-1483: Monitoring plugin: restore admin console functionality.

src/plugins/monitoring/changelog.html

@@ -43,6 +43,12 @@
 <h1>
 Monitoring Plugin Changelog
 </h1>
+<p><b>1.5.9</b> -- Feb 13, 2018</p>
+<ul>
+    <li>[<a href='https://issues.igniterealtime.org/browse/OF-1482'>OF-1482</a>] - MAM query response for MUC should have a 'from'.</li>
+    <li>[<a href='https://issues.igniterealtime.org/browse/OF-1483'>OF-1483</a>] - Restoring Admin console functionality.</li>
+</ul>
+
 <p><b>1.5.8</b> -- Nov 13, 2017</p>
 <ul>
     <li>[<a href='https://issues.igniterealtime.org/browse/OF-1030'>OF-1030</a>] - Monitoring Service plugin Search Archive Date Range field validation</li>

src/plugins/monitoring/plugin.xml

@@ -5,8 +5,8 @@
     <name>Monitoring Service</name>
     <description>Monitors conversations and statistics of the server.</description>
     <author>IgniteRealtime // Jive Software</author>
-    <version>1.5.8</version>
-    <date>11/13/2017</date>
+    <version>1.5.9</version>
+    <date>2/13/2018</date>
     <minServerVersion>4.1.0</minServerVersion>
     <databaseKey>monitoring</databaseKey>
     <databaseVersion>4</databaseVersion>

src/plugins/monitoring/pom.xml

@@ -8,7 +8,7 @@
     </parent>
     <groupId>org.igniterealtime.openfire.plugins</groupId>
     <artifactId>monitoring</artifactId>
-    <version>1.5.7</version>
+    <version>1.5.9</version>
     <name>Monitoring Plugin</name>
     <description>Monitors conversations and statistics of the server.</description>
 
@@ -18,6 +18,11 @@
             <plugin>
                 <artifactId>maven-assembly-plugin</artifactId>
             </plugin>
+            <!-- Compiles the Openfire Admin Console JSP pages. -->
+            <plugin>
+                <groupId>org.eclipse.jetty</groupId>
+                <artifactId>jetty-jspc-maven-plugin</artifactId>
+            </plugin>
         </plugins>
     </build>
 
@@ -25,7 +30,27 @@
         <dependency>
             <groupId>com.sun.jersey</groupId>
             <artifactId>jersey-servlet</artifactId>
-            <version>1.18.1</version>
+            <version>1.19.4</version>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.jersey</groupId>
+            <artifactId>jersey-bundle</artifactId>
+            <version>1.19.4</version>
+        </dependency>
+        <dependency>
+            <groupId>org.codehaus.jackson</groupId>
+            <artifactId>jackson-xc</artifactId>
+            <version>1.9.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.codehaus.jackson</groupId>
+            <artifactId>jackson-jaxrs</artifactId>
+            <version>1.9.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.codehaus.jettison</groupId>
+            <artifactId>jettison</artifactId>
+            <version>1.1</version>
         </dependency>
         <dependency>
             <groupId>org.jrobin</groupId>

src/plugins/monitoring/src/java/com/reucon/openfire/plugin/archive/xep0313/IQQueryHandler.java

@@ -264,6 +264,10 @@ abstract class IQQueryHandler extends AbstractIQHandler implements
 
         Message messagePacket = new Message();
         messagePacket.setTo(session.getAddress());
+        if ( XMPPServer.getInstance().getMultiUserChatManager().getMultiUserChatService( queryRequest.getArchive() ) != null )
+        {
+            messagePacket.setFrom( queryRequest.getArchive().asBareJID() );
+        }
         Forwarded fwd;
 
         Document stanza;

src/plugins/monitoring/src/java/com/reucon/openfire/plugin/archive/xep0313/IQQueryHandler0.java

 package com.reucon.openfire.plugin.archive.xep0313;
 
 import org.dom4j.*;
+import org.jivesoftware.openfire.XMPPServer;
 import org.jivesoftware.openfire.handler.IQHandler;
 import org.jivesoftware.openfire.session.LocalClientSession;
 import org.jivesoftware.openfire.session.Session;
@@ -51,6 +52,10 @@ class IQQueryHandler0 extends IQQueryHandler {
 
         Message finalMessage = new Message();
         finalMessage.setTo(session.getAddress());
+        if ( XMPPServer.getInstance().getMultiUserChatManager().getMultiUserChatService( queryRequest.getArchive() ) != null )
+        {
+            finalMessage.setFrom( queryRequest.getArchive().asBareJID() );
+        }
         Element fin = finalMessage.addChildElement("fin", NAMESPACE);
         completeFinElement(queryRequest, fin);
 

src/plugins/monitoring/src/web/WEB-INF/web.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
+         version="3.1">
+</web-app>