Browse Source

Refactor play-scala-mongodb to play2-scala-mongodb and update setup

Brittany Mazza 10 years ago
parent
commit
f3b1c18040

+ 0 - 3
frameworks/Scala/play-scala-mongodb/install.sh

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

+ 0 - 48
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

+ 0 - 12
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 &

+ 0 - 0
frameworks/Scala/play-scala-mongodb/.gitignore → frameworks/Scala/play2-scala-mongodb/.gitignore


+ 0 - 0
frameworks/Scala/play-scala-mongodb/README.md → frameworks/Scala/play2-scala-mongodb/README.md


+ 0 - 0
frameworks/Scala/play-scala-mongodb/app/controllers/Application.scala → frameworks/Scala/play2-scala-mongodb/app/controllers/Application.scala


+ 0 - 0
frameworks/Scala/play-scala-mongodb/bash_profile.sh → frameworks/Scala/play2-scala-mongodb/bash_profile.sh


+ 3 - 3
frameworks/Scala/play-scala-mongodb/benchmark_config → frameworks/Scala/play2-scala-mongodb/benchmark_config

@@ -1,8 +1,8 @@
 {
 {
-  "framework": "play-scala-mongodb",
+  "framework": "play2-scala-mongodb",
   "tests": [{
   "tests": [{
     "default": {
     "default": {
-      "setup_file": "setup",
+      "setup_file": "setup_scala_mongodb",
       "db_url": "/db",
       "db_url": "/db",
       "query_url": "/queries?queries=",
       "query_url": "/queries?queries=",
       "port": 9000,
       "port": 9000,
@@ -16,7 +16,7 @@
       "webserver": "None",
       "webserver": "None",
       "os": "Linux",
       "os": "Linux",
       "database_os": "Linux",
       "database_os": "Linux",
-      "display_name": "play-scala-rmongo",
+      "display_name": "play2-scala-rmongo",
       "notes": "Uses Reactive Mongo",
       "notes": "Uses Reactive Mongo",
       "versus": "netty"
       "versus": "netty"
     }
     }

+ 0 - 0
frameworks/Scala/play-scala-mongodb/conf/application.conf → frameworks/Scala/play2-scala-mongodb/conf/application.conf


+ 0 - 0
frameworks/Scala/play-scala-mongodb/conf/play.plugins → frameworks/Scala/play2-scala-mongodb/conf/play.plugins


+ 0 - 0
frameworks/Scala/play-scala-mongodb/conf/routes → frameworks/Scala/play2-scala-mongodb/conf/routes


+ 3 - 0
frameworks/Scala/play2-scala-mongodb/install.sh

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

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

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

+ 0 - 0
frameworks/Scala/play-scala-mongodb/project/build.properties → frameworks/Scala/play2-scala-mongodb/project/build.properties


+ 0 - 0
frameworks/Scala/play-scala-mongodb/project/plugins.sbt → frameworks/Scala/play2-scala-mongodb/project/plugins.sbt


+ 15 - 0
frameworks/Scala/play2-scala-mongodb/setup_scala_mongodb.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+
+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}/target/universal/stage/RUNNING_PID ]
+then
+  rm -f -r ${TROOT}/target/universal/stage/RUNNING_PID
+fi
+
+# Stage application.
+${IROOT}/sbt/bin/sbt stage
+
+# Execute Start script in background.
+${TROOT}/target/universal/stage/bin/play2-scala-mongodb &

+ 0 - 0
frameworks/Scala/play-scala-mongodb/source_code → frameworks/Scala/play2-scala-mongodb/source_code