Commit 7c3ef25c authored by Dele Olajide's avatar Dele Olajide Committed by daryl herzmann

Updated jmxweb plugin to be compatible with Openfire 4.x (#583)

parent 687f633c
...@@ -43,6 +43,13 @@ ...@@ -43,6 +43,13 @@
<h1> <h1>
</h1> </h1>
<p><b>0.0.3</b> -- April 29 2016</p>
<ul>
<li>Made compatible with Openfire 4.x</li>
<li>Updated jolokia to 1.3.3</li>
</ul>
<p><b>0.0.2</b> -- December 1st 2015</p> <p><b>0.0.2</b> -- December 1st 2015</p>
<ul> <ul>
......
...@@ -4,9 +4,9 @@ ...@@ -4,9 +4,9 @@
<class>com.ifsoft.jmxweb.plugin.JmxWebPlugin</class> <class>com.ifsoft.jmxweb.plugin.JmxWebPlugin</class>
<name>JmxWeb Plugin</name> <name>JmxWeb Plugin</name>
<description>JmxWeb plugin is web based platform for managing and monitoring openfire via JMX.</description> <description>JmxWeb plugin is web based platform for managing and monitoring openfire via JMX.</description>
<version>0.0.2</version> <version>0.0.3</version>
<licenseType>Apache 2.0</licenseType> <licenseType>Apache 2.0</licenseType>
<date>01/09/2015</date> <date>04/29/2016</date>
<minServerVersion>3.9.9</minServerVersion> <minServerVersion>4.0.1</minServerVersion>
<author>igniterealtime.org</author> <author>igniterealtime.org</author>
</plugin> </plugin>
\ No newline at end of file
...@@ -28,10 +28,13 @@ import org.jivesoftware.util.*; ...@@ -28,10 +28,13 @@ import org.jivesoftware.util.*;
import org.jivesoftware.openfire.http.HttpBindManager; import org.jivesoftware.openfire.http.HttpBindManager;
import java.io.File; import java.io.File;
import java.util.*;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.eclipse.jetty.apache.jsp.JettyJasperInitializer;
import org.eclipse.jetty.plus.annotation.ContainerInitializer;
import org.eclipse.jetty.server.handler.ContextHandlerCollection; import org.eclipse.jetty.server.handler.ContextHandlerCollection;
import org.eclipse.jetty.webapp.WebAppContext; import org.eclipse.jetty.webapp.WebAppContext;
import org.eclipse.jetty.util.security.*; import org.eclipse.jetty.util.security.*;
...@@ -46,6 +49,8 @@ import com.javamonitor.openfire.mbeans.DatabasePool; ...@@ -46,6 +49,8 @@ import com.javamonitor.openfire.mbeans.DatabasePool;
import com.javamonitor.openfire.mbeans.Openfire; import com.javamonitor.openfire.mbeans.Openfire;
import com.javamonitor.openfire.mbeans.PacketCounter; import com.javamonitor.openfire.mbeans.PacketCounter;
import org.apache.tomcat.InstanceManager;
import org.apache.tomcat.SimpleInstanceManager;
public class JmxWebPlugin implements Plugin { public class JmxWebPlugin implements Plugin {
...@@ -115,10 +120,19 @@ public class JmxWebPlugin implements Plugin { ...@@ -115,10 +120,19 @@ public class JmxWebPlugin implements Plugin {
try { try {
Log.info( "["+ NAME + "] starting jolokia"); Log.info( "["+ NAME + "] starting jolokia");
WebAppContext context = new WebAppContext(contexts, pluginDirectory.getPath(), "/jolokia"); WebAppContext context = new WebAppContext(contexts, pluginDirectory.getPath(), "/jolokia");
final List<ContainerInitializer> initializers = new ArrayList<>();
initializers.add(new ContainerInitializer(new JettyJasperInitializer(), null));
context.setAttribute("org.eclipse.jetty.containerInitializers", initializers);
context.setAttribute(InstanceManager.class.getName(), new SimpleInstanceManager());
context.setWelcomeFiles(new String[]{"index.html"}); context.setWelcomeFiles(new String[]{"index.html"});
Log.info( "["+ NAME + "] starting hawtio"); Log.info( "["+ NAME + "] starting hawtio");
WebAppContext context2 = new WebAppContext(contexts, pluginDirectory.getPath() + "/hawtio", "/hawtio"); WebAppContext context2 = new WebAppContext(contexts, pluginDirectory.getPath() + "/hawtio", "/hawtio");
final List<ContainerInitializer> initializers2 = new ArrayList<>();
initializers2.add(new ContainerInitializer(new JettyJasperInitializer(), null));
context2.setAttribute("org.eclipse.jetty.containerInitializers", initializers2);
context2.setAttribute(InstanceManager.class.getName(), new SimpleInstanceManager());
context2.setWelcomeFiles(new String[]{"index.html"}); context2.setWelcomeFiles(new String[]{"index.html"});
if (JiveGlobals.getBooleanProperty("xmpp.jmx.secure", true)) if (JiveGlobals.getBooleanProperty("xmpp.jmx.secure", true))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment