Merge revel-*

.travis.yml

@@ -64,8 +64,6 @@ env:
     - "TESTDIR=Go/go-std-mysql"
     - "TESTDIR=Go/go-std-postgresql"
     - "TESTDIR=Go/revel"
-    - "TESTDIR=Go/revel-jet"
-    - "TESTDIR=Go/revel-qbs"
     - "TESTDIR=Go/webgo"
     - "TESTDIR=Groovy/grails"
     - "TESTDIR=Haskell/snap"
@@ -85,6 +83,7 @@ env:
     - "TESTDIR=Java/jawn"
     - "TESTDIR=Java/jetty-servlet"
     - "TESTDIR=Java/jetty"
+    - "TESTDIR=Java/jlhttp"
     - "TESTDIR=Java/jooby"
     - "TESTDIR=Java/netty"
     - "TESTDIR=Java/ninja-standalone"
@@ -185,6 +184,7 @@ env:
     - "TESTDIR=Scala/akka-http"
     - "TESTDIR=Scala/colossus"
     - "TESTDIR=Scala/finagle"
+    - "TESTDIR=Scala/finatra"
     - "TESTDIR=Scala/fintrospect"
     - "TESTDIR=Scala/lift-stateless"
     - "TESTDIR=Scala/plain"

frameworks/C++/treefrog/benchmark_config.json

@@ -2,6 +2,29 @@
   "framework": "treefrog",
   "tests": [{
     "default": {
+      "setup_file": "setup-thread",
+      "json_url": "/json/json",
+      "db_url": "/world/random",
+      "query_url": "/world/queries/",
+      "fortune_url": "/fortune/index",
+      "update_url": "/world/updates/",
+      "plaintext_url": "/world/plain",
+      "port": 8080,
+      "approach": "Realistic",
+      "classification": "Fullstack",
+      "database": "MySQL",
+      "framework": "treefrog",
+      "language": "C++",
+      "orm": "Micro",
+      "platform": "Treefrog",
+      "webserver": "None",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "treefrog-thread",
+      "notes": "",
+      "versus": ""
+    },
+    "hybrid": {
       "setup_file": "setup",
       "json_url": "/json/json",
       "db_url": "/world/random",
@@ -24,8 +47,8 @@
       "notes": "",
       "versus": ""
     },
-    "thread": {
-      "setup_file": "setup-thread",
+    "postgres": {
+      "setup_file": "setup-postgres",
       "json_url": "/json/json",
       "db_url": "/world/random",
       "query_url": "/world/queries/",
@@ -35,15 +58,38 @@
       "port": 8080,
       "approach": "Realistic",
       "classification": "Fullstack",
-      "database": "MySQL",
+      "database": "Postgres",
       "framework": "treefrog",
       "language": "C++",
       "orm": "Micro",
       "platform": "Treefrog",
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "treefrog-thread",
+      "display_name": "treefrog-postgres",
+      "notes": "",
+      "versus": ""
+    },
+    "mongodb": {
+      "setup_file": "setup-mongodb",
+      "json_url": "/json/json",
+      "db_url": "/world/mrandom",
+      "query_url": "/world/mqueries/",
+      "fortune_url": "/fortune/mindex",
+      "update_url": "/world/mupdates/",
+      "plaintext_url": "/world/plain",
+      "port": 8080,
+      "approach": "Realistic",
+      "classification": "Fullstack",
+      "database": "MongoDB",
+      "framework": "treefrog",
+      "language": "C++",
+      "orm": "Micro",
+      "platform": "Treefrog",
+      "webserver": "None",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "treefrog-mongo",
       "notes": "",
       "versus": ""
     }

frameworks/C++/treefrog/config/application.ini

@@ -14,10 +14,6 @@ InternalEncoding=UTF-8
 # specified encoding. See QTextCodec class reference.
 HttpOutputEncoding=UTF-8
 
-# Sets the charset parameter of 'text/html' in the HTTP Content-Type
-# header to the specified string.
-HtmlContentCharset=UTF-8
-
 # Sets a language/country pair, such as en_US, ja_JP, etc.
 # If this value is empty, the system's locale is used.
 Locale=
@@ -33,7 +29,7 @@ UploadTemporaryDirectory=tmp
 SqlDatabaseSettingsFiles=database.ini
 
 # Specify the setting file for MongoDB.
-MongoDbSettingsFile=
+MongoDbSettingsFile=mongodb.ini
 
 # Specify the directory path to store SQL query files
 SqlQueriesStoredDirectory=sql/
@@ -64,6 +60,25 @@ LimitRequestBody=0
 # forgery never work; otherwise it's enabled.
 EnableCsrfProtectionModule=false
 
+# Enables HTTP method override if true. The following are priorities of
+# override.
+#  - Value of query parameter named '_method'
+#  - Value of X-HTTP-Method-Override header
+#  - Value of X-HTTP-Method header
+#  - Value of X-METHOD-OVERRIDE header
+EnableHttpMethodOverride=false
+
+# Sets the timeout in seconds during which a keep-alive HTTP connection
+# will stay open on the server side. The zero value disables keep-alive
+# client connections.
+HttpKeepAliveTimeout=10
+
+# Forces some libraries to be loaded before all others. It means to set
+# the LD_PRELOAD environment variable for the application server, Linux
+# only. The paths to shared objects, jemalloc or TCMalloc, can be
+# specified.
+LDPreload=/usr/lib/x86_64-linux-gnu/libjemalloc.so
+
 ##
 ## Session section
 ##
@@ -112,19 +127,6 @@ MPM.thread.MaxAppServers=10
 # per server process.
 MPM.thread.MaxThreadsPerAppServer=100
 
-##
-## MPM Prefork section
-##
-
-# Maximum number of server processes allowed to start
-MPM.prefork.MaxServers=20
-
-# Minimum number of server processes allowed to start
-MPM.prefork.MinServers=5
-
-# Number of server processes which are kept spare
-MPM.prefork.SpareServers=5
-
 ##
 ## MPM Hybrid section
 ##

frameworks/C++/treefrog/config/mongodb.ini

@@ -3,7 +3,7 @@
 #
 
 [dev]
-DatabaseName=mdb
+DatabaseName=hello_world
 HostName=localhost
 Port=
 UserName=
@@ -19,8 +19,8 @@ Password=
 ConnectOptions=
 
 [product]
-DatabaseName=
-HostName=
+DatabaseName=hello_world
+HostName=localhost
 Port=
 UserName=
 Password=

frameworks/C++/treefrog/controllers/controllers.pro

@@ -1,7 +1,7 @@
 TARGET = controller
 TEMPLATE = lib
 CONFIG += shared x86_64 c++11
-QT += network sql xml
+QT += network sql xml qml
 QT -= gui
 DEFINES += TF_DLL
 DESTDIR = ../lib

frameworks/C++/treefrog/controllers/fortunecontroller.cpp

@@ -1,11 +1,17 @@
 #include "fortunecontroller.h"
 #include "fortune.h"
+#include "mngfortune.h"
 
 static bool caseSensitiveLessThan(const Fortune &f1, const Fortune &f2)
 {
     return f1.message() < f2.message();
 }
 
+static bool caseSensitiveMngFortuneLessThan(const MngFortune &f1, const MngFortune &f2)
+{
+    return f1.message() < f2.message();
+}
+
 FortuneController::FortuneController(const FortuneController &)
     : ApplicationController()
 { }
@@ -22,6 +28,18 @@ void FortuneController::index()
     render();
 }
 
+void FortuneController::mindex()
+{
+    QList<MngFortune> fortuneList = MngFortune::getAll();
+    MngFortune fortune;
+    fortune.setMessage(QLatin1String("Additional fortune added at request time."));
+    fortuneList << fortune;
+    // Sort
+    qSort(fortuneList.begin(), fortuneList.end(), caseSensitiveMngFortuneLessThan);
+    texport(fortuneList);
+    render("mindex");
+}
+
 void FortuneController::show(const QString &pk)
 {
     Fortune fortune = Fortune::get(pk.toUInt());

frameworks/C++/treefrog/controllers/fortunecontroller.h

@@ -14,7 +14,8 @@ class T_CONTROLLER_EXPORT FortuneController : public ApplicationController
     bool transactionEnabled() const { return false; }
 
 public slots:
-    void index();
+    void index();   // SQL
+    void mindex();  // MongoDB
     void show(const QString &pk);
     void entry();
     void create();

frameworks/C++/treefrog/controllers/worldcontroller.cpp

@@ -1,5 +1,6 @@
 #include "worldcontroller.h"
 #include "world.h"
+#include "mngworld.h"
 
 
 WorldController::WorldController(const WorldController &)
@@ -139,7 +140,7 @@ void WorldController::updates(const QString &num)
         world = World::get(id);
         world.setRandomNumber( Tf::random(9999) + 1 );
         world.update();
-	worlds << world.toVariantMap();
+        worlds << world.toVariantMap();
     }
     renderJson(worlds);
 }
@@ -156,5 +157,54 @@ void WorldController::remove(const QString &pk)
 }
 
 
+
+/*
+  MongoDB
+ */
+void WorldController::mqueries()
+{
+    mqueries("1");
+}
+
+void WorldController::mqueries(const QString &num)
+{
+    QVariantList worlds;
+    int d = qMin(qMax(num.toInt(), 1), 500);
+
+    for (int i = 0; i < d; ++i) {
+        QString id = QString::number(Tf::random(9999) + 1);
+        worlds << MngWorld::get(id).toVariantMap();
+    }
+    renderJson(worlds);
+}
+
+void WorldController::mrandom()
+{
+    int id = Tf::random(9999) + 1;
+    World world = World::get(id);
+    renderJson(world.toVariantMap());
+}
+
+void WorldController::mupdates()
+{
+    mupdates("1");
+}
+
+void WorldController::mupdates(const QString &num)
+{
+    QVariantList worlds;
+    int d = qMin(qMax(num.toInt(), 1), 500);
+    MngWorld world;
+
+    for (int i = 0; i < d; ++i) {
+        QString id = QString::number(Tf::random(9999) + 1);
+        world = MngWorld::get(id);
+        world.setRandomNumber( Tf::random(9999) + 1 );
+        world.update();
+        worlds << world.toVariantMap();
+    }
+    renderJson(worlds);
+}
+
 // Don't remove below this line
 T_REGISTER_CONTROLLER(worldcontroller)

frameworks/C++/treefrog/controllers/worldcontroller.h

@@ -28,6 +28,13 @@ public slots:
     void updates();
     void remove(const QString &pk);
 
+    // MongoDB
+    void mqueries();
+    void mqueries(const QString &num);
+    void mrandom();
+    void mupdates(const QString &num);
+    void mupdates();
+
 private:
     void renderEntry(const QVariantMap &world = QVariantMap());
     void renderEdit(const QVariantMap &world = QVariantMap());

frameworks/C++/treefrog/helpers/helpers.pro

@@ -2,7 +2,7 @@ TARGET = helper
 TEMPLATE = lib
 CONFIG += shared x86_64 c++11
 QT  -= gui
-QT  += 
+QT  += qml
 DEFINES += TF_DLL
 DESTDIR = ../lib
 DEPENDPATH +=