Changed sort order and updated JNDI string

scalatra/benchmark_config

@@ -3,11 +3,11 @@
   "tests": [{
     "default": {
       "setup_file": "setup",
-      "json_url": "/json",
-      "db_url": "/db",
-      "query_url": "/db?queries=",
+      "json_url": "/scalatra/json",
+      "db_url": "/scalatra/db",
+      "query_url": "/scalatra/db?queries=",
       "port": 8080,
-      "sort": 18
+      "sort": 56
     }
   }]
-}
+}

scalatra/setup.py

@@ -9,7 +9,7 @@ def start(args):
   try:
     subprocess.check_call("./sbt clean package", shell=True, cwd="scalatra")
     subprocess.check_call("rm -rf $RESIN_HOME/webapps/*", shell=True)
-    subprocess.check_call("cp scalatra/target/scala-2.10/scalatra*.war $RESIN_HOME/webapps/", shell=True)
+    subprocess.check_call("cp scalatra/target/scala-2.10/scalatra*.war $RESIN_HOME/webapps/scalatra.war", shell=True)
     subprocess.check_call("$RESIN_HOME/bin/resinctl start", shell=True)
     return 0
   except subprocess.CalledProcessError:

scalatra/src/main/scala/hello/DataSourceProvider.scala

@@ -29,6 +29,6 @@ trait TestDataSourceProvider extends DataSourceProvider {
  */
 trait JndiDataSourceProvider extends DataSourceProvider {
 
-  lazy val dataSource = new InitialContext().lookup("jdbc/hello_world").asInstanceOf[DataSource]
+  lazy val dataSource = new InitialContext().lookup("java:comp/env/jdbc/hello_world").asInstanceOf[DataSource]
 
 }