1.1 --- a/freemarkerdor/src/test/java/cz/xelfi/quoridor/freemarkerdor/ChangeEmailTest.java Fri Apr 15 21:05:46 2011 +0200
1.2 +++ b/freemarkerdor/src/test/java/cz/xelfi/quoridor/freemarkerdor/ChangeEmailTest.java Fri Apr 15 21:18:29 2011 +0200
1.3 @@ -17,10 +17,10 @@
1.4 */
1.5 package cz.xelfi.quoridor.freemarkerdor;
1.6
1.7 +import org.glassfish.grizzly.http.server.HttpServer;
1.8 import com.sun.jersey.api.client.Client;
1.9 import com.sun.jersey.api.client.ClientResponse;
1.10 import com.sun.jersey.api.client.WebResource;
1.11 -import com.sun.net.httpserver.HttpServer;
1.12 import cz.xelfi.quoridor.webidor.resources.Quoridor;
1.13 import java.io.File;
1.14 import java.io.FileOutputStream;
1.15 @@ -91,7 +91,7 @@
1.16 stop.call();
1.17 }
1.18 if (stopAPI != null) {
1.19 - stopAPI.stop(0);
1.20 + stopAPI.stop();
1.21 }
1.22 MockServices.setServices();
1.23 }
2.1 --- a/freemarkerdor/src/test/java/cz/xelfi/quoridor/freemarkerdor/UITest.java Fri Apr 15 21:05:46 2011 +0200
2.2 +++ b/freemarkerdor/src/test/java/cz/xelfi/quoridor/freemarkerdor/UITest.java Fri Apr 15 21:18:29 2011 +0200
2.3 @@ -17,6 +17,7 @@
2.4 */
2.5 package cz.xelfi.quoridor.freemarkerdor;
2.6
2.7 +import org.glassfish.grizzly.http.server.HttpServer;
2.8 import java.util.Collection;
2.9 import java.util.Arrays;
2.10 import com.sun.jersey.api.client.Client;
2.11 @@ -24,7 +25,6 @@
2.12 import com.sun.jersey.api.client.WebResource;
2.13 import com.sun.jersey.core.header.MediaTypes;
2.14 import com.sun.jersey.core.util.MultivaluedMapImpl;
2.15 -import com.sun.net.httpserver.HttpServer;
2.16 import cz.xelfi.quoridor.webidor.resources.Quoridor;
2.17 import java.io.File;
2.18 import java.io.FileOutputStream;
2.19 @@ -100,7 +100,7 @@
2.20 stop.call();
2.21 }
2.22 if (stopAPI != null) {
2.23 - stopAPI.stop(0);
2.24 + stopAPI.stop();
2.25 }
2.26 }
2.27
3.1 --- a/webidor/pom.xml Fri Apr 15 21:05:46 2011 +0200
3.2 +++ b/webidor/pom.xml Fri Apr 15 21:18:29 2011 +0200
3.3 @@ -27,7 +27,7 @@
3.4 </dependency>
3.5 <dependency>
3.6 <groupId>com.sun.jersey</groupId>
3.7 - <artifactId>jersey-server</artifactId>
3.8 + <artifactId>jersey-grizzly2</artifactId>
3.9 <version>${jerseyVersion}</version>
3.10 </dependency>
3.11 <dependency>
4.1 --- a/webidor/src/main/java/cz/xelfi/quoridor/webidor/resources/Quoridor.java Fri Apr 15 21:05:46 2011 +0200
4.2 +++ b/webidor/src/main/java/cz/xelfi/quoridor/webidor/resources/Quoridor.java Fri Apr 15 21:18:29 2011 +0200
4.3 @@ -18,13 +18,11 @@
4.4
4.5 package cz.xelfi.quoridor.webidor.resources;
4.6
4.7 -import com.sun.jersey.api.container.httpserver.HttpServerFactory;
4.8 +import com.sun.jersey.api.container.grizzly2.GrizzlyServerFactory;
4.9 import com.sun.jersey.api.core.PackagesResourceConfig;
4.10 import com.sun.jersey.api.core.ResourceConfig;
4.11 import com.sun.jersey.api.json.JSONWithPadding;
4.12 import com.sun.jersey.spi.resource.Singleton;
4.13 -import com.sun.net.httpserver.HttpServer;
4.14 -import cz.xelfi.quoridor.webidor.User;
4.15 import java.io.File;
4.16 import java.io.FileInputStream;
4.17 import java.io.IOException;
4.18 @@ -41,6 +39,7 @@
4.19 import javax.ws.rs.WebApplicationException;
4.20 import javax.ws.rs.core.MediaType;
4.21 import javax.ws.rs.core.Response.Status;
4.22 +import org.glassfish.grizzly.http.server.HttpServer;
4.23
4.24 /**
4.25 *
4.26 @@ -170,7 +169,7 @@
4.27 }
4.28 }
4.29 System.in.read();
4.30 - s.stop(0);
4.31 + s.stop();
4.32 System.exit(0);
4.33 }
4.34
4.35 @@ -189,7 +188,7 @@
4.36 }
4.37
4.38 ResourceConfig rc = new PackagesResourceConfig("cz.xelfi.quoridor.webidor");
4.39 - HttpServer server = HttpServerFactory.create(baseUri, rc);
4.40 + HttpServer server = GrizzlyServerFactory.createHttpServer(baseUri, rc);
4.41 server.start();
4.42 return server;
4.43 }