This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository nuiton-web. See https://gitlab.nuiton.org/nuiton/nuiton-web.git commit 90a643392f75a43928e14b09fec3160ec7b74c0f Author: CHRE <CHATELLIER@codelutin.com> Date: Wed Aug 10 10:02:00 2016 +0200 Fix build --- .../java/org/nuiton/web/war/JettyLauncher.java | 23 ++++++++++------------ 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/nuiton-web/src/main/java/org/nuiton/web/war/JettyLauncher.java b/nuiton-web/src/main/java/org/nuiton/web/war/JettyLauncher.java index cbc171b..12b5fb7 100644 --- a/nuiton-web/src/main/java/org/nuiton/web/war/JettyLauncher.java +++ b/nuiton-web/src/main/java/org/nuiton/web/war/JettyLauncher.java @@ -22,6 +22,15 @@ package org.nuiton.web.war; +import org.apache.jasper.runtime.JspFactoryImpl; +import org.eclipse.jetty.server.Handler; +import org.eclipse.jetty.server.Server; +import org.eclipse.jetty.server.handler.DefaultHandler; +import org.eclipse.jetty.server.handler.HandlerCollection; +import org.eclipse.jetty.webapp.WebAppContext; + +import javax.servlet.jsp.JspFactory; +import javax.swing.ImageIcon; import java.awt.AWTException; import java.awt.Desktop; import java.awt.Image; @@ -43,18 +52,6 @@ import java.net.URI; import java.net.URISyntaxException; import java.net.URL; -import javax.servlet.jsp.JspFactory; -import javax.swing.ImageIcon; - -import org.apache.jasper.runtime.JspFactoryImpl; -import org.apache.tomcat.InstanceManager; -import org.apache.tomcat.SimpleInstanceManager; -import org.eclipse.jetty.server.Handler; -import org.eclipse.jetty.server.Server; -import org.eclipse.jetty.server.handler.DefaultHandler; -import org.eclipse.jetty.server.handler.HandlerCollection; -import org.eclipse.jetty.webapp.WebAppContext; - /** * War main class launcher (jetty based). * <p/> @@ -188,7 +185,7 @@ public class JettyLauncher implements ActionListener, MouseListener { webappcontext.setWar(me.getAbsolutePath()); // fixes java.lang.IllegalStateException: No org.apache.tomcat.InstanceManager set in ServletContext - webappcontext.setAttribute(InstanceManager.class.getName(), new SimpleInstanceManager()); + // jetty 9.3.8 : webappcontext.setAttribute(InstanceManager.class.getName(), new SimpleInstanceManager()); // fixes NPE due to getDefaultFactory() returning null JspFactory.setDefaultFactory(new JspFactoryImpl()); -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.