Use the JasperInitializer in place of the JettyJasperInitializer across the...

Use the JasperInitializer in place of the JettyJasperInitializer across the code base (Http-bind and JMX web plugin).

src/java/org/jivesoftware/openfire/http/HttpBindManager.java

@@ -30,9 +30,9 @@ import javax.servlet.Filter;
 import javax.servlet.FilterConfig;
 import javax.servlet.ServletException;
 
+import org.apache.jasper.servlet.JasperInitializer;
 import org.apache.tomcat.InstanceManager;
 import org.apache.tomcat.SimpleInstanceManager;
-import org.eclipse.jetty.apache.jsp.JettyJasperInitializer;
 import org.eclipse.jetty.http.HttpMethod;
 import org.eclipse.jetty.plus.annotation.ContainerInitializer;
 import org.eclipse.jetty.server.Connector;
@@ -58,9 +58,7 @@ import org.eclipse.jetty.webapp.WebAppContext;
 import org.jivesoftware.openfire.Connection;
 import org.jivesoftware.openfire.JMXManager;
 import org.jivesoftware.openfire.XMPPServer;
-import org.jivesoftware.openfire.keystore.CertificateStoreManager;
 import org.jivesoftware.openfire.keystore.IdentityStore;
-import org.jivesoftware.openfire.session.ConnectionSettings;
 import org.jivesoftware.openfire.spi.ConnectionConfiguration;
 import org.jivesoftware.openfire.spi.ConnectionManagerImpl;
 import org.jivesoftware.openfire.spi.ConnectionType;
@@ -541,7 +539,7 @@ public final class HttpBindManager {
         ServletContextHandler context = new ServletContextHandler(contexts, boshPath, ServletContextHandler.SESSIONS);
         // Ensure the JSP engine is initialized correctly (in order to be able to cope with Tomcat/Jasper precompiled JSPs).
         final List<ContainerInitializer> initializers = new ArrayList<>();
-        initializers.add(new ContainerInitializer(new JettyJasperInitializer(), null));
+        initializers.add(new ContainerInitializer(new JasperInitializer(), null));
         context.setAttribute("org.eclipse.jetty.containerInitializers", initializers);
         context.setAttribute(InstanceManager.class.getName(), new SimpleInstanceManager());
         context.addServlet(new ServletHolder(new HttpBindServlet()),"/*");
@@ -572,7 +570,7 @@ public final class HttpBindManager {
         ServletContextHandler context = new ServletContextHandler(contexts, crossPath, ServletContextHandler.SESSIONS);
         // Ensure the JSP engine is initialized correctly (in order to be able to cope with Tomcat/Jasper precompiled JSPs).
         final List<ContainerInitializer> initializers = new ArrayList<>();
-        initializers.add(new ContainerInitializer(new JettyJasperInitializer(), null));
+        initializers.add(new ContainerInitializer(new JasperInitializer(), null));
         context.setAttribute("org.eclipse.jetty.containerInitializers", initializers);
         context.setAttribute(InstanceManager.class.getName(), new SimpleInstanceManager());
         context.addServlet(new ServletHolder(new FlashCrossDomainServlet()),"");

src/plugins/jmxweb/src/java/com/ifsoft/jmxweb/plugin/JmxWebPlugin.java

@@ -33,7 +33,8 @@ import java.util.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import org.eclipse.jetty.apache.jsp.JettyJasperInitializer;
+import org.apache.jasper.servlet.JasperInitializer;
+
 import org.eclipse.jetty.plus.annotation.ContainerInitializer;
 import org.eclipse.jetty.server.handler.ContextHandlerCollection;
 import org.eclipse.jetty.webapp.WebAppContext;
@@ -122,7 +123,7 @@ public class JmxWebPlugin implements Plugin  {
 				WebAppContext context = new WebAppContext(contexts, pluginDirectory.getPath(), "/jolokia");
 
 				final List<ContainerInitializer> initializers = new ArrayList<>();
-				initializers.add(new ContainerInitializer(new JettyJasperInitializer(), null));
+				initializers.add(new ContainerInitializer(new JasperInitializer(), null));
 				context.setAttribute("org.eclipse.jetty.containerInitializers", initializers);
 				context.setAttribute(InstanceManager.class.getName(), new SimpleInstanceManager());
 				context.setWelcomeFiles(new String[]{"index.html"});
@@ -130,7 +131,7 @@ public class JmxWebPlugin implements Plugin  {
 				Log.info( "["+ NAME + "] starting hawtio");
 				WebAppContext context2 = new WebAppContext(contexts, pluginDirectory.getPath() + "/hawtio", "/hawtio");
 				final List<ContainerInitializer> initializers2 = new ArrayList<>();
-				initializers2.add(new ContainerInitializer(new JettyJasperInitializer(), null));
+				initializers2.add(new ContainerInitializer(new JasperInitializer(), null));
 				context2.setAttribute("org.eclipse.jetty.containerInitializers", initializers2);
 				context2.setAttribute(InstanceManager.class.getName(), new SimpleInstanceManager());
 				context2.setWelcomeFiles(new String[]{"index.html"});