1.1 --- a/webidor/src/main/java/cz/xelfi/quoridor/webidor/resources/Quoridor.java Tue Sep 14 08:56:13 2010 +0200
1.2 +++ b/webidor/src/main/java/cz/xelfi/quoridor/webidor/resources/Quoridor.java Fri Apr 15 21:18:29 2011 +0200
1.3 @@ -18,13 +18,11 @@
1.4
1.5 package cz.xelfi.quoridor.webidor.resources;
1.6
1.7 -import com.sun.jersey.api.container.httpserver.HttpServerFactory;
1.8 +import com.sun.jersey.api.container.grizzly2.GrizzlyServerFactory;
1.9 import com.sun.jersey.api.core.PackagesResourceConfig;
1.10 import com.sun.jersey.api.core.ResourceConfig;
1.11 import com.sun.jersey.api.json.JSONWithPadding;
1.12 import com.sun.jersey.spi.resource.Singleton;
1.13 -import com.sun.net.httpserver.HttpServer;
1.14 -import cz.xelfi.quoridor.webidor.User;
1.15 import java.io.File;
1.16 import java.io.FileInputStream;
1.17 import java.io.IOException;
1.18 @@ -41,6 +39,7 @@
1.19 import javax.ws.rs.WebApplicationException;
1.20 import javax.ws.rs.core.MediaType;
1.21 import javax.ws.rs.core.Response.Status;
1.22 +import org.glassfish.grizzly.http.server.HttpServer;
1.23
1.24 /**
1.25 *
1.26 @@ -170,7 +169,7 @@
1.27 }
1.28 }
1.29 System.in.read();
1.30 - s.stop(0);
1.31 + s.stop();
1.32 System.exit(0);
1.33 }
1.34
1.35 @@ -189,7 +188,7 @@
1.36 }
1.37
1.38 ResourceConfig rc = new PackagesResourceConfig("cz.xelfi.quoridor.webidor");
1.39 - HttpServer server = HttpServerFactory.create(baseUri, rc);
1.40 + HttpServer server = GrizzlyServerFactory.createHttpServer(baseUri, rc);
1.41 server.start();
1.42 return server;
1.43 }