Browse Source

Updated the play2-scala projects (#3065)

Matthias Kurz 7 years ago
parent
commit
81a7d2b6e8

+ 10 - 10
frameworks/Scala/play2-scala/benchmark_config.json

@@ -12,11 +12,11 @@
         "database": "None", 
         "database": "None", 
         "approach": "Realistic", 
         "approach": "Realistic", 
         "classification": "Fullstack", 
         "classification": "Fullstack", 
-        "platform": "Netty", 
+        "platform": "Akka", 
         "webserver": "None", 
         "webserver": "None", 
         "database_os": "Linux", 
         "database_os": "Linux", 
         "notes": "", 
         "notes": "", 
-        "versus": "netty", 
+        "versus": "akka-http", 
         "port": "9000", 
         "port": "9000", 
         "json_url": "/json",
         "json_url": "/json",
         "plaintext_url": "/plaintext"
         "plaintext_url": "/plaintext"
@@ -31,11 +31,11 @@
         "database": "MySQL", 
         "database": "MySQL", 
         "approach": "Realistic", 
         "approach": "Realistic", 
         "classification": "Fullstack", 
         "classification": "Fullstack", 
-        "platform": "Netty", 
+        "platform": "Akka", 
         "webserver": "None", 
         "webserver": "None", 
         "database_os": "Linux", 
         "database_os": "Linux", 
         "notes": "", 
         "notes": "", 
-        "versus": "netty", 
+        "versus": "akka-http", 
         "port": "9000", 
         "port": "9000", 
         "db_url": "/db", 
         "db_url": "/db", 
         "query_url": "/queries?queries=", 
         "query_url": "/queries?queries=", 
@@ -54,11 +54,11 @@
         "database": "MySQL", 
         "database": "MySQL", 
         "approach": "Realistic", 
         "approach": "Realistic", 
         "classification": "Fullstack", 
         "classification": "Fullstack", 
-        "platform": "Netty", 
+        "platform": "Akka", 
         "webserver": "None", 
         "webserver": "None", 
         "database_os": "Linux", 
         "database_os": "Linux", 
         "notes": "", 
         "notes": "", 
-        "versus": "netty", 
+        "versus": "akka-http", 
         "port": "9000", 
         "port": "9000", 
         "db_url": "/db", 
         "db_url": "/db", 
         "query_url": "/queries?queries=", 
         "query_url": "/queries?queries=", 
@@ -77,11 +77,11 @@
         "database": "MongoDB", 
         "database": "MongoDB", 
         "approach": "Realistic", 
         "approach": "Realistic", 
         "classification": "Fullstack", 
         "classification": "Fullstack", 
-        "platform": "Netty", 
+        "platform": "Akka", 
         "webserver": "None", 
         "webserver": "None", 
         "database_os": "Linux", 
         "database_os": "Linux", 
         "notes": "", 
         "notes": "", 
-        "versus": "netty", 
+        "versus": "akka-http", 
         "port": "9000",
         "port": "9000",
         "sleep":"8",
         "sleep":"8",
         "db_url": "/db", 
         "db_url": "/db", 
@@ -101,11 +101,11 @@
         "database": "MySQL", 
         "database": "MySQL", 
         "approach": "Realistic", 
         "approach": "Realistic", 
         "classification": "Fullstack", 
         "classification": "Fullstack", 
-        "platform": "Netty", 
+        "platform": "Akka", 
         "webserver": "None", 
         "webserver": "None", 
         "database_os": "Linux", 
         "database_os": "Linux", 
         "notes": "", 
         "notes": "", 
-        "versus": "netty", 
+        "versus": "akka-http", 
         "port": "9000", 
         "port": "9000", 
         "db_url": "/db", 
         "db_url": "/db", 
         "query_url": "/queries?queries=", 
         "query_url": "/queries?queries=", 

+ 1 - 7
frameworks/Scala/play2-scala/play2-scala-anorm/build.sbt

@@ -2,7 +2,7 @@ name := "play2-scala-anorm"
 
 
 version := "1.0-SNAPSHOT"
 version := "1.0-SNAPSHOT"
 
 
-scalaVersion := "2.12.3"
+scalaVersion := "2.12.4"
 
 
 lazy val root = (project in file(".")).enablePlugins(PlayScala)
 lazy val root = (project in file(".")).enablePlugins(PlayScala)
 
 
@@ -12,9 +12,3 @@ libraryDependencies ++= Seq(
   "mysql" % "mysql-connector-java" % "5.1.44"
   "mysql" % "mysql-connector-java" % "5.1.44"
 )
 )
 libraryDependencies += guice
 libraryDependencies += guice
-
-resolvers += "scalaz-bintray" at "http://dl.bintray.com/scalaz/releases"
-
-// Play provides two styles of routers, one expects its actions to be injected, the
-// other, legacy style, accesses its actions statically.
-routesGenerator := InjectedRoutesGenerator

+ 1 - 1
frameworks/Scala/play2-scala/play2-scala-anorm/project/plugins.sbt

@@ -2,4 +2,4 @@
 logLevel := Level.Warn
 logLevel := Level.Warn
 
 
 // Use the Play sbt plugin for Play projects
 // Use the Play sbt plugin for Play projects
-addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.6")
+addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.7")

+ 1 - 2
frameworks/Scala/play2-scala/play2-scala-reactivemongo/build.sbt

@@ -2,11 +2,10 @@ name := "play2-scala-reactivemongo"
 
 
 version := "1.0-SNAPSHOT"
 version := "1.0-SNAPSHOT"
 
 
-scalaVersion := "2.12.3"
+scalaVersion := "2.12.4"
 
 
 lazy val root =
 lazy val root =
   (project in file(".")).
   (project in file(".")).
-  settings(routesGenerator := InjectedRoutesGenerator).
   enablePlugins(PlayScala)
   enablePlugins(PlayScala)
 
 
 libraryDependencies ++= Seq(
 libraryDependencies ++= Seq(

+ 1 - 1
frameworks/Scala/play2-scala/play2-scala-reactivemongo/project/plugins.sbt

@@ -1,2 +1,2 @@
 // Use the Play sbt plugin for Play projects
 // Use the Play sbt plugin for Play projects
-addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.6")
+addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.7")

+ 1 - 1
frameworks/Scala/play2-scala/play2-scala-slick/build.sbt

@@ -2,7 +2,7 @@ name := "play2-scala-slick"
 
 
 version := "1.0-SNAPSHOT"
 version := "1.0-SNAPSHOT"
 
 
-scalaVersion := "2.12.3"
+scalaVersion := "2.12.4"
 
 
 lazy val root = (project in file(".")).enablePlugins(PlayScala)
 lazy val root = (project in file(".")).enablePlugins(PlayScala)
 
 

+ 1 - 4
frameworks/Scala/play2-scala/play2-scala-slick/project/plugins.sbt

@@ -1,8 +1,5 @@
 // Comment to get more information during initialization
 // Comment to get more information during initialization
 logLevel := Level.Warn
 logLevel := Level.Warn
 
 
-// The Typesafe repository 
-resolvers += "Typesafe repository" at "http://repo.typesafe.com/typesafe/releases/"
-
 // Use the Play sbt plugin for Play projects
 // Use the Play sbt plugin for Play projects
-addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.6")
+addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.7")

+ 2 - 3
frameworks/Scala/play2-scala/play2-scala/build.sbt

@@ -2,12 +2,11 @@ name := "play2-scala"
 
 
 version := "1.0-SNAPSHOT"
 version := "1.0-SNAPSHOT"
 
 
-scalaVersion := "2.12.3"
+scalaVersion := "2.12.4"
 
 
 val root =
 val root =
   (project in file(".")).
   (project in file(".")).
-  enablePlugins(PlayScala, PlayNettyServer).
-  disablePlugins(PlayAkkaHttpServer)
+  enablePlugins(PlayScala)
 
 
 libraryDependencies += "com.typesafe.play" %% "play-json" % "2.6.6"
 libraryDependencies += "com.typesafe.play" %% "play-json" % "2.6.6"
 libraryDependencies += guice
 libraryDependencies += guice

+ 1 - 1
frameworks/Scala/play2-scala/play2-scala/project/plugins.sbt

@@ -2,4 +2,4 @@
 logLevel := Level.Warn
 logLevel := Level.Warn
 
 
 // Use the Play sbt plugin for Play projects
 // Use the Play sbt plugin for Play projects
-addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.6")
+addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.7")

+ 1 - 1
frameworks/Scala/play2-scala/setup_scala.sh

@@ -4,7 +4,7 @@ fw_depends java sbt
 
 
 cd play2-scala
 cd play2-scala
 
 
-# Clear old running app.
+
 rm -rf ${TROOT}/play2-scala/target/universal/stage/RUNNING_PID
 rm -rf ${TROOT}/play2-scala/target/universal/stage/RUNNING_PID
 
 
 # Stage application.
 # Stage application.

+ 1 - 0
frameworks/Scala/play2-scala/setup_scala_reactivemongo.sh

@@ -4,6 +4,7 @@ fw_depends mongodb java sbt
 
 
 cd play2-scala-reactivemongo
 cd play2-scala-reactivemongo
 
 
+
 rm -rf ${TROOT}/play2-scala-reactivemongo/target/universal/stage/RUNNING_PID
 rm -rf ${TROOT}/play2-scala-reactivemongo/target/universal/stage/RUNNING_PID
 
 
 # Stage application.
 # Stage application.