From 9d4b29028ecd2095d8821d457a96098430fd9b09 Mon Sep 17 00:00:00 2001
From: Cristian Ventura <cristian.ventura@gmail.com>
Date: Sat, 11 Jan 2014 18:50:17 -0300
Subject: [PATCH] play 2.2.1 support

---
 java/app/controllers/Application.java |  2 +-
 java/app/models/PaintRoom.java        |  6 +++---
 java/app/models/Painter.java          | 10 +++++-----
 java/project/Build.scala              |  6 +++---
 java/project/build.properties         |  2 +-
 java/project/plugins.sbt              |  2 +-
 6 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/java/app/controllers/Application.java b/java/app/controllers/Application.java
index 31ea4cb..98dab3c 100644
--- a/java/app/controllers/Application.java
+++ b/java/app/controllers/Application.java
@@ -1,7 +1,7 @@
 package controllers;
 
 import models.PaintRoom;
-import org.codehaus.jackson.JsonNode;
+import com.fasterxml.jackson.databind.JsonNode;
 import play.mvc.Controller;
 import play.mvc.Result;
 import play.mvc.WebSocket;
diff --git a/java/app/models/PaintRoom.java b/java/app/models/PaintRoom.java
index 4239deb..db5e2e1 100644
--- a/java/app/models/PaintRoom.java
+++ b/java/app/models/PaintRoom.java
@@ -1,7 +1,7 @@
 package models;
 
-import org.codehaus.jackson.JsonNode;
-import org.codehaus.jackson.node.ObjectNode;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
 import play.Logger;
 import play.libs.F;
 import play.libs.Json;
@@ -33,7 +33,7 @@ public void createPainter(final WebSocket.In<JsonNode> in, final WebSocket.Out<J
         in.onMessage(new F.Callback<JsonNode>() {
             @Override
             public void invoke(JsonNode json) throws Throwable {
-                String type = json.get("type").getTextValue();
+                String type = json.get("type").textValue();
 
                 // The painter wants to change some of his property
                 if("change".equals(type)) {
diff --git a/java/app/models/Painter.java b/java/app/models/Painter.java
index bdf3a94..fa47bd8 100644
--- a/java/app/models/Painter.java
+++ b/java/app/models/Painter.java
@@ -1,7 +1,7 @@
 package models;
 
-import org.codehaus.jackson.JsonNode;
-import org.codehaus.jackson.node.ObjectNode;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
 import play.libs.Json;
 import play.mvc.WebSocket;
 
@@ -25,11 +25,11 @@ public Painter(String name, String color, Long size, WebSocket.Out<JsonNode> cha
 
     public void updateFromJson(JsonNode json) {
         if(json.has("name"))
-            this.name = json.get("name").getTextValue();
+            this.name = json.get("name").textValue();
         if(json.has("color"))
-            this.color = json.get("color").getTextValue();
+            this.color = json.get("color").textValue();
         if(json.has("size"))
-            this.size = json.get("size").getLongValue();
+            this.size = json.get("size").longValue();
     }
     
     public JsonNode toJson() {
diff --git a/java/project/Build.scala b/java/project/Build.scala
index ab80bdf..ed286cf 100644
--- a/java/project/Build.scala
+++ b/java/project/Build.scala
@@ -1,17 +1,17 @@
 import sbt._
 import Keys._
-import PlayProject._
+import play.Project._
 
 object ApplicationBuild extends Build {
 
-    val appName         = "Play Painter"
+    val appName         = "PlayPainter"
     val appVersion      = "1.0.1"
 
     val appDependencies = Seq(
       // Add your project dependencies here,
     )
 
-    val main = PlayProject(appName, appVersion, appDependencies, mainLang = JAVA).settings(
+    val main = play.Project(appName, appVersion, appDependencies).settings(
       // Add your own project settings here      
     )
 
diff --git a/java/project/build.properties b/java/project/build.properties
index d428711..0974fce 100644
--- a/java/project/build.properties
+++ b/java/project/build.properties
@@ -1 +1 @@
-sbt.version=0.11.3
+sbt.version=0.13.0
diff --git a/java/project/plugins.sbt b/java/project/plugins.sbt
index 398102a..a815558 100644
--- a/java/project/plugins.sbt
+++ b/java/project/plugins.sbt
@@ -5,4 +5,4 @@ logLevel := Level.Warn
 resolvers += "Typesafe repository" at "http://repo.typesafe.com/typesafe/releases/"
 
 // Use the Play sbt plugin for Play projects
-addSbtPlugin("play" % "sbt-plugin" % "2.0.2")
\ No newline at end of file
+addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.2.1")
\ No newline at end of file