diff -r d60370059c3c -r 40fc213a7f43 webidor/src/main/java/cz/xelfi/quoridor/webidor/resources/Quoridor.java --- a/webidor/src/main/java/cz/xelfi/quoridor/webidor/resources/Quoridor.java Tue Sep 14 08:56:13 2010 +0200 +++ b/webidor/src/main/java/cz/xelfi/quoridor/webidor/resources/Quoridor.java Fri Apr 15 21:18:29 2011 +0200 @@ -18,13 +18,11 @@ package cz.xelfi.quoridor.webidor.resources; -import com.sun.jersey.api.container.httpserver.HttpServerFactory; +import com.sun.jersey.api.container.grizzly2.GrizzlyServerFactory; import com.sun.jersey.api.core.PackagesResourceConfig; import com.sun.jersey.api.core.ResourceConfig; import com.sun.jersey.api.json.JSONWithPadding; import com.sun.jersey.spi.resource.Singleton; -import com.sun.net.httpserver.HttpServer; -import cz.xelfi.quoridor.webidor.User; import java.io.File; import java.io.FileInputStream; import java.io.IOException; @@ -41,6 +39,7 @@ import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response.Status; +import org.glassfish.grizzly.http.server.HttpServer; /** * @@ -170,7 +169,7 @@ } } System.in.read(); - s.stop(0); + s.stop(); System.exit(0); } @@ -189,7 +188,7 @@ } ResourceConfig rc = new PackagesResourceConfig("cz.xelfi.quoridor.webidor"); - HttpServer server = HttpServerFactory.create(baseUri, rc); + HttpServer server = GrizzlyServerFactory.createHttpServer(baseUri, rc); server.start(); return server; }