# HG changeset patch # User Jaroslav Tulach # Date 1251636289 -7200 # Node ID 75074e02f345ac585c671a3ba833e8510d107aa3 # Parent 69e897fe8140ef8a5d864f7831d18dac8fd5eeda At least we are able to generate the index page diff -r 69e897fe8140 -r 75074e02f345 freemarkerdor/src/main/java/cz/xelfi/quoridor/freemarkerdor/UI.java --- a/freemarkerdor/src/main/java/cz/xelfi/quoridor/freemarkerdor/UI.java Sun Aug 30 14:37:47 2009 +0200 +++ b/freemarkerdor/src/main/java/cz/xelfi/quoridor/freemarkerdor/UI.java Sun Aug 30 14:44:49 2009 +0200 @@ -223,8 +223,8 @@ } private Viewable welcomeImpl() throws JSONException { - final Object got = base.path("games").accept(MediaType.TEXT_XML_TYPE).get(Document.class); - Map obj = (Map)convert(got); + final Object got = base.path("games").accept(MediaType.APPLICATION_JSON_TYPE).get(JSONArray.class); + List obj = (List)convert(got); return new Viewable("index.fmt", obj); } diff -r 69e897fe8140 -r 75074e02f345 freemarkerdor/src/main/resources/cz/xelfi/quoridor/freemarkerdor/UI/index.fmt --- a/freemarkerdor/src/main/resources/cz/xelfi/quoridor/freemarkerdor/UI/index.fmt Sun Aug 30 14:37:47 2009 +0200 +++ b/freemarkerdor/src/main/resources/cz/xelfi/quoridor/freemarkerdor/UI/index.fmt Sun Aug 30 14:44:49 2009 +0200 @@ -8,7 +8,7 @@

Quoridor Community Server

    - <#list gameId as item> + <#list model as item>
  1. ${item.white} vs. ${item.black} board
diff -r 69e897fe8140 -r 75074e02f345 webidor/src/main/java/cz/xelfi/quoridor/webidor/JAXBContextResolver.java --- a/webidor/src/main/java/cz/xelfi/quoridor/webidor/JAXBContextResolver.java Sun Aug 30 14:37:47 2009 +0200 +++ b/webidor/src/main/java/cz/xelfi/quoridor/webidor/JAXBContextResolver.java Sun Aug 30 14:44:49 2009 +0200 @@ -57,7 +57,7 @@ private final Set types; - private final Class[] cTypes = {Game.class }; + private final Class[] cTypes = {Game.class, GameId.class, GameResult.class }; public JAXBContextResolver() throws Exception { this.types = new HashSet(Arrays.asList(cTypes));