# HG changeset patch
# User Jaroslav Tulach <jaroslav.tulach@apidesign.org>
# Date 1284319269 -7200
# Node ID 925ad06593492396a0c858ccea25b1644f127a66
# Parent  03762a20a8084f8efd34f613d15c682942a9ff51# Parent  935118a5831a0a5502075b483ca7903ae75837cd
Merging changes made in default branch

diff -r 03762a20a808 -r 925ad0659349 freemarkerdor/pom.xml
--- a/freemarkerdor/pom.xml	Sat Sep 11 21:01:31 2010 +0200
+++ b/freemarkerdor/pom.xml	Sun Sep 12 21:21:09 2010 +0200
@@ -31,7 +31,7 @@
     <dependency>
       <groupId>com.sun.jersey</groupId>
       <artifactId>jersey-server</artifactId>
-      <version>1.1.0-ea</version>
+      <version>${jerseyVersion}</version>
     </dependency>
     <dependency>
       <groupId>org.netbeans.modules</groupId>
@@ -55,14 +55,13 @@
     <dependency>
       <groupId>com.sun.jersey</groupId>
       <artifactId>jersey-client</artifactId>
-      <version>1.1.0-ea</version>
+      <version>${jerseyVersion}</version>
     </dependency>
     <dependency>
-      <groupId>com.sun.jersey.test.framework</groupId>
-      <artifactId>jersey-test-framework</artifactId>
-      <version>1.1.0-ea</version>
+      <groupId>com.sun.jersey.jersey-test-framework</groupId>
+      <artifactId>jersey-test-framework-http</artifactId>
+      <version>${jerseyVersion}</version>
       <scope>test</scope>
-      <type>jar</type>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
diff -r 03762a20a808 -r 925ad0659349 pom.xml
--- a/pom.xml	Sat Sep 11 21:01:31 2010 +0200
+++ b/pom.xml	Sun Sep 12 21:21:09 2010 +0200
@@ -10,6 +10,12 @@
           <id>netbeans</id>
           <url>http://bits.netbeans.org/maven2/</url>
       </repository>
+    <repository>
+        <id>maven2-repository.dev.java.net</id>
+        <name>Java.net Repository for Maven</name>
+        <url>http://download.java.net/maven/2/</url>
+        <layout>default</layout>
+    </repository>
   </repositories>
   <!--
   <scm>
@@ -29,6 +35,7 @@
       <url>http://apidesign.org</url>
   </organization>
   <properties>
+      <jerseyVersion>1.3</jerseyVersion>
       <quoridorVersion>1.4</quoridorVersion>
       <webidorVersion>1.17</webidorVersion>
       <visidorVersion>1.0-SNAPSHOT</visidorVersion>
diff -r 03762a20a808 -r 925ad0659349 statistics/pom.xml
--- a/statistics/pom.xml	Sat Sep 11 21:01:31 2010 +0200
+++ b/statistics/pom.xml	Sun Sep 12 21:21:09 2010 +0200
@@ -13,20 +13,6 @@
   <version>${statisticsVersion}</version>
   <name>Game Statistics</name>
   <url>http://maven.apache.org</url>
-  <repositories>
-    <repository>
-        <id>maven2-repository.dev.java.net</id>
-        <name>Java.net Repository for Maven</name>
-        <url>http://download.java.net/maven/2/</url>
-        <layout>default</layout>
-    </repository>
-    <repository>
-        <id>maven-repository.dev.java.net</id>
-        <name>Java.net Maven 1 Repository (legacy)</name>
-        <url>http://download.java.net/maven/1</url>
-        <layout>legacy</layout>
-    </repository>
-  </repositories>
   <dependencies>
 
     <dependency>
@@ -38,17 +24,17 @@
     <dependency>
       <groupId>com.sun.jersey</groupId>
       <artifactId>jersey-core</artifactId>
-      <version>1.1.0-ea</version>
+      <version>${jerseyVersion}</version>
     </dependency>
     <dependency>
       <groupId>com.sun.jersey</groupId>
       <artifactId>jersey-server</artifactId>
-      <version>1.1.0-ea</version>
+      <version>${jerseyVersion}</version>
     </dependency>
     <dependency>
       <groupId>com.sun.jersey</groupId>
       <artifactId>jersey-json</artifactId>
-      <version>1.1.0-ea</version>
+      <version>${jerseyVersion}</version>
       <type>jar</type>
       <exclusions>
         <exclusion>
@@ -62,9 +48,9 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>com.sun.jersey.test.framework</groupId>
-      <artifactId>jersey-test-framework</artifactId>
-      <version>1.1.0-ea</version>
+      <groupId>com.sun.jersey.jersey-test-framework</groupId>
+      <artifactId>jersey-test-framework-http</artifactId>
+      <version>${jerseyVersion}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff -r 03762a20a808 -r 925ad0659349 webidor/pom.xml
--- a/webidor/pom.xml	Sat Sep 11 21:01:31 2010 +0200
+++ b/webidor/pom.xml	Sun Sep 12 21:21:09 2010 +0200
@@ -13,22 +13,7 @@
   <version>${webidorVersion}</version>
   <name>webidor server</name>
   <url>http://maven.apache.org</url>
-  <repositories>
-    <repository>
-        <id>maven2-repository.dev.java.net</id>
-        <name>Java.net Repository for Maven</name>
-        <url>http://download.java.net/maven/2/</url>
-        <layout>default</layout>
-    </repository>
-    <repository>
-        <id>maven-repository.dev.java.net</id>
-        <name>Java.net Maven 1 Repository (legacy)</name>
-        <url>http://download.java.net/maven/1</url>
-        <layout>legacy</layout>
-    </repository>
-  </repositories>
   <dependencies>
-
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
@@ -38,17 +23,17 @@
     <dependency>
       <groupId>com.sun.jersey</groupId>
       <artifactId>jersey-core</artifactId>
-      <version>1.1.0-ea</version>
+      <version>${jerseyVersion}</version>
     </dependency>
     <dependency>
       <groupId>com.sun.jersey</groupId>
       <artifactId>jersey-server</artifactId>
-      <version>1.1.0-ea</version>
+      <version>${jerseyVersion}</version>
     </dependency>
     <dependency>
       <groupId>com.sun.jersey</groupId>
       <artifactId>jersey-json</artifactId>
-      <version>1.1.0-ea</version>
+      <version>${jerseyVersion}</version>
       <type>jar</type>
       <exclusions>
         <exclusion>
@@ -62,9 +47,9 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>com.sun.jersey.test.framework</groupId>
-      <artifactId>jersey-test-framework</artifactId>
-      <version>1.1.0-ea</version>
+      <groupId>com.sun.jersey.jersey-test-framework</groupId>
+      <artifactId>jersey-test-framework-http</artifactId>
+      <version>${jerseyVersion}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff -r 03762a20a808 -r 925ad0659349 webidor/src/test/java/cz/xelfi/quoridor/webidor/AllGamesTest.java
--- a/webidor/src/test/java/cz/xelfi/quoridor/webidor/AllGamesTest.java	Sat Sep 11 21:01:31 2010 +0200
+++ b/webidor/src/test/java/cz/xelfi/quoridor/webidor/AllGamesTest.java	Sun Sep 12 21:21:09 2010 +0200
@@ -26,9 +26,10 @@
 
 package cz.xelfi.quoridor.webidor;
 
+import com.sun.jersey.test.framework.WebAppDescriptor;
+import com.sun.jersey.test.framework.AppDescriptor;
 import com.sun.jersey.api.client.GenericType;
 import java.util.List;
-import com.sun.jersey.api.client.UniformInterfaceException;
 import com.sun.jersey.test.framework.JerseyTest;
 import java.io.File;
 import java.io.FileOutputStream;
@@ -49,21 +50,21 @@
 
     private File dir;
 
-    public AllGamesTest() throws Exception {
-        super("cz.xelfi.quoridor.webidor.resources");
-    }
-
     @Override
-    public void setUp() throws Exception {
-        dir = File.createTempFile("quoridor", ".dir");
-        dir.delete();
-        System.setProperty("quoridor.dir", dir.getPath());
-        dir.mkdirs();
-        File passwd = new File(dir, "passwd");
-        FileOutputStream os = new FileOutputStream(passwd);
-        os.write("Jarda=heslo\nJirka=pesko\nJan=pan\n".getBytes("UTF-8"));
-        os.close();
-        super.setUp();
+    protected AppDescriptor configure() {
+        try {
+            dir = File.createTempFile("quoridor", ".dir");
+            dir.delete();
+            System.setProperty("quoridor.dir", dir.getPath());
+            dir.mkdirs();
+            File passwd = new File(dir, "passwd");
+            FileOutputStream os = new FileOutputStream(passwd);
+            os.write("Jarda=heslo\nJirka=pesko\nJan=pan\n".getBytes("UTF-8"));
+            os.close();
+        } catch (Exception ex) {
+            throw new IllegalStateException(ex);
+        }
+        return new WebAppDescriptor.Builder("cz.xelfi.quoridor.webidor.resources").build();
     }
 
     @Override
@@ -106,31 +107,31 @@
             p.store(new FileOutputStream(fJan), "");
         }
 
-        String logRoot = webResource.path("login").
+        String logRoot = resource().path("login").
             queryParam("name", "Jarda").
             queryParam("password", "heslo").
             accept(MediaType.TEXT_PLAIN).
             put(String.class);
-        String logJirka = webResource.path("login").
+        String logJirka = resource().path("login").
             queryParam("name", "Jirka").
             queryParam("password", "pesko").
             accept(MediaType.TEXT_PLAIN).
             put(String.class);
-        String logJan = webResource.path("login").
+        String logJan = resource().path("login").
             queryParam("name", "Jan").
             queryParam("password", "pan").
             accept(MediaType.TEXT_PLAIN).
             put(String.class);
 
-        GameId s = webResource.path("games").queryParam("white", "Jan")
+        GameId s = resource().path("games").queryParam("white", "Jan")
                 .queryParam("loginID", logJan)
                 .queryParam("black", "Jirka").post(GameId.class);
-            webResource.path("games/" + s.getId())
+            resource().path("games/" + s.getId())
                 .queryParam("loginID", logJan)
                 .queryParam("player", "Jan").queryParam("move", "RESIGN").put(GameId.class);
 
         GenericType<List<GameId>> gType = new GenericType<List<GameId>>() {};
-        List<GameId> all = webResource.path("games/").queryParam("loginID", logRoot).accept(MediaType.TEXT_XML).get(gType);
+        List<GameId> all = resource().path("games/").queryParam("loginID", logRoot).accept(MediaType.TEXT_XML).get(gType);
         boolean found = false;
         for (GameId id : all) {
             if (id.getId().equals(s.getId())) {
@@ -140,7 +141,7 @@
         }
         assertTrue("List of games shall contai all games: " + all, found);
 
-        Game end = webResource.path("games/" + s.getId()).queryParam("loginID", logRoot).accept(MediaType.TEXT_XML).get(Game.class);
+        Game end = resource().path("games/" + s.getId()).queryParam("loginID", logRoot).accept(MediaType.TEXT_XML).get(Game.class);
         assertEquals("One can see status of games with priviledges", GameStatus.blackWon, end.getId().getStatus());
     }
 }
diff -r 03762a20a808 -r 925ad0659349 webidor/src/test/java/cz/xelfi/quoridor/webidor/FinishedGameTest.java
--- a/webidor/src/test/java/cz/xelfi/quoridor/webidor/FinishedGameTest.java	Sat Sep 11 21:01:31 2010 +0200
+++ b/webidor/src/test/java/cz/xelfi/quoridor/webidor/FinishedGameTest.java	Sun Sep 12 21:21:09 2010 +0200
@@ -26,6 +26,8 @@
 
 package cz.xelfi.quoridor.webidor;
 
+import com.sun.jersey.test.framework.WebAppDescriptor;
+import com.sun.jersey.test.framework.AppDescriptor;
 import java.util.Properties;
 import com.sun.jersey.api.client.GenericType;
 import com.sun.jersey.api.client.UniformInterfaceException;
@@ -47,22 +49,22 @@
         System.setProperty("JERSEY_HTTP_PORT", "33435");
     }
     private File dir;
-
-    public FinishedGameTest() throws Exception {
-        super("cz.xelfi.quoridor.webidor.resources");
-    }
-
+    
     @Override
-    public void setUp() throws Exception {
-        dir = File.createTempFile("quoridor", ".dir");
-        dir.delete();
-        System.setProperty("quoridor.dir", dir.getPath());
-        dir.mkdirs();
-        File passwd = new File(dir, "passwd");
-        FileOutputStream os = new FileOutputStream(passwd);
-        os.write("Jarda=heslo\nJirka=pesko\nMaster=mr\n".getBytes("UTF-8"));
-        os.close();
-        super.setUp();
+    protected AppDescriptor configure() {
+        try {
+            dir = File.createTempFile("quoridor", ".dir");
+            dir.delete();
+            System.setProperty("quoridor.dir", dir.getPath());
+            dir.mkdirs();
+            File passwd = new File(dir, "passwd");
+            FileOutputStream os = new FileOutputStream(passwd);
+            os.write("Jarda=heslo\nJirka=pesko\nMaster=mr\n".getBytes("UTF-8"));
+            os.close();
+        } catch (Exception ex) {
+            throw new IllegalStateException(ex);
+        }
+        return new WebAppDescriptor.Builder("cz.xelfi.quoridor.webidor.resources").build();
     }
 
     @Override
@@ -84,101 +86,101 @@
         dir.delete();
     }
     @Test public void testNotLoggedIn() {
-        String status  = webResource.path("login").queryParam("id", "not-logged-in").
+        String status  = resource().path("login").queryParam("id", "not-logged-in").
                 accept(MediaType.TEXT_PLAIN).get(String.class);
         assertEquals("Nobody is logged in", "", status);
     }
 
 
     @Test public void testCreateAGame() throws Exception {
-        String logJarda = webResource.path("login").
+        String logJarda = resource().path("login").
             queryParam("name", "Jarda").
             queryParam("password", "heslo").
             accept(MediaType.TEXT_PLAIN).
             put(String.class);
-        String logJirka = webResource.path("login").
+        String logJirka = resource().path("login").
             queryParam("name", "Jirka").
             queryParam("password", "pesko").
             accept(MediaType.TEXT_PLAIN).
             put(String.class);
         assertNotNull("Logged in ok", logJarda);
-        GameId s = webResource.path("games").queryParam("white", "Jarda")
+        GameId s = resource().path("games").queryParam("white", "Jarda")
                 .queryParam("loginID", logJarda)
                 .queryParam("black", "Jirka").post(GameId.class);
 
         for (int i = 0; i < 3; i++) {
-            webResource.path("games/" + s.getId())
+            resource().path("games/" + s.getId())
                 .queryParam("loginID", logJarda)
                 .queryParam("player", "Jarda").queryParam("move", "N").put(GameId.class);
-            webResource.path("games/" + s.getId())
+            resource().path("games/" + s.getId())
                 .queryParam("loginID", logJirka)
                 .queryParam("player", "Jirka").queryParam("move", "S").put(GameId.class);
         }
 
-        webResource.path("games/" + s.getId())
+        resource().path("games/" + s.getId())
             .queryParam("loginID", logJarda)
             .queryParam("player", "Jarda").queryParam("move", "N").put(GameId.class);
-        webResource.path("games/" + s.getId())
+        resource().path("games/" + s.getId())
             .queryParam("loginID", logJirka)
             .queryParam("player", "Jirka").queryParam("move", "SS").put(GameId.class);
 
         
         GenericType<List<GameId>> gType = new GenericType<List<GameId>>() {};
-        List<GameId> nothing = webResource.path("games/").queryParam("status", "blackWon").accept(MediaType.TEXT_XML).get(gType);
+        List<GameId> nothing = resource().path("games/").queryParam("status", "blackWon").accept(MediaType.TEXT_XML).get(gType);
         assertTrue("Nothing has been finished yet: " + nothing, nothing.isEmpty());
 
         for (int i = 0; i < 3; i++) {
-            webResource.path("games/" + s.getId())
+            resource().path("games/" + s.getId())
                 .queryParam("loginID", logJarda)
                 .queryParam("player", "Jarda").queryParam("move", "N").put(GameId.class);
-            webResource.path("games/" + s.getId())
+            resource().path("games/" + s.getId())
                 .queryParam("loginID", logJirka)
                 .queryParam("player", "Jirka").queryParam("move", "S").put(GameId.class);
         }
 
 
         try {
-            Game end = webResource.path("games/" + s.getId()).accept(MediaType.TEXT_XML).get(Game.class);
+            Game end = resource().path("games/" + s.getId()).accept(MediaType.TEXT_XML).get(Game.class);
             fail("If the game is finished, one cannot get its status without login");
         } catch (UniformInterfaceException ex) {
             // OK
         }
-        Game end = webResource.path("games/" + s.getId()).queryParam("loginID", logJirka).accept(MediaType.TEXT_XML).get(Game.class);
+        Game end = resource().path("games/" + s.getId()).queryParam("loginID", logJirka).accept(MediaType.TEXT_XML).get(Game.class);
         assertEquals("BlackWins", GameStatus.blackWon, end.getId().getStatus());
 
         assertEquals("Jirka wins", "Jirka", end.getCurrentPlayer());
 
-        List<GameId> none = webResource.path("games/").queryParam("status", "blackWon").accept(MediaType.TEXT_XML).get(gType);
+        List<GameId> none = resource().path("games/").queryParam("status", "blackWon").accept(MediaType.TEXT_XML).get(gType);
         assertEquals("No games, for not logged in users: " + none, 0, none.size());
 
-        List<GameId> something = webResource.path("games/").queryParam("loginID", logJirka).queryParam("status", "blackWon").accept(MediaType.TEXT_XML).get(gType);
+        List<GameId> something = resource().path("games/").queryParam("loginID", logJirka).queryParam("status", "blackWon").accept(MediaType.TEXT_XML).get(gType);
         assertEquals("One game finished: " + something, 1, something.size());
         assertEquals("Id is OK", end.getId().getId(), something.get(0).getId());
     }
 
     @Test public void testResignAGame() throws Exception {
-        String logJarda = webResource.path("login").
+        String logJarda = resource().path("login").
             queryParam("name", "Jarda").
             queryParam("password", "heslo").
             accept(MediaType.TEXT_PLAIN).
             put(String.class);
-        GameId s = webResource.path("games").queryParam("white", "Jarda")
+        GameId s = resource().path("games").queryParam("white", "Jarda")
                 .queryParam("loginID", logJarda)
                 .queryParam("black", "Jirka").post(GameId.class);
 
         assertTrue("In progress", s.getStatus().isInProgress());
 
-        webResource.path("games/" + s.getId()).
+        resource().path("games/" + s.getId()).
             queryParam("loginID", logJarda).
             queryParam("player", "Jarda").
             queryParam("move", "RESIGN").put(GameId.class);
         try {
-            Game end = webResource.path("games/" + s.getId()).accept(MediaType.TEXT_XML).get(Game.class);
+            Game end = resource().path("games/" + s.getId()).accept(MediaType.TEXT_XML).get(Game.class);
             fail("Should not be able to get game when finished");
         } catch (UniformInterfaceException ex) {
             // OK
         }
-        Game end = webResource.path("games/" + s.getId()).queryParam("loginID", logJarda).accept(MediaType.TEXT_XML).get(Game.class);
+        Game end = resource().path("games/" + s.getId()).queryParam("loginID", logJarda).accept(MediaType.TEXT_XML).get(Game.class);
         assertEquals("BlackWins", GameStatus.blackWon, end.getId().getStatus());
         assertEquals("Jirka wins", "Jirka", end.getCurrentPlayer());
 
@@ -186,40 +188,40 @@
     }
 
     @Test public void testResignBGame() throws Exception {
-        String logJarda = webResource.path("login").
+        String logJarda = resource().path("login").
             queryParam("name", "Jarda").
             queryParam("password", "heslo").
             accept(MediaType.TEXT_PLAIN).
             put(String.class);
-        String logJirka = webResource.path("login").
+        String logJirka = resource().path("login").
             queryParam("name", "Jirka").
             queryParam("password", "pesko").
             accept(MediaType.TEXT_PLAIN).
             put(String.class);
 
-        GameId s = webResource.path("games").queryParam("white", "Jarda")
+        GameId s = resource().path("games").queryParam("white", "Jarda")
                 .queryParam("loginID", logJarda)
                 .queryParam("black", "Jirka").post(GameId.class);
 
         assertTrue("In progress", s.getStatus().isInProgress());
 
-        webResource.path("games/" + s.getId()).
+        resource().path("games/" + s.getId()).
             queryParam("loginID", logJarda).
             queryParam("player", "Jarda").
             queryParam("move", "N").put(GameId.class);
-        webResource.path("games/" + s.getId()).
+        resource().path("games/" + s.getId()).
             queryParam("loginID", logJirka).
             queryParam("player", "Jirka").
             queryParam("move", "RESIGN").put(GameId.class);
 
 
         try {
-            Game end = webResource.path("games/" + s.getId()).accept(MediaType.TEXT_XML).get(Game.class);
+            Game end = resource().path("games/" + s.getId()).accept(MediaType.TEXT_XML).get(Game.class);
             fail("Should not be able to get game when finished");
         } catch (UniformInterfaceException ex) {
             // OK
         }
-        Game end = webResource.path("games/" + s.getId()).queryParam("loginID", logJarda).accept(MediaType.TEXT_XML).get(Game.class);
+        Game end = resource().path("games/" + s.getId()).queryParam("loginID", logJarda).accept(MediaType.TEXT_XML).get(Game.class);
         assertEquals("WhiteWins", GameStatus.whiteWon, end.getId().getStatus());
         assertEquals("Jarda wins", "Jarda", end.getCurrentPlayer());
 
@@ -227,12 +229,12 @@
     }
 
     @Test public void testResignForeignGame() throws Exception {
-        String logJarda = webResource.path("login").
+        String logJarda = resource().path("login").
             queryParam("name", "Jarda").
             queryParam("password", "heslo").
             accept(MediaType.TEXT_PLAIN).
             put(String.class);
-        GameId s = webResource.path("games").queryParam("white", "Jarda")
+        GameId s = resource().path("games").queryParam("white", "Jarda")
                 .queryParam("loginID", logJarda)
                 .queryParam("black", "Jirka").post(GameId.class);
         File usersDir = new File(dir, "users");
@@ -246,23 +248,23 @@
         }
 
         assertTrue("In progress", s.getStatus().isInProgress());
-        String logMaster = webResource.path("login").
+        String logMaster = resource().path("login").
                 queryParam("name", "Master").
                 queryParam("password", "mr").
                 accept(MediaType.TEXT_PLAIN).
                 put(String.class);
 
-        webResource.path("games/" + s.getId()).
+        resource().path("games/" + s.getId()).
             queryParam("loginID", logMaster).
             queryParam("player", "Jarda").
             queryParam("move", "RESIGN").put(GameId.class);
         try {
-            Game end = webResource.path("games/" + s.getId()).accept(MediaType.TEXT_XML).get(Game.class);
+            Game end = resource().path("games/" + s.getId()).accept(MediaType.TEXT_XML).get(Game.class);
             fail("Should not be able to get game when finished");
         } catch (UniformInterfaceException ex) {
             // OK
         }
-        Game end = webResource.path("games/" + s.getId()).queryParam("loginID", logJarda).accept(MediaType.TEXT_XML).get(Game.class);
+        Game end = resource().path("games/" + s.getId()).queryParam("loginID", logJarda).accept(MediaType.TEXT_XML).get(Game.class);
         assertEquals("BlackWins", GameStatus.blackWon, end.getId().getStatus());
         assertEquals("Jirka wins", "Jirka", end.getCurrentPlayer());
 
diff -r 03762a20a808 -r 925ad0659349 webidor/src/test/java/cz/xelfi/quoridor/webidor/QuoridorTest.java
--- a/webidor/src/test/java/cz/xelfi/quoridor/webidor/QuoridorTest.java	Sat Sep 11 21:01:31 2010 +0200
+++ b/webidor/src/test/java/cz/xelfi/quoridor/webidor/QuoridorTest.java	Sun Sep 12 21:21:09 2010 +0200
@@ -26,12 +26,14 @@
 
 package cz.xelfi.quoridor.webidor;
 
+import com.sun.jersey.test.framework.AppDescriptor;
 import cz.xelfi.quoridor.IllegalPositionException;
 import java.io.StringWriter;
 import com.sun.jersey.api.client.GenericType;
 import com.sun.jersey.api.client.UniformInterfaceException;
 import com.sun.jersey.core.header.MediaTypes;
 import com.sun.jersey.test.framework.JerseyTest;
+import com.sun.jersey.test.framework.WebAppDescriptor;
 import cz.xelfi.quoridor.Board;
 import cz.xelfi.quoridor.Move;
 import cz.xelfi.quoridor.webidor.resources.Games;
@@ -57,22 +59,24 @@
     }
     private File dir;
 
-    public QuoridorTest() throws Exception {
-        super("cz.xelfi.quoridor.webidor.resources");
+    @Override
+    protected AppDescriptor configure() {
+        try {
+            dir = File.createTempFile("quoridor", ".dir");
+            dir.delete();
+            System.setProperty("quoridor.dir", dir.getPath());
+            dir.mkdirs();
+            File passwd = new File(dir, "passwd");
+            FileOutputStream os = new FileOutputStream(passwd);
+            os.write("Jarda=heslo\nJirka=pesko\n".getBytes("UTF-8"));
+            os.close();
+        } catch (Exception ex) {
+            throw new IllegalStateException(ex);
+        }
+        return new WebAppDescriptor.Builder("cz.xelfi.quoridor.webidor.resources").build();
     }
 
-    @Override
-    public void setUp() throws Exception {
-        dir = File.createTempFile("quoridor", ".dir");
-        dir.delete();
-        System.setProperty("quoridor.dir", dir.getPath());
-        dir.mkdirs();
-        File passwd = new File(dir, "passwd");
-        FileOutputStream os = new FileOutputStream(passwd);
-        os.write("Jarda=heslo\nJirka=pesko\n".getBytes("UTF-8"));
-        os.close();
-        super.setUp();
-    }
+
 
     @Override
     public void tearDown() throws Exception {
@@ -94,24 +98,24 @@
     }
 
     @Test public void testApplicationWadl() {
-        String serviceWadl = webResource.path("application.wadl").
+        String serviceWadl = resource().path("application.wadl").
                 accept(MediaTypes.WADL).get(String.class);
         assertTrue(serviceWadl.length() > 0);
     }
 
     @Test public void testCreateAGame() throws Exception {
-        String logJarda = webResource.path("login").
+        String logJarda = resource().path("login").
             queryParam("name", "Jarda").
             queryParam("password", "heslo").
             accept(MediaType.TEXT_PLAIN).
             put(String.class);
-        String logJirka = webResource.path("login").
+        String logJirka = resource().path("login").
             queryParam("name", "Jirka").
             queryParam("password", "pesko").
             accept(MediaType.TEXT_PLAIN).
             put(String.class);
 
-        User uJirka = webResource.path("users").
+        User uJirka = resource().path("users").
             queryParam("loginID", logJirka).
             accept(MediaType.TEXT_XML).
             get(User.class);
@@ -119,7 +123,7 @@
         assertEquals("Jirka", uJirka.getId());
 
 
-    GameId s = webResource.path("games").queryParam("loginID", logJarda).
+    GameId s = resource().path("games").queryParam("loginID", logJarda).
                 queryParam("white", "Jarda")
                 .queryParam("black", "Jirka").post(GameId.class);
 
@@ -130,21 +134,21 @@
         }
         Thread.sleep(100);
 
-        String msg = webResource.path("games").get(String.class);
-        //List<Game> games =  webResource.path("games").get(new GenericType<List<Game>>() {});
+        String msg = resource().path("games").get(String.class);
+        //List<Game> games =  resource().path("games").get(new GenericType<List<Game>>() {});
 
         GenericType<List<GameId>> gType = new GenericType<List<GameId>>() {};
 
-        List<GameId> games = webResource.path("games").accept("application/json").get(gType);
+        List<GameId> games = resource().path("games").accept("application/json").get(gType);
         assertEquals("One game", 1, games.size());
         assertEquals("Same white", "Jarda", games.get(0).getWhite());
         assertEquals("Same black", "Jirka", games.get(0).getBlack());
 
-        GameId s1 = webResource.path("games/" + s.getId()).
+        GameId s1 = resource().path("games/" + s.getId()).
             queryParam("loginID", logJarda).
             queryParam("player", "Jarda").queryParam("move", "N").put(GameId.class);
         try {
-            GameId s2 = webResource.path("games/" + s.getId()).
+            GameId s2 = resource().path("games/" + s.getId()).
                 queryParam("loginID", logJarda).
                 queryParam("player", "Jarda").queryParam("move", "N").put(GameId.class);
             fail("Not Jarda's turn, previous call shall fail");
@@ -152,22 +156,22 @@
             // OK
         }
         try {
-            GameId s2 = webResource.path("games/" + s.getId()).
+            GameId s2 = resource().path("games/" + s.getId()).
                 queryParam("loginID", logJirka).
                 queryParam("player", "Jirka").queryParam("move", "NONSENCE").put(GameId.class);
             fail("Invalid move");
         } catch (UniformInterfaceException ex) {
             // OK
         }
-        GameId s2 = webResource.path("games/" + s.getId()).
+        GameId s2 = resource().path("games/" + s.getId()).
             queryParam("loginID", logJirka).
             queryParam("player", "Jirka").queryParam("move", "S").put(GameId.class);
         assertNotNull("Successful move", s2);
         if (s2.getModified() <= now) {
             fail("The game is newly modified");
         }
-        Game snapshot = webResource.path("games/" + s.getId()).queryParam("move", "0").accept(MediaType.TEXT_XML).get(Game.class);
-        String ssnapshot = webResource.path("games/" + s.getId()).queryParam("move", "0").accept(MediaType.TEXT_XML).get(String.class);
+        Game snapshot = resource().path("games/" + s.getId()).queryParam("move", "0").accept(MediaType.TEXT_XML).get(Game.class);
+        String ssnapshot = resource().path("games/" + s.getId()).queryParam("move", "0").accept(MediaType.TEXT_XML).get(String.class);
         assertEquals("All moves listed:\n" + ssnapshot, 2, snapshot.getMoves().size());
         assertEquals("Current move", 0, snapshot.getCurrentMove());
         assertEquals("Position 0", 0, snapshot.getBoard().getPlayers().get(0).getRow());
@@ -203,13 +207,13 @@
         assertEquals(Move.SOUTH, readGames.get(0).getMoves().get(1).getMove());
 
         class GMap extends GenericType<Map<String,Object>>{}
-        String text = webResource.path("games").path(s.getId()).accept(MediaType.TEXT_PLAIN).get(String.class);
+        String text = resource().path("games").path(s.getId()).accept(MediaType.TEXT_PLAIN).get(String.class);
         text = (boardToPicture(Board.valueOf(text)));
         if (text.indexOf("-----") == -1) {
             fail("Expecting board:\n" + text);
         }
-        Game readGame = webResource.path("games").path(s.getId()).accept(MediaType.TEXT_XML).get(Game.class);
-        String sGame = webResource.path("games").path(s.getId()).accept(MediaType.TEXT_XML).get(String.class);
+        Game readGame = resource().path("games").path(s.getId()).accept(MediaType.TEXT_XML).get(Game.class);
+        String sGame = resource().path("games").path(s.getId()).accept(MediaType.TEXT_XML).get(String.class);
         assertNotNull("Game really returned", readGame);
 //        assertEquals("Same game as in text representation", readGame.getBoard(), Board.valueOf(text));
         assertEquals("Same game as in text representation", readGame.getBoard(), picture2board(text));
diff -r 03762a20a808 -r 925ad0659349 webidor/src/test/java/cz/xelfi/quoridor/webidor/UsersTest.java
--- a/webidor/src/test/java/cz/xelfi/quoridor/webidor/UsersTest.java	Sat Sep 11 21:01:31 2010 +0200
+++ b/webidor/src/test/java/cz/xelfi/quoridor/webidor/UsersTest.java	Sun Sep 12 21:21:09 2010 +0200
@@ -26,6 +26,8 @@
 
 package cz.xelfi.quoridor.webidor;
 
+import com.sun.jersey.test.framework.WebAppDescriptor;
+import com.sun.jersey.test.framework.AppDescriptor;
 import java.io.FileInputStream;
 import com.sun.jersey.api.client.UniformInterfaceException;
 import com.sun.jersey.test.framework.JerseyTest;
@@ -48,30 +50,30 @@
 
     private File dir;
 
-    public UsersTest() throws Exception {
-        super("cz.xelfi.quoridor.webidor.resources");
-    }
-
     @Override
-    public void setUp() throws Exception {
-        dir = File.createTempFile("quoridor", ".dir");
-        dir.delete();
-        System.setProperty("quoridor.dir", dir.getPath());
-        dir.mkdirs();
-        File passwd = new File(dir, "passwd");
-        FileOutputStream os = new FileOutputStream(passwd);
-        os.write("Jarda=heslo\n".getBytes("UTF-8"));
-        os.close();
-        File usersDir = new File(dir, "users");
-        usersDir.mkdirs();
-        File fJirka = new File(usersDir, "Jirka");
-        {
-            Properties p = new Properties();
-            p.setProperty("email", "jir@ka.cz");
-            p.setProperty("passwd", "pesko");
-            p.store(new FileOutputStream(fJirka), "");
+    protected AppDescriptor configure() {
+        try {
+            dir = File.createTempFile("quoridor", ".dir");
+            dir.delete();
+            System.setProperty("quoridor.dir", dir.getPath());
+            dir.mkdirs();
+            File passwd = new File(dir, "passwd");
+            FileOutputStream os = new FileOutputStream(passwd);
+            os.write("Jarda=heslo\n".getBytes("UTF-8"));
+            os.close();
+            File usersDir = new File(dir, "users");
+            usersDir.mkdirs();
+            File fJirka = new File(usersDir, "Jirka");
+            {
+                Properties p = new Properties();
+                p.setProperty("email", "jir@ka.cz");
+                p.setProperty("passwd", "pesko");
+                p.store(new FileOutputStream(fJirka), "");
+            }
+        } catch (Exception ex) {
+            throw new IllegalStateException(ex);
         }
-        super.setUp();
+        return new WebAppDescriptor.Builder("cz.xelfi.quoridor.webidor.resources").build();
     }
 
     @Override
@@ -110,52 +112,52 @@
             p.store(new FileOutputStream(fJirka), "");
         }
 
-        String logJarda = webResource.path("login").
+        String logJarda = resource().path("login").
             queryParam("name", "Jarda").
             queryParam("password", "heslo").
             accept(MediaType.TEXT_PLAIN).
             put(String.class);
-        String logJirka = webResource.path("login").
+        String logJirka = resource().path("login").
             queryParam("name", "Jirka").
             queryParam("password", "pesko").
             accept(MediaType.TEXT_PLAIN).
             put(String.class);
 
-        User uJirka = webResource.path("users/Jirka").accept(MediaType.TEXT_XML).get(User.class);
+        User uJirka = resource().path("users/Jirka").accept(MediaType.TEXT_XML).get(User.class);
         assertEquals("Jirka", uJirka.getId());
         assertNull("Cannot get email without login", uJirka.getProperty("email"));
 
 
-        uJirka = webResource.path("users/Jirka").queryParam("loginID", logJirka).accept(MediaType.TEXT_XML).get(User.class);
+        uJirka = resource().path("users/Jirka").queryParam("loginID", logJirka).accept(MediaType.TEXT_XML).get(User.class);
         assertEquals("Jirka", uJirka.getId());
         assertEquals("Email for ownself is OK", "jir@ka.cz", uJirka.getProperty("email"));
 
-        uJirka = webResource.path("users/Jirka").queryParam("loginID", logJarda).accept(MediaType.TEXT_XML).get(User.class);
+        uJirka = resource().path("users/Jirka").queryParam("loginID", logJarda).accept(MediaType.TEXT_XML).get(User.class);
         assertEquals("Jirka", uJirka.getId());
         assertEquals("Jarda has permission for property email", "jir@ka.cz", uJirka.getProperty("email"));
 
-        String txt = webResource.path("users/Jirka").queryParam("loginID", logJarda).accept(MediaType.TEXT_XML).get(String.class);
+        String txt = resource().path("users/Jirka").queryParam("loginID", logJarda).accept(MediaType.TEXT_XML).get(String.class);
         if (!txt.contains("<user id=\"Jirka\"><property name=\"email\">jir@ka.cz</property></user>")) {
             fail(txt);
         }
 
         try {
-            webResource.path("users/Jarda").queryParam("loginID", logJirka).
+            resource().path("users/Jarda").queryParam("loginID", logJirka).
                     queryParam("name", "email").queryParam("value", "ka@jir.cz").accept(MediaType.TEXT_XML).post();
             fail("You cannot change email without priviledges");
         } catch (UniformInterfaceException e) {
             // OK, not allowed
         }
 
-        webResource.path("users/Jirka").queryParam("loginID", logJirka).
+        resource().path("users/Jirka").queryParam("loginID", logJirka).
                 queryParam("name", "email").queryParam("value", "ka@jir.cz").accept(MediaType.TEXT_XML).post();
 
-        uJirka = webResource.path("users/Jirka").queryParam("loginID", logJirka).accept(MediaType.TEXT_XML).get(User.class);
+        uJirka = resource().path("users/Jirka").queryParam("loginID", logJirka).accept(MediaType.TEXT_XML).get(User.class);
         assertEquals("Jirka", uJirka.getId());
         assertEquals("Email for ownself is OK", "ka@jir.cz", uJirka.getProperty("email"));
 
         try {
-            webResource.path("users/Jirka").queryParam("loginID", logJirka).
+            resource().path("users/Jirka").queryParam("loginID", logJirka).
                     queryParam("name", "permission.email").queryParam("value", "true").accept(MediaType.TEXT_XML).post();
             fail("Shall not be allowed to change own permissions");
         } catch (UniformInterfaceException ex) {
diff -r 03762a20a808 -r 925ad0659349 webidor/src/test/java/cz/xelfi/quoridor/webidor/resources/ChatTest.java
--- a/webidor/src/test/java/cz/xelfi/quoridor/webidor/resources/ChatTest.java	Sat Sep 11 21:01:31 2010 +0200
+++ b/webidor/src/test/java/cz/xelfi/quoridor/webidor/resources/ChatTest.java	Sun Sep 12 21:21:09 2010 +0200
@@ -26,6 +26,8 @@
 
 package cz.xelfi.quoridor.webidor.resources;
 
+import com.sun.jersey.test.framework.WebAppDescriptor;
+import com.sun.jersey.test.framework.AppDescriptor;
 import com.sun.jersey.test.framework.JerseyTest;
 import cz.xelfi.quoridor.Board;
 import cz.xelfi.quoridor.Move;
@@ -55,21 +57,21 @@
     }
     private File dir;
 
-    public ChatTest() throws Exception {
-        super("cz.xelfi.quoridor.webidor.resources");
-    }
-
     @Override
-    public void setUp() throws Exception {
-        dir = File.createTempFile("quoridor", ".dir");
-        dir.delete();
-        System.setProperty("quoridor.dir", dir.getPath());
-        dir.mkdirs();
-        File passwd = new File(dir, "passwd");
-        FileOutputStream os = new FileOutputStream(passwd);
-        os.write("Jarda=heslo\nJirka=pesko\n".getBytes("UTF-8"));
-        os.close();
-        super.setUp();
+    protected AppDescriptor configure() {
+        try {
+            dir = File.createTempFile("quoridor", ".dir");
+            dir.delete();
+            System.setProperty("quoridor.dir", dir.getPath());
+            dir.mkdirs();
+            File passwd = new File(dir, "passwd");
+            FileOutputStream os = new FileOutputStream(passwd);
+            os.write("Jarda=heslo\nJirka=pesko\n".getBytes("UTF-8"));
+            os.close();
+        } catch (Exception ex) {
+            throw new IllegalStateException(ex);
+        }
+        return new WebAppDescriptor.Builder("cz.xelfi.quoridor.webidor.resources").build();
     }
 
     @Override
@@ -92,17 +94,17 @@
     }
 
     @Test public void testCreateAGame() throws Exception {
-        String logJarda = webResource.path("login").
+        String logJarda = resource().path("login").
             queryParam("name", "Jarda").
             queryParam("password", "heslo").
             accept(MediaType.TEXT_PLAIN).
             put(String.class);
-        String logJirka = webResource.path("login").
+        String logJirka = resource().path("login").
             queryParam("name", "Jirka").
             queryParam("password", "pesko").
             accept(MediaType.TEXT_PLAIN).
             put(String.class);
-    GameId s = webResource.path("games").queryParam("loginID", logJarda).
+    GameId s = resource().path("games").queryParam("loginID", logJarda).
                 queryParam("white", "Jarda")
                 .queryParam("black", "Jirka").post(GameId.class);
 
@@ -116,21 +118,21 @@
         ResourceBundle b = ResourceBundle.getBundle("cz/xelfi/quoridor/webidor/TestBundle");
         String comment = b.getString("COMMENT");
 
-        GameId s1 = webResource.path("games/" + s.getId()).
+        GameId s1 = resource().path("games/" + s.getId()).
             queryParam("loginID", logJarda).
             queryParam("player", "Jarda").queryParam("move", "N").put(GameId.class);
 
-        GameId comment1 = webResource.path("games/" + s.getId()).
+        GameId comment1 = resource().path("games/" + s.getId()).
             queryParam("loginID", logJarda).
             queryParam("player", "Jarda").queryParam("comment", "I like this game!").put(GameId.class);
         assertEquals("One comment in the game", 1, comment1.getComments());
 
-        GameId comment2 = webResource.path("games/" + s.getId()).
+        GameId comment2 = resource().path("games/" + s.getId()).
             queryParam("loginID", logJirka).
             queryParam("player", "Jirka").queryParam("comment", comment).put(GameId.class);
         assertEquals("Snd comment in the game", 2, comment2.getComments());
 
-        GameId s2 = webResource.path("games/" + s.getId()).
+        GameId s2 = resource().path("games/" + s.getId()).
             queryParam("loginID", logJirka).
             queryParam("player", "Jirka").queryParam("move", "S").put(GameId.class);
         assertNotNull("Successful move", s2);
@@ -191,8 +193,8 @@
 
         assertEquals("Newly written file remains the same", sss1, readFile(tmp).replaceAll("@.*:", "date"));
 
-        String sGame = webResource.path("games").path(s.getId()).accept(MediaType.TEXT_XML).get(String.class);
-        Game readGame = webResource.path("games").path(s.getId()).accept(MediaType.TEXT_XML).get(Game.class);
+        String sGame = resource().path("games").path(s.getId()).accept(MediaType.TEXT_XML).get(String.class);
+        Game readGame = resource().path("games").path(s.getId()).accept(MediaType.TEXT_XML).get(Game.class);
         assertNotNull("Game really returned", readGame);
 
         assertEquals(Move.NORTH, readGame.getMoves().get(0).getMove());
diff -r 03762a20a808 -r 925ad0659349 wsdor/pom.xml
--- a/wsdor/pom.xml	Sat Sep 11 21:01:31 2010 +0200
+++ b/wsdor/pom.xml	Sun Sep 12 21:21:09 2010 +0200
@@ -64,17 +64,17 @@
     <dependency>
       <groupId>com.sun.jersey</groupId>
       <artifactId>jersey-core</artifactId>
-      <version>1.1.0-ea</version>
+      <version>${jerseyVersion}</version>
     </dependency>
     <dependency>
       <groupId>com.sun.jersey</groupId>
       <artifactId>jersey-server</artifactId>
-      <version>1.1.0-ea</version>
+      <version>${jerseyVersion}</version>
     </dependency>
     <dependency>
       <groupId>com.sun.jersey</groupId>
       <artifactId>jersey-json</artifactId>
-      <version>1.1.0-ea</version>
+      <version>${jerseyVersion}</version>
       <type>jar</type>
       <exclusions>
         <exclusion>