Browse Source

Update sort order. Update to play 2.1.2-RC1

Patrick Falls 12 years ago
parent
commit
e3a3c1c090

+ 2 - 3
play-slick/benchmark_config

@@ -1,15 +1,14 @@
 {
-  "framework": "play-scala",
+  "framework": "play-slick",
   "tests": [{
     "default": {
       "setup_file": "setup",
-      "json_url": "/json",
       "db_url": "/db",
       "query_url": "/db?queries=",
       "fortune_url": "/fortunes",
       "update_url": "/update?queries=",
       "port": 9000,
-      "sort": 32
+      "sort": 135
     }
   }]
 }

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

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

+ 1 - 1
play-slick/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")

+ 6 - 6
play-slick/setup.py

@@ -5,12 +5,12 @@ import setup_util
 import os
 
 def start(args):
-  setup_util.replace_text("play-scala/conf/application.conf", "jdbc:mysql:\/\/.*:3306", "jdbc:mysql://" + args.database_host + ":3306")
+  setup_util.replace_text("play-slick/conf/application.conf", "jdbc:mysql:\/\/.*:3306", "jdbc:mysql://" + args.database_host + ":3306")
 
-  subprocess.check_call("play dist", shell=True, cwd="play-scala")
-  subprocess.check_call("unzip play-scala-1.0-SNAPSHOT.zip", shell=True, cwd="play-scala/dist")
-  subprocess.check_call("chmod +x start", shell=True, cwd="play-scala/dist/play-scala-1.0-SNAPSHOT")
-  subprocess.Popen("./start", shell=True, cwd="play-scala/dist/play-scala-1.0-SNAPSHOT")
+  subprocess.check_call("play dist", shell=True, cwd="play-slick")
+  subprocess.check_call("unzip play-slick-1.0-SNAPSHOT.zip", shell=True, cwd="play-slick/dist")
+  subprocess.check_call("chmod +x start", shell=True, cwd="play-slick/dist/play-slick-1.0-SNAPSHOT")
+  subprocess.Popen("./start", shell=True, cwd="play-slick/dist/play-slick-1.0-SNAPSHOT")
 
   return 0
 def stop():
@@ -21,7 +21,7 @@ def stop():
       pid = int(line.split(None, 2)[1])
       os.kill(pid, 9)
   try:
-    os.remove("play-scala/RUNNING_PID")
+    os.remove("play-slick/RUNNING_PID")
   except OSError:
     pass