1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1.2 +++ b/freemarkerdor/nbactions.xml Tue Dec 08 20:57:05 2009 +0100
1.3 @@ -0,0 +1,40 @@
1.4 +<?xml version="1.0" encoding="UTF-8"?>
1.5 +<actions>
1.6 + <action>
1.7 + <actionName>run</actionName>
1.8 + <goals>
1.9 + <goal>process-classes</goal>
1.10 + <goal>org.codehaus.mojo:exec-maven-plugin:1.1.1:exec</goal>
1.11 + </goals>
1.12 + <properties>
1.13 + <exec.classpathScope>runtime</exec.classpathScope>
1.14 + <exec.args>-classpath %classpath cz.xelfi.quoridor.freemarkerdor.UI 9333 http://quoridor.xelfi.cz/api/</exec.args>
1.15 + <exec.executable>java</exec.executable>
1.16 + </properties>
1.17 + </action>
1.18 + <action>
1.19 + <actionName>debug</actionName>
1.20 + <goals>
1.21 + <goal>process-classes</goal>
1.22 + <goal>org.codehaus.mojo:exec-maven-plugin:1.1.1:exec</goal>
1.23 + </goals>
1.24 + <properties>
1.25 + <exec.classpathScope>runtime</exec.classpathScope>
1.26 + <exec.args>-Xdebug -Xrunjdwp:transport=dt_socket,server=n,address=${jpda.address} -classpath %classpath cz.xelfi.quoridor.freemarkerdor.UI 9333 http://quoridor.xelfi.cz/api/</exec.args>
1.27 + <jpda.listen>true</jpda.listen>
1.28 + <exec.executable>java</exec.executable>
1.29 + </properties>
1.30 + </action>
1.31 + <action>
1.32 + <actionName>profile</actionName>
1.33 + <goals>
1.34 + <goal>process-classes</goal>
1.35 + <goal>org.codehaus.mojo:exec-maven-plugin:1.1.1:exec</goal>
1.36 + </goals>
1.37 + <properties>
1.38 + <exec.args>${profiler.args} -classpath %classpath cz.xelfi.quoridor.freemarkerdor.UI 9333 http://quoridor.xelfi.cz/api/</exec.args>
1.39 + <profiler.action>profile</profiler.action>
1.40 + <exec.executable>${profiler.java}</exec.executable>
1.41 + </properties>
1.42 + </action>
1.43 + </actions>
2.1 --- a/freemarkerdor/pom.xml Tue Dec 08 19:57:45 2009 +0100
2.2 +++ b/freemarkerdor/pom.xml Tue Dec 08 20:57:05 2009 +0100
2.3 @@ -10,7 +10,7 @@
2.4 <groupId>org.apidesign</groupId>
2.5 <artifactId>freemarkerdor</artifactId>
2.6 <name>freemarkerdor</name>
2.7 - <version>1.43</version>
2.8 + <version>1.44</version>
2.9 <url>http://maven.apache.org</url>
2.10 <dependencies>
2.11 <dependency>
2.12 @@ -124,3 +124,4 @@
2.13
2.14
2.15
2.16 +
3.1 --- a/freemarkerdor/src/main/java/cz/xelfi/quoridor/freemarkerdor/UI.java Tue Dec 08 19:57:45 2009 +0100
3.2 +++ b/freemarkerdor/src/main/java/cz/xelfi/quoridor/freemarkerdor/UI.java Tue Dec 08 20:57:05 2009 +0100
3.3 @@ -312,7 +312,7 @@
3.4 }
3.5
3.6 private Viewable welcomeImpl(Object... args) {
3.7 - final Document got = base.path("games").accept(MediaType.TEXT_XML).get(Document.class);
3.8 + final Document got = base.path("games").queryParam("loginID", uuid).accept(MediaType.TEXT_XML).get(Document.class);
3.9 return viewable("index.fmt", got, args);
3.10 }
3.11