Move play2-scala-mongo db to under play2-scala directory

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

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

frameworks/Scala/play2-scala-mongodb/benchmark_config

@@ -1,24 +0,0 @@
-{
-  "framework": "play2-scala-mongodb",
-  "tests": [{
-    "default": {
-      "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/play2-scala-mongodb/install.sh

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

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/play2-scala-mongodb/setup_scala_mongodb.sh → frameworks/Scala/play2-scala/setup_scala_mongodb.sh

@@ -1,15 +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}/target/universal/stage/RUNNING_PID ]
+if [ -f ${TROOT}/play2-scala-mongodb/target/universal/stage/RUNNING_PID ]
 then
-  rm -f -r ${TROOT}/target/universal/stage/RUNNING_PID
+  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}/target/universal/stage/bin/play2-scala-mongodb &
+${TROOT}/play2-scala-mongodb/target/universal/stage/bin/play2-scala-mongodb &