This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository nuiton-web. See http://git.nuiton.org/nuiton-web.git commit 04536eee22a85d67c42d3073c551a905768707e2 Author: Eric Chatellier <eric.chatellier@gmail.com> Date: Fri Nov 13 23:32:26 2015 +0100 fixes #3782: Update to jetty 9 --- nuiton-rss/pom.xml | 2 +- nuiton-security/pom.xml | 2 +- nuiton-struts2/pom.xml | 2 +- nuiton-web/pom.xml | 6 +++--- .../java/org/nuiton/web/war/JettyLauncher.java | 25 +++++++++------------- pom.xml | 12 +++++------ 6 files changed, 22 insertions(+), 27 deletions(-) diff --git a/nuiton-rss/pom.xml b/nuiton-rss/pom.xml index bea8964..c4935d2 100644 --- a/nuiton-rss/pom.xml +++ b/nuiton-rss/pom.xml @@ -79,7 +79,7 @@ <dependency> <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> + <artifactId>javax.servlet-api</artifactId> </dependency> <dependency> diff --git a/nuiton-security/pom.xml b/nuiton-security/pom.xml index f8c843f..eae0394 100644 --- a/nuiton-security/pom.xml +++ b/nuiton-security/pom.xml @@ -63,7 +63,7 @@ </dependency> <dependency> <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> + <artifactId>javax.servlet-api</artifactId> </dependency> <dependency> <groupId>org.apache.shiro</groupId> diff --git a/nuiton-struts2/pom.xml b/nuiton-struts2/pom.xml index 365928f..d4bf377 100644 --- a/nuiton-struts2/pom.xml +++ b/nuiton-struts2/pom.xml @@ -78,7 +78,7 @@ <dependency> <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> + <artifactId>javax.servlet-api</artifactId> </dependency> <dependency> diff --git a/nuiton-web/pom.xml b/nuiton-web/pom.xml index 5cac0da..d966730 100644 --- a/nuiton-web/pom.xml +++ b/nuiton-web/pom.xml @@ -3,7 +3,7 @@ #%L Nuiton Web :: Nuiton Web %% - Copyright (C) 2008 - 2014 CodeLutin, Tony Chemit + Copyright (C) 2008 - 2015 CodeLutin, Tony Chemit %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -46,8 +46,8 @@ <!-- Dependencies for WarLaunchers --> <dependency> - <groupId>org.eclipse.jetty.aggregate</groupId> - <artifactId>jetty-webapp</artifactId> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-runner</artifactId> <scope>provided</scope> </dependency> 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 6719938..6b641a1 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 @@ -2,7 +2,7 @@ * #%L * Nuiton Web :: Nuiton Web * %% - * Copyright (C) 2011 CodeLutin + * Copyright (C) 2011, 2015 CodeLutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as @@ -22,15 +22,6 @@ package org.nuiton.web.war; -import org.eclipse.jetty.server.Connector; -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.server.nio.SelectChannelConnector; -import org.eclipse.jetty.webapp.WebAppContext; - -import javax.swing.ImageIcon; import java.awt.AWTException; import java.awt.Desktop; import java.awt.Image; @@ -52,6 +43,14 @@ import java.net.URI; import java.net.URISyntaxException; import java.net.URL; +import javax.swing.ImageIcon; + +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/> @@ -178,11 +177,7 @@ public class JettyLauncher implements ActionListener, MouseListener { File me = new File(((JarURLConnection) classFile.openConnection()).getJarFile().getName()); System.out.println(" - using warfile file : " + me); - jettyServer = new Server(); - - Connector connector = new SelectChannelConnector(); - connector.setPort(port); - jettyServer.setConnectors(new Connector[]{connector}); + jettyServer = new Server(port); WebAppContext webappcontext = new WebAppContext(); webappcontext.setContextPath(contextPath); diff --git a/pom.xml b/pom.xml index 8a4e2c7..3206530 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ #%L Nuiton Web %% -Copyright (C) 2008 - 2014 CodeLutin, Tony Chemit +Copyright (C) 2008 - 2015 CodeLutin, Tony Chemit %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -143,8 +143,8 @@ License along with this program. If not, see <struts2Version>2.3.16</struts2Version> <shiroVersion>1.2.2</shiroVersion> - <servletApiVersion>2.5</servletApiVersion> - <jettyVersion>${jettyPluginVersion}</jettyVersion> + <servletApiVersion>3.0.1</servletApiVersion> + <jettyVersion>9.3.6.v20151106</jettyVersion> <!--Multilanguage maven-site --> <locales>fr</locales> @@ -198,8 +198,8 @@ License along with this program. If not, see <!-- WarLaunchers --> <dependency> - <groupId>org.eclipse.jetty.aggregate</groupId> - <artifactId>jetty-webapp</artifactId> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-runner</artifactId> <version>${jettyVersion}</version> </dependency> @@ -263,7 +263,7 @@ License along with this program. If not, see <!--Provided--> <dependency> <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> + <artifactId>javax.servlet-api</artifactId> <version>${servletApiVersion}</version> <scope>provided</scope> </dependency> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.