Merge branch 'master' of https://github.com/andreaferretti/FrameworkBenchmarks into andreaferretti-master

frameworks/Scala/play2-scala/benchmark_config.json

@@ -18,7 +18,8 @@
         "notes": "", 
         "versus": "netty", 
         "port": "9000", 
-        "json_url": "/json"
+        "json_url": "/json",
+        "plaintext_url": "/plaintext"
       }, 
       "activate": {
         "display_name": "play2-scala-activate", 

frameworks/Scala/play2-scala/play2-scala/app/controllers/Application.scala

@@ -9,4 +9,14 @@ object Application extends Controller {
     Ok(Json.obj("message" -> "Hello, World!"))
   }
 
+  def plaintext() = Action {
+    import java.util.Date
+    import java.text.SimpleDateFormat
+
+    val sdf = new SimpleDateFormat("EEE, MMM d yyyy HH:MM:ss z")
+    Ok("Hello, World!")
+      .withHeaders(
+        DATE -> sdf.format(new Date()),
+        SERVER -> "Play Framework 2.3.3")
+  }
 }

frameworks/Scala/play2-scala/play2-scala/conf/routes

@@ -4,6 +4,7 @@
 
 # Home page
 GET     /json                           controllers.Application.json
+GET     /plaintext                      controllers.Application.plaintext
 
 # Map static resources from the /public folder to the /assets URL path
 GET     /assets/*file                   controllers.Assets.at(path="/public", file)