# HG changeset patch
# User Jaroslav Tulach <jaroslav.tulach@apidesign.org>
# Date 1310910050 -7200
# Node ID 90be53f96e0c20cccc05866ecf8ce4e5ae07f59c
# Parent  0ea04469967d47224f6215ea96f434c86ae09ebd
webidor rewritten to run as glassfish application

diff -r 0ea04469967d -r 90be53f96e0c webidor/nb-configuration.xml
--- a/webidor/nb-configuration.xml	Sun May 01 21:10:07 2011 +0200
+++ b/webidor/nb-configuration.xml	Sun Jul 17 15:40:50 2011 +0200
@@ -26,18 +26,6 @@
 therefore it is assumed to be part of version control checkout.
 Without this configuration present, some functionality in the IDE may be limited or fail altogether.
 -->
-    <spring-data xmlns="http://www.netbeans.org/ns/spring-data/1">
-        <config-files>
-            <config-file>src/main/webapp/WEB-INF/applicationContext.xml</config-file>
-            <config-file>src/main/webapp/WEB-INF/dispatcher-servlet.xml</config-file>
-        </config-files>
-        <config-file-groups>
-            <config-file-group name="Default Group">
-                <config-file>src/main/webapp/WEB-INF/applicationContext.xml</config-file>
-                <config-file>src/main/webapp/WEB-INF/dispatcher-servlet.xml</config-file>
-            </config-file-group>
-        </config-file-groups>
-    </spring-data>
     <properties xmlns="http://www.netbeans.org/ns/maven-properties-data/1">
         <!--
 Properties that influence various parts of the IDE, especially code formatting and the like. 
@@ -45,6 +33,6 @@
 That way multiple projects can share the same settings (useful for formatting rules for example).
 Any value defined here will override the pom.xml file value but is only applicable to the current project.
 -->
-        <netbeans.compile.on.save>none</netbeans.compile.on.save>
+        <org-netbeans-modules-maven-jaxws.rest_2e_config_2e_type>user</org-netbeans-modules-maven-jaxws.rest_2e_config_2e_type>
     </properties>
 </project-shared-configuration>
diff -r 0ea04469967d -r 90be53f96e0c webidor/nbactions.xml
--- a/webidor/nbactions.xml	Sun May 01 21:10:07 2011 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Quoridor server and related libraries
-    Copyright (C) 2009-2010 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program. Look for COPYING file in the top folder.
-    If not, see http://www.gnu.org/licenses/.
-
--->
-
-<actions>
-        <action>
-            <actionName>run</actionName>
-            <goals>
-                <goal>process-classes</goal>
-                <goal>org.codehaus.mojo:exec-maven-plugin:1.1.1:exec</goal>
-            </goals>
-            <properties>
-                <exec.classpathScope>runtime</exec.classpathScope>
-                <exec.args>-classpath %classpath cz.xelfi.quoridor.webidor.resources.Quoridor</exec.args>
-                <exec.executable>java</exec.executable>
-            </properties>
-        </action>
-        <action>
-            <actionName>debug</actionName>
-            <goals>
-                <goal>process-classes</goal>
-                <goal>org.codehaus.mojo:exec-maven-plugin:1.1.1:exec</goal>
-            </goals>
-            <properties>
-                <exec.classpathScope>runtime</exec.classpathScope>
-                <exec.args>-Xdebug -Xrunjdwp:transport=dt_socket,server=n,address=${jpda.address} -classpath %classpath cz.xelfi.quoridor.webidor.resources.Quoridor</exec.args>
-                <jpda.listen>true</jpda.listen>
-                <exec.executable>java</exec.executable>
-            </properties>
-        </action>
-        <action>
-            <actionName>profile</actionName>
-            <goals>
-                <goal>process-classes</goal>
-                <goal>org.codehaus.mojo:exec-maven-plugin:1.1.1:exec</goal>
-            </goals>
-            <properties>
-                <exec.args>${profiler.args} -classpath %classpath cz.xelfi.quoridor.webidor.resources.Quoridor</exec.args>
-                <profiler.action>profile</profiler.action>
-                <exec.executable>${profiler.java}</exec.executable>
-            </properties>
-        </action>
-    </actions>
diff -r 0ea04469967d -r 90be53f96e0c webidor/pom.xml
--- a/webidor/pom.xml	Sun May 01 21:10:07 2011 +0200
+++ b/webidor/pom.xml	Sun Jul 17 15:40:50 2011 +0200
@@ -8,116 +8,128 @@
         <groupId>cz.xelfi.quoridor</groupId>
         <version>1.0</version>
   </parent>
+  <groupId>cz.xelfi.quoridor</groupId>
   <artifactId>webidor</artifactId>
-  <packaging>jar</packaging>
+  <packaging>war</packaging>
   <version>${webidorVersion}</version>
   <name>webidor server</name>
   <url>http://maven.apache.org</url>
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.5</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.sun.jersey</groupId>
-      <artifactId>jersey-core</artifactId>
-      <version>${jerseyVersion}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.sun.jersey</groupId>
-      <artifactId>jersey-grizzly2</artifactId>
-      <version>${jerseyVersion}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.sun.jersey</groupId>
-      <artifactId>jersey-json</artifactId>
-      <version>${jerseyVersion}</version>
-      <type>jar</type>
-      <exclusions>
-        <exclusion>
-          <artifactId>jaxb-api</artifactId>
-          <groupId>javax.xml.bind</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>stax-api</artifactId>
-          <groupId>stax</groupId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>com.sun.jersey.jersey-test-framework</groupId>
-      <artifactId>jersey-test-framework-http</artifactId>
-      <version>${jerseyVersion}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>cz.xelfi.quoridor</groupId>
-      <artifactId>quoridor</artifactId>
-      <version>${quoridorVersion}</version>
-      <type>jar</type>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>wsdor</artifactId>
-      <version>${wsdorVersion}</version>
-    </dependency>
-  </dependencies>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.0.2</version>
-        <configuration>
-          <source>1.5</source>
-          <target>1.5</target>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>exec-maven-plugin</artifactId>
-        <configuration>
-            <mainClass>cz.xelfi.quoridor.webidor.resources.Quoridor</mainClass>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <version>2.2-beta-2</version>
-        <executions>
-          <execution>
-            <id>create-executable-jar</id>
-            <phase>package</phase>
-            <goals>
-              <goal>single</goal>
-            </goals>
-            <configuration>
-              <descriptors>
-                <descriptor>all-zip.xml</descriptor>
-              </descriptors>
-              <finalName>webidor-${version}</finalName>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <configuration>
-            <archive>
-                <manifest>
-                    <addClasspath>true</addClasspath>
-                    <classpathPrefix>lib/</classpathPrefix>
-                    <mainClass>cz.xelfi.quoridor.webidor.resources.Quoridor</mainClass>
-                </manifest>
-            </archive>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-    <description>Server with REST API for playing, inspecting and managing Quoridor games.</description>
+    <properties>
+        <endorsed.dir>${project.build.directory}/endorsed</endorsed.dir>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <netbeans.hint.deploy.server>gfv3ee6</netbeans.hint.deploy.server>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>javax</groupId>
+            <artifactId>javaee-web-api</artifactId>
+            <version>6.0</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.8.2</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.jersey</groupId>
+            <artifactId>jersey-json</artifactId>
+            <version>${jerseyVersion}</version>
+            <type>jar</type>
+            <exclusions>
+                <exclusion>
+                    <artifactId>jaxb-api</artifactId>
+                    <groupId>javax.xml.bind</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>stax-api</artifactId>
+                    <groupId>stax</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>jersey-core</artifactId>
+                    <groupId>com.sun.jersey</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.jersey.jersey-test-framework</groupId>
+            <artifactId>jersey-test-framework-http</artifactId>
+            <version>${jerseyVersion}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>wsdor</artifactId>
+            <version>${wsdorVersion}</version>
+        </dependency>        
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>2.3.2</version>
+                <configuration>
+                    <source>1.6</source>
+                    <target>1.6</target>
+                    <compilerArguments>
+                        <endorseddirs>${endorsed.dir}</endorseddirs>
+                    </compilerArguments>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>2.1.1</version>
+                <configuration>
+                    <failOnMissingWebXml>false</failOnMissingWebXml>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <version>2.1</version>
+                <executions>
+                    <execution>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>copy</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${endorsed.dir}</outputDirectory>
+                            <silent>true</silent>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>javax</groupId>
+                                    <artifactId>javaee-endorsed-api</artifactId>
+                                    <version>6.0</version>
+                                    <type>jar</type>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.9</version>
+                <configuration>
+                    <skipTests>true</skipTests>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    <repositories>
+        <repository>
+            <url>http://download.java.net/maven/2/</url>
+            <id>restlib</id>
+            <layout>default</layout>
+            <name>Repository for library Library[restlib]</name>
+        </repository>
+    </repositories>
 </project>
-
-
-
diff -r 0ea04469967d -r 90be53f96e0c webidor/src/main/java/cz/xelfi/quoridor/webidor/resources/Application.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/webidor/src/main/java/cz/xelfi/quoridor/webidor/resources/Application.java	Sun Jul 17 15:40:50 2011 +0200
@@ -0,0 +1,15 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package cz.xelfi.quoridor.webidor.resources;
+
+import javax.ws.rs.ApplicationPath;
+
+/**
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+@ApplicationPath("resources")
+public class Application extends javax.ws.rs.core.Application {
+}
\ No newline at end of file
diff -r 0ea04469967d -r 90be53f96e0c webidor/src/main/java/cz/xelfi/quoridor/webidor/resources/Quoridor.java
--- a/webidor/src/main/java/cz/xelfi/quoridor/webidor/resources/Quoridor.java	Sun May 01 21:10:07 2011 +0200
+++ b/webidor/src/main/java/cz/xelfi/quoridor/webidor/resources/Quoridor.java	Sun Jul 17 15:40:50 2011 +0200
@@ -18,19 +18,16 @@
 
 package cz.xelfi.quoridor.webidor.resources;
 
-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 java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
-import java.net.ServerSocket;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
 import java.util.UUID;
+import javax.annotation.ManagedBean;
+import javax.inject.Singleton;
 import javax.ws.rs.GET;
 import javax.ws.rs.PUT;
 import javax.ws.rs.Path;
@@ -39,7 +36,6 @@
 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;
 
 /**
  *
@@ -47,16 +43,17 @@
  */
 @Path("/")
 @Singleton
-public final class Quoridor {
+@ManagedBean
+public class Quoridor {
     private final File path;
     private Games games;
     private Users users;
     private final Map<UUID,String> loggedIn;
 
     public Quoridor() {
-        final String prop = System.getProperty("quoridor.dir"); // NOI18N
+        String prop = System.getProperty("quoridor.dir"); // NOI18N
         if (prop == null) {
-            throw new IllegalStateException("quoridor.dir property must be specified"); // NOI18N
+            prop = System.getProperty("user.dir") + File.separatorChar + ".quoridor"; // NOI18N
         }
         path = new File(prop);
         path.mkdirs();
@@ -144,53 +141,4 @@
             return getUsers().getUserInfo(callback, id, ret);
         }
     }
-
-    //
-    // start the server
-    //
-
-    public static void main(String[] args) throws IOException, InterruptedException {
-        int port = 9222;
-        try {
-            port = Integer.parseInt(args[0]);
-        } catch (Exception ex) {
-            // OK
-        }
-        HttpServer s = start(port);
-        System.out.println(
-            "Quoridor started at port " + port + "\n" + "Hit enter to stop it..."
-        );
-        if (args.length < 2 || !args[args.length - 1].equals("--kill")) {
-            System.out.println("Hit enter to stop it...");
-            System.in.read();
-        } else {
-            synchronized (Quoridor.class) {
-                Quoridor.class.wait();
-            }
-        }
-        System.in.read();
-        s.stop();
-        System.exit(0);
-    }
-
-    public static HttpServer start(int port) throws IOException {
-        if (port == -1) {
-            ServerSocket ss = new ServerSocket(0);
-            port =ss.getLocalPort();
-            ss.close();
-        }
-        final String baseUri = "http://localhost:" + port + "/";
-
-        if (System.getProperty("quoridor.dir") == null) {
-            File home = new File(System.getProperty("user.home"));
-            File quoridor = new File(home, ".quoridor");
-            System.setProperty("quoridor.dir", quoridor.getPath());
-        }
-
-        ResourceConfig rc = new PackagesResourceConfig("cz.xelfi.quoridor.webidor");
-        HttpServer server = GrizzlyServerFactory.createHttpServer(baseUri, rc);
-        server.start();
-        return server;
-    }
-
 }
diff -r 0ea04469967d -r 90be53f96e0c webidor/src/main/webapp/WEB-INF/beans.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/webidor/src/main/webapp/WEB-INF/beans.xml	Sun Jul 17 15:40:50 2011 +0200
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://java.sun.com/xml/ns/javaee"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
+</beans>
diff -r 0ea04469967d -r 90be53f96e0c webidor/src/main/webapp/index.jsp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/webidor/src/main/webapp/index.jsp	Sun Jul 17 15:40:50 2011 +0200
@@ -0,0 +1,15 @@
+<%@page contentType="text/html" pageEncoding="UTF-8"%>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+   "http://www.w3.org/TR/html4/loose.dtd">
+
+<html>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+        <title>Quoridor REST APIs</title>
+    </head>
+    <body>
+        <h1>Quoridor REST APIs!</h1>
+        
+        Get list of <a href="resources/games">all games</a>.
+    </body>
+</html>
diff -r 0ea04469967d -r 90be53f96e0c wsdor/pom.xml
--- a/wsdor/pom.xml	Sun May 01 21:10:07 2011 +0200
+++ b/wsdor/pom.xml	Sun Jul 17 15:40:50 2011 +0200
@@ -63,16 +63,6 @@
     </dependency>
     <dependency>
       <groupId>com.sun.jersey</groupId>
-      <artifactId>jersey-core</artifactId>
-      <version>${jerseyVersion}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.sun.jersey</groupId>
-      <artifactId>jersey-server</artifactId>
-      <version>${jerseyVersion}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.sun.jersey</groupId>
       <artifactId>jersey-json</artifactId>
       <version>${jerseyVersion}</version>
       <type>jar</type>
@@ -85,7 +75,17 @@
           <artifactId>stax-api</artifactId>
           <groupId>stax</groupId>
         </exclusion>
+        <exclusion>
+          <artifactId>jersey-core</artifactId>
+          <groupId>com.sun.jersey</groupId>
+        </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+        <groupId>javax</groupId>
+        <artifactId>javaee-web-api</artifactId>
+        <version>6.0</version>
+        <scope>provided</scope>
+    </dependency>
   </dependencies>
 </project>