Author: echatellier Date: 2012-01-10 14:59:55 +0100 (Tue, 10 Jan 2012) New Revision: 3313 Url: http://chorem.org/repositories/revision/lima/3313 Log: #390 : Update to jetty 8.0.4.v20111024 Modified: trunk/lima-business/pom.xml trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/HttpServerServiceImpl.java trunk/pom.xml Modified: trunk/lima-business/pom.xml =================================================================== --- trunk/lima-business/pom.xml 2012-01-09 10:49:33 UTC (rev 3312) +++ trunk/lima-business/pom.xml 2012-01-10 13:59:55 UTC (rev 3313) @@ -39,15 +39,10 @@ <artifactId>pdfbox</artifactId> </dependency> <dependency> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jetty</artifactId> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-servlet</artifactId> </dependency> <dependency> - <groupId>org.mortbay.jetty</groupId> - <artifactId>servlet-api</artifactId> - </dependency> - - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> </dependency> Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/HttpServerServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/HttpServerServiceImpl.java 2012-01-09 10:49:33 UTC (rev 3312) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/HttpServerServiceImpl.java 2012-01-10 13:59:55 UTC (rev 3313) @@ -25,6 +25,26 @@ package org.chorem.lima.business.ejb; +import static org.nuiton.i18n.I18n._; + +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.net.URL; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; + +import javax.ejb.EJB; +import javax.ejb.Stateless; +import javax.servlet.Servlet; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + import org.apache.commons.io.IOUtils; import org.apache.commons.lang.time.DateUtils; import org.chorem.lima.business.LimaConfig; @@ -34,33 +54,15 @@ import org.chorem.lima.business.ejbinterface.HttpServerServiceLocal; import org.chorem.lima.business.utils.DocumentsEnum; import org.chorem.lima.business.utils.FormatsEnum; +import org.eclipse.jetty.server.Server; +import org.eclipse.jetty.server.handler.ContextHandler.Context; +import org.eclipse.jetty.servlet.ServletContextHandler; +import org.eclipse.jetty.servlet.ServletHolder; import org.hibernate.exception.GenericJDBCException; -import org.mortbay.jetty.Server; -import org.mortbay.jetty.servlet.Context; -import org.mortbay.jetty.servlet.ServletHolder; import org.nuiton.util.FileUtil; import org.nuiton.util.Resource; -import javax.ejb.EJB; -import javax.ejb.Stateless; -import javax.servlet.Servlet; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.net.URL; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.Calendar; -import java.util.Date; -import static org.nuiton.i18n.I18n._; - - @Stateless public class HttpServerServiceImpl extends AbstractLimaService implements HttpServerService, HttpServerServiceLocal { @@ -80,7 +82,6 @@ port = LimaConfig.getInstance().getHttpPort(); } - /** start the server */ @Override public void start() { @@ -91,8 +92,10 @@ server = new Server(port); - Context root = new Context(server, "/", Context.NO_SESSIONS); - root.addServlet(new ServletHolder((Servlet) new MainServlet()), "/"); + ServletContextHandler context = new ServletContextHandler(ServletContextHandler.SESSIONS); + context.setContextPath("/"); + context.addServlet(new ServletHolder(new MainServlet()),"/"); + server.setHandler(context); server.start(); log.info("Web server are running on port: " + port); Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-01-09 10:49:33 UTC (rev 3312) +++ trunk/pom.xml 2012-01-10 13:59:55 UTC (rev 3313) @@ -199,16 +199,10 @@ </dependency> <dependency> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jetty</artifactId> - <version>6.1.25</version> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-servlet</artifactId> + <version>8.0.4.v20111024</version> </dependency> - <dependency> - <groupId>org.mortbay.jetty</groupId> - <artifactId>servlet-api</artifactId> - <version>2.5-6.0.1</version> - <scope>runtime</scope> - </dependency> <!-- pdfbox to create pdf document --> <dependency>