Merge pull request #1388 from LadyMozzarella/resolve-play-scala-mongodb-errors

Clean Up Scala Play2 Mongodb Errors, Resolve #1393

.travis.yml

@@ -136,7 +136,6 @@ env:
     - "TESTDIR=Scala/lift-stateless"
     - "TESTDIR=Scala/plain"
     - "TESTDIR=Scala/play-activate-mysql"
-    - "TESTDIR=Scala/play-scala-mongodb"
     - "TESTDIR=Scala/play2-scala"
     - "TESTDIR=Scala/scalatra"
     - "TESTDIR=Scala/scruffy"

frameworks/Scala/play-scala-mongodb/bash_profile.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-export PLAY2_HOME=${IROOT}/play-2.2.0

frameworks/Scala/play-scala-mongodb/benchmark_config

@@ -1,24 +0,0 @@
-{
-  "framework": "play-scala-mongodb",
-  "tests": [{
-    "default": {
-      "setup_file": "setup",
-      "db_url": "/db",
-      "query_url": "/queries?queries=",
-      "port": 9000,
-      "approach": "Realistic",
-      "classification": "Fullstack",
-      "database": "MongoDB",
-      "framework": "play2",
-      "language": "Scala",
-      "orm": "Raw",
-      "platform": "Netty",
-      "webserver": "None",
-      "os": "Linux",
-      "database_os": "Linux",
-      "display_name": "play-scala-rmongo",
-      "notes": "Uses Reactive Mongo",
-      "versus": "netty"
-    }
-  }]
-}

frameworks/Scala/play-scala-mongodb/install.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-fw_depends play2

frameworks/Scala/play-scala-mongodb/setup.py

@@ -1,48 +0,0 @@
-
-import subprocess
-import sys
-import setup_util
-import os
-from zipfile import ZipFile
-
-def start(args, logfile, errfile):
-  setup_util.replace_text("play-scala-mongodb/conf/application.conf", "jdbc:mysql:\/\/.*:3306", "jdbc:mysql://" + args.database_host + ":3306")
-
-  subprocess.check_call("play clean dist", shell=True, cwd="play-scala-mongodb", stderr=errfile, stdout=logfile)
-
-  if os.name == 'nt':
-    ZipFile("./play-scala-mongodb/target/universal/play-scala-mongodb-1.0-SNAPSHOT.zip").extractall("./play-scala-mongodb/target/universal")
-    with open("./play-scala-mongodb/target/universal/play-scala-mongodb-1.0-SNAPSHOT/bin/play-scala-mongodb.bat", "w+") as f:
-      f.write("java %1 -cp \"./lib/*;\" play.core.server.NettyServer .")
-    subprocess.Popen("play-scala-mongodb.bat", shell=True, cwd="play-scala-mongodb/target/universal/play-scala-mongodb-1.0-SNAPSHOT/bin", stderr=errfile, stdout=logfile)
-  else:
-    subprocess.check_call("unzip play-scala-mongodb-1.0-SNAPSHOT.zip", shell=True, cwd="play-scala-mongodb/target/universal", stderr=errfile, stdout=logfile)
-    subprocess.check_call("chmod +x play-scala-mongodb", shell=True, cwd="play-scala-mongodb/target/universal/play-scala-mongodb-1.0-SNAPSHOT/bin", stderr=errfile, stdout=logfile)
-    subprocess.Popen("./play-scala-mongodb", shell=True, cwd="play-scala-mongodb/target/universal/play-scala-mongodb-1.0-SNAPSHOT/bin", stderr=errfile, stdout=logfile)
-
-  return 0
-def stop(logfile, errfile):
-  if os.name == 'nt':
-    with open("./play-scala-mongodb/target/universal/play-scala-mongodb-1.0-SNAPSHOT/RUNNING_PID") as f:
-      pid = int(f.read())
-      os.kill(pid, 15)
-  else:
-    p = subprocess.Popen(['ps', 'aux'], stdout=subprocess.PIPE)
-    out, err = p.communicate()
-    for line in out.splitlines():
-      if 'NettyServer' in line:
-        pid = int(line.split(None, 2)[1])
-        os.kill(pid, 15)
-
-  try:
-    os.remove("play-scala-mongodb/target/universal/play-scala-mongodb-1.0-SNAPSHOT/RUNNING_PID")
-  except OSError:
-    return 1
-
-  # Takes up so much disk space
-  if os.name == 'nt':
-    subprocess.check_call("del /f /s /q target", shell=True, cwd="play-scala-mongodb", stderr=errfile, stdout=logfile)
-  else:
-    subprocess.check_call("rm -rf target", shell=True, cwd="play-scala-mongodb", stderr=errfile, stdout=logfile)
-
-  return 0

frameworks/Scala/play-scala-mongodb/setup.sh

@@ -1,12 +0,0 @@
-#!/bin/bash
-
-sed -i 's|jdbc:mysql://.*:3306|jdbc:mysql://'"${DBHOST}"':3306|g' conf/application.conf
-
-${PLAY2_HOME}/play clean dist
-
-cd target/universal
-unzip play-scala-mongodb-1.0-SNAPSHOT.zip
-cd play-scala-mongodb-1.0-SNAPSHOT/bin
-chmod +x play-scala-mongodb
-
-./play-scala-mongodb &

frameworks/Scala/play2-scala/benchmark_config

@@ -82,6 +82,25 @@
         "query_url": "/queries?queries=", 
         "fortune_url": "/fortunes", 
         "update_url": "/update?queries="
+      },
+      "scala-mongodb": {
+        "setup_file": "setup_scala_mongodb",
+        "db_url": "/db",
+        "query_url": "/queries?queries=",
+        "port": 9000,
+        "approach": "Realistic",
+        "classification": "Fullstack",
+        "database": "MongoDB",
+        "framework": "play2",
+        "language": "Scala",
+        "orm": "Raw",
+        "platform": "Netty",
+        "webserver": "None",
+        "os": "Linux",
+        "database_os": "Linux",
+        "display_name": "play2-scala-rmongo",
+        "notes": "Uses Reactive Mongo",
+        "versus": "netty"
       }
     }
   ]

frameworks/Scala/play-scala-mongodb/project/Build.scala → frameworks/Scala/play2-scala/play2-scala-mongodb/project/Build.scala

@@ -3,7 +3,7 @@ import Keys._
 
 object ApplicationBuild extends Build {
 
-  val appName         = "play-scala-mongodb"
+  val appName         = "play2-scala-mongodb"
   val appVersion      = "1.0-SNAPSHOT"
 
   val appDependencies = Seq(

frameworks/Scala/play2-scala/setup_scala_mongodb.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+
+cd play2-scala-mongodb
+sed -i 's|jdbc:mysql://.*:3306|jdbc:mysql://'"${DBHOST}"':3306|g' conf/application.conf
+
+# If application has an already existing process id, clear it.
+if [ -f ${TROOT}/play2-scala-mongodb/target/universal/stage/RUNNING_PID ]
+then
+  rm -f -r ${TROOT}/play2-scala-mongodb/target/universal/stage/RUNNING_PID
+fi
+
+# Stage application.
+${IROOT}/sbt/bin/sbt stage
+
+# Execute Start script in background.
+${TROOT}/play2-scala-mongodb/target/universal/stage/bin/play2-scala-mongodb &