# HG changeset patch
# User Jaroslav Tulach <jaroslav.tulach@apidesign.org>
# Date 1302895109 -7200
# Node ID 40fc213a7f43802e507e80be3cbbedb6d29cd426
# Parent  fdf4436aad299d13b43455b04eb3156bf1c50aa4
Using Grizzly

diff -r fdf4436aad29 -r 40fc213a7f43 freemarkerdor/src/test/java/cz/xelfi/quoridor/freemarkerdor/ChangeEmailTest.java
--- a/freemarkerdor/src/test/java/cz/xelfi/quoridor/freemarkerdor/ChangeEmailTest.java	Fri Apr 15 21:05:46 2011 +0200
+++ b/freemarkerdor/src/test/java/cz/xelfi/quoridor/freemarkerdor/ChangeEmailTest.java	Fri Apr 15 21:18:29 2011 +0200
@@ -17,10 +17,10 @@
  */
 package cz.xelfi.quoridor.freemarkerdor;
 
+import org.glassfish.grizzly.http.server.HttpServer;
 import com.sun.jersey.api.client.Client;
 import com.sun.jersey.api.client.ClientResponse;
 import com.sun.jersey.api.client.WebResource;
-import com.sun.net.httpserver.HttpServer;
 import cz.xelfi.quoridor.webidor.resources.Quoridor;
 import java.io.File;
 import java.io.FileOutputStream;
@@ -91,7 +91,7 @@
             stop.call();
         }
         if (stopAPI != null) {
-            stopAPI.stop(0);
+            stopAPI.stop();
         }
         MockServices.setServices();
     }
diff -r fdf4436aad29 -r 40fc213a7f43 freemarkerdor/src/test/java/cz/xelfi/quoridor/freemarkerdor/UITest.java
--- a/freemarkerdor/src/test/java/cz/xelfi/quoridor/freemarkerdor/UITest.java	Fri Apr 15 21:05:46 2011 +0200
+++ b/freemarkerdor/src/test/java/cz/xelfi/quoridor/freemarkerdor/UITest.java	Fri Apr 15 21:18:29 2011 +0200
@@ -17,6 +17,7 @@
  */
 package cz.xelfi.quoridor.freemarkerdor;
 
+import org.glassfish.grizzly.http.server.HttpServer;
 import java.util.Collection;
 import java.util.Arrays;
 import com.sun.jersey.api.client.Client;
@@ -24,7 +25,6 @@
 import com.sun.jersey.api.client.WebResource;
 import com.sun.jersey.core.header.MediaTypes;
 import com.sun.jersey.core.util.MultivaluedMapImpl;
-import com.sun.net.httpserver.HttpServer;
 import cz.xelfi.quoridor.webidor.resources.Quoridor;
 import java.io.File;
 import java.io.FileOutputStream;
@@ -100,7 +100,7 @@
             stop.call();
         }
         if (stopAPI != null) {
-            stopAPI.stop(0);
+            stopAPI.stop();
         }
     }
 
diff -r fdf4436aad29 -r 40fc213a7f43 webidor/pom.xml
--- a/webidor/pom.xml	Fri Apr 15 21:05:46 2011 +0200
+++ b/webidor/pom.xml	Fri Apr 15 21:18:29 2011 +0200
@@ -27,7 +27,7 @@
     </dependency>
     <dependency>
       <groupId>com.sun.jersey</groupId>
-      <artifactId>jersey-server</artifactId>
+      <artifactId>jersey-grizzly2</artifactId>
       <version>${jerseyVersion}</version>
     </dependency>
     <dependency>
diff -r fdf4436aad29 -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	Fri Apr 15 21:05:46 2011 +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;
     }