1.1 --- a/freemarkerdor/src/main/java/cz/xelfi/quoridor/freemarkerdor/UI.java	Sun Aug 30 14:37:47 2009 +0200
     1.2 +++ b/freemarkerdor/src/main/java/cz/xelfi/quoridor/freemarkerdor/UI.java	Sun Aug 30 14:44:49 2009 +0200
     1.3 @@ -223,8 +223,8 @@
     1.4      }
     1.5  
     1.6      private Viewable welcomeImpl() throws JSONException {
     1.7 -        final Object got = base.path("games").accept(MediaType.TEXT_XML_TYPE).get(Document.class);
     1.8 -        Map<?,?> obj = (Map<?, ?>)convert(got);
     1.9 +        final Object got = base.path("games").accept(MediaType.APPLICATION_JSON_TYPE).get(JSONArray.class);
    1.10 +        List<?> obj = (List<?>)convert(got);
    1.11          return new Viewable("index.fmt", obj);
    1.12      }
    1.13  

     2.1 --- a/freemarkerdor/src/main/resources/cz/xelfi/quoridor/freemarkerdor/UI/index.fmt	Sun Aug 30 14:37:47 2009 +0200
     2.2 +++ b/freemarkerdor/src/main/resources/cz/xelfi/quoridor/freemarkerdor/UI/index.fmt	Sun Aug 30 14:44:49 2009 +0200
     2.3 @@ -8,7 +8,7 @@
     2.4        <h1>Quoridor Community Server</h1>
     2.5  
     2.6        <ol>
     2.7 -      <#list gameId as item>
     2.8 +      <#list model as item>
     2.9          <li>${item.white} vs. ${item.black} <a href="games/${item.id}/">board</a></li>
    2.10        </#list>
    2.11        </ol>

     3.1 --- a/webidor/src/main/java/cz/xelfi/quoridor/webidor/JAXBContextResolver.java	Sun Aug 30 14:37:47 2009 +0200
     3.2 +++ b/webidor/src/main/java/cz/xelfi/quoridor/webidor/JAXBContextResolver.java	Sun Aug 30 14:44:49 2009 +0200
     3.3 @@ -57,7 +57,7 @@
     3.4      
     3.5      private final Set<Class> types;
     3.6      
     3.7 -    private final Class[] cTypes = {Game.class };
     3.8 +    private final Class[] cTypes = {Game.class, GameId.class, GameResult.class };
     3.9      
    3.10      public JAXBContextResolver() throws Exception {
    3.11          this.types = new HashSet(Arrays.asList(cTypes));