Bladeren bron

Update to play 2.1.2RC1

Patrick Falls 12 jaren geleden
bovenliggende
commit
6235096ff2

+ 1 - 1
benchmarker.py

@@ -25,7 +25,7 @@ class Benchmarker:
     all_tests = self.__gather_tests()
 
     for test in all_tests:
-      print test.name
+      print str(test.sort) + ": " + test.name
 
     self.__finish()
 

+ 1 - 1
config/benchmark_profile

@@ -6,7 +6,7 @@ export GOROOT=~/FrameworkBenchmarks/installs/go
 export GOPATH=~/FrameworkBenchmarks/go:~/FrameworkBenchmarks/webgo:~/FrameworkBenchmarks/revel
 export TOMCAT_HOME=~/FrameworkBenchmarks/installs/apache-tomcat-7.0.35
 export NODE_HOME=~/FrameworkBenchmarks/installs/node-v0.10.2-linux-x64
-export PLAY_HOME=~/FrameworkBenchmarks/installs/play-2.1.1
+export PLAY_HOME=~/FrameworkBenchmarks/installs/play-2.1.2-RC1
 export PLAY1_HOME=~/FrameworkBenchmarks/installs/play-1.2.5
 export MAVEN_HOME=~/FrameworkBenchmarks/installs/apache-maven-3.0.5
 export PATH="$JAVA_HOME/bin:$GRAILS_HOME/bin:$PLAY_HOME:$PLAY1_HOME:$VERTX_HOME/bin:$GOROOT/bin:$NODE_HOME/bin:$HOME/FrameworkBenchmarks/installs/bin:$MAVEN_HOME/bin:$PATH"

+ 3 - 3
installer.py

@@ -301,9 +301,9 @@ class Installer:
     ##############################
     # Play 2
     ##############################
-    self.__run_command("wget http://downloads.typesafe.com/play/2.1.1/play-2.1.1.zip")
-    self.__run_command("unzip -o play-2.1.1.zip")
-    self.__run_command("rm play-2.1.1.zip")
+    self.__run_command("wget http://downloads.typesafe.com/play/2.1.2-RC1/play-2.1.2-RC1.zip")
+    self.__run_command("unzip -o play-2.1.2-RC1.zip")
+    self.__run_command("rm play-2.1.2-RC1.zip")
 
     ##############################
     # Play 1

+ 1 - 1
play-java-jpa/project/Build.scala

@@ -1,6 +1,6 @@
 import sbt._
 import Keys._
-import PlayProject._
+import play.Project._
 
 object ApplicationBuild extends Build {
 

+ 1 - 1
play-java-jpa/project/build.properties

@@ -1 +1 @@
-sbt.version=0.12.2
+sbt.version=0.12.3

+ 1 - 1
play-java-jpa/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.1.1")
+addSbtPlugin("play" % "sbt-plugin" % "2.1.2-RC1")

+ 1 - 1
play-java/project/Build.scala

@@ -1,6 +1,6 @@
 import sbt._
 import Keys._
-import PlayProject._
+import play.Project._
 
 object ApplicationBuild extends Build {
 

+ 1 - 1
play-java/project/build.properties

@@ -1 +1 @@
-sbt.version=0.12.2
+sbt.version=0.12.3

+ 1 - 1
play-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.1.1")
+addSbtPlugin("play" % "sbt-plugin" % "2.1.2-RC1")

+ 1 - 1
play-scala-mongodb/project/build.properties

@@ -1 +1 @@
-sbt.version=0.12.2
+sbt.version=0.12.3

+ 1 - 1
play-scala-mongodb/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.1.1")
+addSbtPlugin("play" % "sbt-plugin" % "2.1.2-RC1")

+ 1 - 1
play-scala/project/Build.scala

@@ -1,6 +1,6 @@
 import sbt._
 import Keys._
-import PlayProject._
+import play.Project._
 
 object ApplicationBuild extends Build {
 

+ 1 - 1
play-scala/project/build.properties

@@ -1 +1 @@
-sbt.version=0.12.2
+sbt.version=0.12.3

+ 1 - 1
play-scala/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.1.1")
+addSbtPlugin("play" % "sbt-plugin" % "2.1.2-RC1")

+ 1 - 1
web-simple/benchmark_config

@@ -12,7 +12,7 @@
       "db_url": "/db",
       "query_url": "/db?queries=",
       "port": 8080,
-      "sort": 106
+      "sort": 117
     }
   }]
 }