Merge pull request #2320 from TechEmpower/cleanup-metadata

Cleanup metadata

.travis.yml

@@ -100,7 +100,6 @@ env:
     - "TESTDIR=Java/spring"
     - "TESTDIR=Java/tapestry"
     - "TESTDIR=Java/undertow"
-    - "TESTDIR=Java/undertow-edge"
     - "TESTDIR=Java/undertow-jersey-c3p0"
     - "TESTDIR=Java/undertow-jersey-hikaricp"
     - "TESTDIR=Java/vertx"
@@ -128,7 +127,7 @@ env:
     - "TESTDIR=PHP/cakephp"
     - "TESTDIR=PHP/hhvm"
     - "TESTDIR=PHP/php"
-    - "TESTDIR=PHP/cygnite-php-framework"
+    - "TESTDIR=PHP/cygnite"
     - "TESTDIR=PHP/codeigniter"
     - "TESTDIR=PHP/clancats"
     - "TESTDIR=PHP/fat-free"

frameworks/C++/cpoll_cppsp/benchmark_config.json

@@ -7,18 +7,19 @@
       "plaintext_url": "/plaintext",
       "port": 16969,
       "approach": "Realistic",
-      "classification": "Micro",
+      "classification": "Platform",
       "database": "None",
       "framework": "cpoll-cppsp",
       "language": "C++",
+      "flavor": "None",
       "orm": "Raw",
-      "platform": "CPoll",
+      "platform": "None",
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "cpoll-cppsp",
       "notes": "",
-      "versus": ""
+      "versus": "cpoll_cppsp"
     },
     "raw": {
       "setup_file": "setup",
@@ -32,14 +33,15 @@
       "database": "MySQL",
       "framework": "cpoll-cppsp",
       "language": "C++",
+      "flavor": "None",
       "orm": "Raw",
-      "platform": "CPoll",
+      "platform": "None",
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "cpoll-cppsp-raw",
       "notes": "",
-      "versus": ""
+      "versus": "cpoll_cppsp"
     },
     "postgres-raw": {
       "setup_file": "setup",
@@ -51,14 +53,15 @@
       "database": "Postgres",
       "framework": "cpoll-cppsp",
       "language": "C++",
+      "flavor": "None",
       "orm": "Raw",
-      "platform": "CPoll",
+      "platform": "None",
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "cpoll-cppsp-raw",
       "notes": "",
-      "versus": ""
+      "versus": "cpoll_cppsp"
     },
     "postgres-raw-threadpool": {
       "setup_file": "setup",
@@ -70,14 +73,15 @@
       "database": "Postgres",
       "framework": "cpoll-cppsp",
       "language": "C++",
+      "flavor": "None",
       "orm": "Raw",
-      "platform": "CPoll",
+      "platform": "None",
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "cpoll-pool",
       "notes": "Threadpool",
-      "versus": ""
+      "versus": "cpoll_cppsp"
     }
   }]
 }

frameworks/C++/ffead-cpp/benchmark_config.json

@@ -11,19 +11,19 @@
       "update_url": "/te-benchmark/updates?queries=",
       "port": 8080,
       "approach": "Realistic",
-      "classification": "Fullstack",
+      "classification": "micro",
       "database": "MongoDB",
       "framework": "ffead-cpp",
       "language": "C++",
+      "flavor": "None",
       "orm": "Full",
-      "platform": "ffead-cpp",
+      "platform": "None",
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "ffead-cpp",
       "notes": "",
-      "versus": ""
+      "versus": "ffead-cpp"
     }
   }]
 }
-

frameworks/C++/poco/benchmark_config.json

@@ -8,17 +8,17 @@
       "approach": "Realistic",
       "classification": "Platform",
       "database": "none",
-      "framework": "POCO",
+      "framework": "None",
       "language": "C++",
+      "flavor": "None",
       "orm": "Raw",
-      "platform": "POCO",
-      "webserver": "poco",
+      "platform": "None",
+      "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "POCO",
       "notes": "",
-      "versus": ""
+      "versus": "poco"
     }
   }]
 }
-

frameworks/C++/silicon/benchmark_config.json

@@ -15,14 +15,15 @@
       "database": "MySQL",
       "framework": "silicon",
       "language": "C++",
+      "flavor": "None",
       "orm": "Full",
-      "platform": "Silicon",
+      "platform": "None",
       "webserver": "microhttpd",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "silicon-tpc-mysql",
       "notes": "",
-      "versus": ""
+      "versus": "silicon"
     },
     "epoll-mysql": {
       "setup_file": "setup_mhd_epoll_mysql",
@@ -38,14 +39,15 @@
       "database": "MySQL",
       "framework": "silicon",
       "language": "C++",
+      "flavor": "None",
       "orm": "Full",
-      "platform": "Silicon",
+      "platform": "None",
       "webserver": "microhttpd",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "silicon-epoll-mysql",
       "notes": "",
-      "versus": ""
+      "versus": "silicon"
     },
     "lwan-mysql": {
       "setup_file": "setup_lwan_mysql",
@@ -61,14 +63,15 @@
       "database": "MySQL",
       "framework": "silicon",
       "language": "C++",
+      "flavor": "None",
       "orm": "Full",
-      "platform": "Silicon",
+      "platform": "None",
       "webserver": "Lwan",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "silicon-lwan-mysql",
       "notes": "",
-      "versus": ""
+      "versus": "silicon"
     }
     
   }]

frameworks/C++/treefrog/benchmark_config.json

@@ -16,7 +16,7 @@
       "framework": "treefrog",
       "language": "C++",
       "orm": "Micro",
-      "platform": "Treefrog",
+      "platform": "None",
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
@@ -38,14 +38,15 @@
       "database": "MySQL",
       "framework": "treefrog",
       "language": "C++",
+      "flavor": "None",
       "orm": "Micro",
-      "platform": "Treefrog",
+      "platform": "None",
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "treefrog-hybrid",
       "notes": "",
-      "versus": ""
+      "versus": "treefrog"
     },
     "postgres": {
       "setup_file": "setup-postgres",
@@ -61,8 +62,9 @@
       "database": "Postgres",
       "framework": "treefrog",
       "language": "C++",
+      "flavor": "None",
       "orm": "Micro",
-      "platform": "Treefrog",
+      "platform": "None",
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
@@ -85,13 +87,13 @@
       "framework": "treefrog",
       "language": "C++",
       "orm": "Micro",
-      "platform": "Treefrog",
+      "platform": "None",
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "treefrog-mongo",
       "notes": "",
-      "versus": ""
+      "versus": "treefrog"
     }
   }]
 }

frameworks/C++/ulib/benchmark_config.json

@@ -11,7 +11,7 @@
       "framework": "ULib",
       "language": "C++",
       "orm": "Micro",
-      "platform": "ULib",
+      "platform": "None",
       "webserver": "ULib",
       "os": "Linux",
       "database_os": "Linux",
@@ -19,7 +19,7 @@
       "notes": "",
       "versus": ""
     },
-    "json_normal": {
+    "json": {
       "setup_file": "setup_json",
       "json_url": "/json",
       "port": 8080,
@@ -29,61 +29,7 @@
       "framework": "ULib",
       "language": "C++",
       "orm": "Micro",
-      "platform": "ULib",
-      "webserver": "ULib",
-      "os": "Linux",
-      "database_os": "Linux",
-      "display_name": "ULib",
-      "notes": "",
-      "versus": ""
-    },
-    "json_medium": {
-      "setup_file": "setup_json_medium",
-      "json_url": "/json",
-      "port": 8080,
-      "approach": "Realistic",
-      "classification": "Platform",
-      "database": "None",
-      "framework": "ULib",
-      "language": "C++",
-      "orm": "Micro",
-      "platform": "ULib",
-      "webserver": "ULib",
-      "os": "Linux",
-      "database_os": "Linux",
-      "display_name": "ULib",
-      "notes": "",
-      "versus": ""
-    },
-    "json_large": {
-      "setup_file": "setup_json_large",
-      "json_url": "/json",
-      "port": 8080,
-      "approach": "Realistic",
-      "classification": "Platform",
-      "database": "None",
-      "framework": "ULib",
-      "language": "C++",
-      "orm": "Micro",
-      "platform": "ULib",
-      "webserver": "ULib",
-      "os": "Linux",
-      "database_os": "Linux",
-      "display_name": "ULib",
-      "notes": "",
-      "versus": ""
-    },
-    "json_extra": {
-      "setup_file": "setup_json_extra",
-      "json_url": "/json",
-      "port": 8080,
-      "approach": "Realistic",
-      "classification": "Platform",
-      "database": "None",
-      "framework": "ULib",
-      "language": "C++",
-      "orm": "Micro",
-      "platform": "ULib",
+      "platform": "None",
       "webserver": "ULib",
       "os": "Linux",
       "database_os": "Linux",
@@ -104,7 +50,7 @@
       "framework": "ULib",
       "language": "C++",
       "orm": "Micro",
-      "platform": "ULib",
+      "platform": "None",
       "webserver": "ULib",
       "os": "Linux",
       "database_os": "Linux",
@@ -125,7 +71,7 @@
       "framework": "ULib",
       "language": "C++",
       "orm": "Micro",
-      "platform": "ULib",
+      "platform": "None",
       "webserver": "ULib",
       "os": "Linux",
       "database_os": "Linux",
@@ -133,26 +79,6 @@
       "notes": "",
       "versus": ""
     },
-    "sqlite": {
-      "setup_file": "setup_sqlite",
-      "db_url": "/db",
-      "query_url": "/query?queries=",
-      "fortune_url": "/fortune",
-      "port": 8080,
-      "approach": "Realistic",
-      "classification": "Platform",
-      "database": "SQLite",
-      "framework": "ULib",
-      "language": "C++",
-      "orm": "Micro",
-      "platform": "ULib",
-      "webserver": "ULib",
-      "os": "Linux",
-      "database_os": "Linux",
-      "display_name": "ULib-sqlite",
-      "notes": "",
-      "versus": ""
-    },
     "mongodb": {
       "setup_file": "setup_mongodb",
       "db_url": "/mdb",
@@ -166,7 +92,7 @@
       "framework": "ULib",
       "language": "C++",
       "orm": "Micro",
-      "platform": "ULib",
+      "platform": "None",
       "webserver": "ULib",
       "os": "Linux",
       "database_os": "Linux",

frameworks/C++/wt/benchmark_config.json

@@ -15,13 +15,15 @@
      	"database": "MySQL",
      	"framework": "wt",
      	"language": "C++",
+          "flavor": "None",
      	"orm": "Full",
-     	"platform": "Wt",
+     	"platform": "None",
      	"webserver": "None",
      	"os": "Linux",
      	"database_os": "Linux",
      	"display_name": "wt",
-     	"notes": ""
+     	"notes": "",
+          "versus": "wt"
      },
      "postgres": {
      	"setup_file": "setup_postgres",
@@ -35,13 +37,15 @@
      	"database": "Postgres",
      	"framework": "wt",
      	"language": "C++",
+          "flavor": "None",
      	"orm": "Full",
-     	"platform": "Wt",
+     	"platform": "None",
      	"webserver": "None",
      	"os": "Linux",
      	"database_os": "Linux",
      	"display_name": "wt-postgres",
-     	"notes": ""
+     	"notes": "",
+          "versus": "wt"
      }
   }]
 }

frameworks/C/duda/benchmark_config.json

@@ -8,17 +8,18 @@
       "port": 2001,
       "approach": "Realistic",
       "classification": "Platform",
-      "database": "none",
-      "framework": "Duda",
+      "database": "None",
+      "framework": "None",
       "language": "C",
+      "flavor": "None",
       "orm": "Raw",
-      "platform": "Duda I/O",
+      "platform": "duda",
       "webserver": "Monkey",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "Duda I/O",
       "notes": "",
-      "versus": ""
+      "versus": "duda"
     }
   }]
 }

frameworks/C/h2o/benchmark_config.json

@@ -13,14 +13,15 @@
       "approach": "Realistic",
       "classification": "Platform",
       "database": "Postgres",
-      "framework": "H2O",
+      "framework": "None",
       "language": "C",
+      "flavor": "None",
       "orm": "Raw",
-      "platform": "H2O",
-      "webserver": "H2O",
+      "platform": "None",
+      "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "h2o",
+      "display_name": "H2O",
       "notes": ""
     }
   }]

frameworks/C/haywire/benchmark_config.json

@@ -6,17 +6,18 @@
       "plaintext_url": "/plaintext",
       "port": 8000,
       "approach": "Realistic",
-      "classification": "Micro",
+      "classification": "Platform",
       "database": "None",
-      "framework": "haywire",
+      "framework": "None",
       "language": "C",
+      "flavor": "None",
       "orm": "Raw",
       "platform": "haywire",
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
       "notes": "",
-      "versus": ""
+      "versus": "haywire"
     }
   }]
 }

frameworks/C/libreactor/benchmark_config.json

@@ -9,15 +9,16 @@
       "approach": "Realistic",
       "classification": "Platform",
       "database": "None",
-      "framework": "libreactor",
+      "framework": "None",
       "language": "C",
+      "flavor": "None",
       "orm": "Raw",
       "platform": "libreactor",
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
       "notes": "",
-      "versus": ""
+      "versus": "libreactor"
     }
   }]
 }

frameworks/C/lwan/benchmark_config.json

@@ -9,16 +9,17 @@
       "approach": "Realistic",
       "classification": "Platform",
       "database": "None",
-      "framework": "lwan",
+      "framework": "None",
       "language": "C",
+      "flavor": "None",
       "orm": "Raw",
       "platform": "Lwan",
-      "webserver": "Lwan",
+      "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "Lwan",
       "notes": "",
-      "versus": ""
+      "versus": "lwan"
     },
     "sqlite": {
       "setup_file": "setup",
@@ -29,16 +30,17 @@
       "approach": "Realistic",
       "classification": "Platform",
       "database": "SQLite",
-      "framework": "lwan",
+      "framework": "None",
       "language": "C",
+      "flavor": "None",
       "orm": "Raw",
       "platform": "Lwan",
-      "webserver": "Lwan",
+      "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "Lwan",
       "notes": "",
-      "versus": ""
+      "versus": "lwan"
     },
     "mysql": {
       "setup_file": "setup-mysql",
@@ -49,16 +51,17 @@
       "approach": "Realistic",
       "classification": "Platform",
       "database": "MySQL",
-      "framework": "lwan",
+      "framework": "None",
       "language": "C",
+      "flavor": "None",
       "orm": "Raw",
       "platform": "Lwan",
-      "webserver": "Lwan",
+      "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "Lwan",
       "notes": "",
-      "versus": ""
+      "versus": "lwan"
     }
   }]
 }

frameworks/C/onion/benchmark_config.json

@@ -8,16 +8,17 @@
       "approach": "Realistic",
       "classification": "Platform",
       "database": "None",
-      "framework": "onion",
+      "framework": "None",
       "language": "C",
+      "flavor": "None",
       "orm": "Raw",
-      "platform": "Onion",
+      "platform": "None",
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "onion",
       "notes": "",
-      "versus": ""
+      "versus": "onion"
     },
     "raw": {
       "setup_file": "setup",
@@ -28,16 +29,17 @@
       "approach": "Realistic",
       "classification": "Platform",
       "database": "MySQL",
-      "framework": "onion",
+      "framework": "None",
       "language": "C",
+      "flavor": "None",
       "orm": "Raw",
-      "platform": "Onion",
+      "platform": "None",
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "onion",
       "notes": "",
-      "versus": ""
+      "versus": "onion"
     }
   }]
 }

frameworks/CSharp/HttpListener/benchmark_config.json

@@ -6,19 +6,20 @@
       "json_url": "/json",
       "plaintext_url": "/plaintext",
       "port": 8080,
-      "approach": "Realistic",
+      "approach": "Stripped",
       "classification": "Platform",
       "database": "None",
-      "framework": "http-listener",
+      "framework": "None",
       "language": "C#",
+      "flavor": "Microsoft",
       "orm": "Raw",
-      "platform": "NET",
-      "webserver": "HTTP.sys",
+      "platform": "None",
+      "webserver": "None",
       "os": "Windows",
       "database_os": "Linux",
       "display_name": "http-listener",
       "notes": "",
-      "versus": ""
+      "versus": "HttpListener"
     },
     "mysql-raw": {
       "setup_file": "setup",
@@ -27,14 +28,15 @@
       "fortune_url": "/fortunes?provider=mysql",
       "update_url": "/updates?provider=mysql&queries=",
       "port": 8080,
-      "approach": "Realistic",
+      "approach": "Stripped",
       "classification": "Platform",
       "database": "MySQL",
-      "framework": "http-listener",
+      "framework": "None",
       "language": "C#",
+      "flavor": "Microsoft",
       "orm": "Raw",
-      "platform": "NET",
-      "webserver": "HTTP.sys",
+      "platform": "None",
+      "webserver": "None",
       "os": "Windows",
       "database_os": "Linux",
       "display_name": "http-listener",
@@ -48,14 +50,14 @@
       "fortune_url": "/fortunes?provider=postgresql",
       "update_url": "/updates?provider=postgresql&queries=",
       "port": 8080,
-      "approach": "Realistic",
+      "approach": "Stripped",
       "classification": "Platform",
       "database": "Postgres",
-      "framework": "http-listener",
+      "framework": "None",
       "language": "C#",
       "orm": "Raw",
-      "platform": "NET",
-      "webserver": "HTTP.sys",
+      "platform": "None",
+      "webserver": "None",
       "os": "Windows",
       "database_os": "Linux",
       "display_name": "http-listener",
@@ -69,14 +71,15 @@
       "fortune_url": "/mongodbfortunes",
       "update_url": "/mongodbupdates?queries=",
       "port": 8080,
-      "approach": "Realistic",
+      "approach": "Stripped",
       "classification": "Platform",
       "database": "MongoDB",
-      "framework": "http-listener",
+      "framework": "None",
       "language": "C#",
+      "flavor": "Microsoft",
       "orm": "Raw",
-      "platform": "NET",
-      "webserver": "HTTP.sys",
+      "platform": "None",
+      "webserver": "None",
       "os": "Windows",
       "database_os": "Linux",
       "display_name": "http-listener",
@@ -90,14 +93,15 @@
       "fortune_url": "/fortunes?provider=sqlserver",
       "update_url": "/updates?provider=sqlserver&queries=",
       "port": 8080,
-      "approach": "Realistic",
+      "approach": "Stripped",
       "classification": "Platform",
       "database": "SQLServer",
-      "framework": "http-listener",
+      "framework": "None",
       "language": "C#",
+      "flavor": "Microsoft",
       "orm": "Raw",
-      "platform": "NET",
-      "webserver": "HTTP.sys",
+      "platform": "None",
+      "webserver": "None",
       "os": "Windows",
       "database_os": "Windows",
       "display_name": "http-listener",

frameworks/CSharp/aspnet-stripped/benchmark_config.json

@@ -9,16 +9,17 @@
       "approach": "Stripped",
       "classification": "Fullstack",
       "database": "None",
-      "framework": "aspnet",
+      "framework": "ASP.NET",
       "language": "C#",
+      "flavor": "Microsoft",
       "orm": "Raw",
-      "platform": "NET",
+      "platform": ".NET",
       "webserver": "IIS",
       "os": "Windows",
       "database_os": "Linux",
-      "display_name": "aspnet-stripped",
+      "display_name": "asp.net-stripped",
       "notes": "",
-      "versus": ""
+      "versus": "aspnet-stripped"
     },
     "mysql-raw": {
       "setup_file": "setup_iis",
@@ -30,16 +31,17 @@
       "approach": "Stripped",
       "classification": "Fullstack",
       "database": "MySQL",
-      "framework": "aspnet",
+      "framework": "ASP.NET",
       "language": "C#",
+      "flavor": "Microsoft",
       "orm": "Raw",
-      "platform": "NET",
+      "platform": ".NET",
       "webserver": "IIS",
       "os": "Windows",
       "database_os": "Linux",
-      "display_name": "aspnet-stripped-raw",
+      "display_name": "asp.net-stripped-raw",
       "notes": "",
-      "versus": ""
+      "versus": "aspnet-stripped"
     },
     "postgresql-raw": {
       "setup_file": "setup_iis",
@@ -51,16 +53,17 @@
       "approach": "Stripped",
       "classification": "Fullstack",
       "database": "Postgres",
-      "framework": "aspnet",
+      "framework": "ASP.NET",
       "language": "C#",
+      "flavor": "Microsoft",
       "orm": "Raw",
-      "platform": "NET",
+      "platform": ".NET",
       "webserver": "IIS",
       "os": "Windows",
       "database_os": "Linux",
-      "display_name": "aspnet-stripped-raw",
+      "display_name": "asp.net-stripped-raw",
       "notes": "",
-      "versus": ""
+      "versus": "asnet-stripped"
     },
     "mongodb-raw": {
       "setup_file": "setup_iis",
@@ -72,16 +75,17 @@
       "approach": "Stripped",
       "classification": "Fullstack",
       "database": "MongoDB",
-      "framework": "aspnet",
+      "framework": "ASP.NET",
       "language": "C#",
+      "flavor": "Microsoft",
       "orm": "Raw",
-      "platform": "NET",
+      "platform": ".NET",
       "webserver": "IIS",
       "os": "Windows",
       "database_os": "Linux",
-      "display_name": "aspnet-stripped-raw",
+      "display_name": "asp.net-stripped-raw",
       "notes": "",
-      "versus": ""
+      "versus": "aspnet-stripped"
     },
     "sqlserver-raw": {
       "setup_file": "setup_iis",
@@ -93,16 +97,17 @@
       "approach": "Stripped",
       "classification": "Fullstack",
       "database": "SQLServer",
-      "framework": "aspnet",
+      "framework": "ASP.NET",
       "language": "C#",
+      "flavor": "Microsoft",
       "orm": "Raw",
-      "platform": "NET",
+      "platform": ".NET",
       "webserver": "IIS",
       "os": "Windows",
       "database_os": "Windows",
-      "display_name": "aspnet-stripped-raw",
+      "display_name": "asp.net-stripped-raw",
       "notes": "",
-      "versus": ""
+      "versus": "aspnet-stripped"
     }
   }]
 }

frameworks/CSharp/aspnet/benchmark_config.json

@@ -9,52 +9,55 @@
       "approach": "Realistic",
       "classification": "Fullstack",
       "database": "None",
-      "framework": "aspnet-mvc",
+      "framework": "asp.net",
       "language": "C#",
+      "flavor": "Microsoft",
       "orm": "Raw",
-      "platform": "NET",
+      "platform": ".NET",
       "webserver": "IIS",
       "os": "Windows",
       "database_os": "Linux",
-      "display_name": "aspnet",
+      "display_name": "asp.net",
       "notes": "",
-      "versus": ""
+      "versus": "aspnet"
     },
     "jsonnet": {
       "setup_file": "setup_iis",
       "json_url": "/json/jsonnet",
       "port": 8080,
       "approach": "Realistic",
-      "classification": "Platform",
+      "classification": "Fullstack",
       "database": "None",
-      "framework": "aspnet",
+      "framework": "asp.net",
       "language": "C#",
+      "flavor": "Microsoft",
       "orm": "Raw",
-      "platform": "NET",
+      "platform": ".NET",
       "webserver": "IIS",
       "os": "Windows",
       "database_os": "Linux",
-      "display_name": "aspnet-jsonnet",
+      "display_name": "jsonnet",
       "notes": "",
-      "versus": ""
+      "versus": "aspnet"
     },
     "servicestack": {
       "setup_file": "setup_iis",
       "json_url": "/json/servicestack",
       "port": 8080,
       "approach": "Realistic",
-      "classification": "Platform",
+      "classification": "Fullstack",
       "database": "None",
-      "framework": "aspnet",
+      "framework": "asp.net",
       "language": "C#",
+      "flavor": "Microsoft",
       "orm": "Raw",
-      "platform": "NET",
+      "platform": ".NET",
       "webserver": "IIS",
       "os": "Windows",
       "database_os": "Linux",
-      "display_name": "aspnet-svcstk",
+      "display_name": "servicestack",
       "notes": "",
-      "versus": ""
+      "versus": "aspnet"
     },
     "mysql-raw": {
       "setup_file": "setup_iis",
@@ -66,16 +69,17 @@
       "approach": "Realistic",
       "classification": "Fullstack",
       "database": "MySQL",
-      "framework": "aspnet-mvc",
+      "framework": "asp.net",
       "language": "C#",
+      "flavor": "Microsoft",
       "orm": "Raw",
-      "platform": "NET",
+      "platform": ".NET",
       "webserver": "IIS",
       "os": "Windows",
       "database_os": "Linux",
-      "display_name": "aspnet-mvc-raw",
+      "display_name": "asp.net-raw",
       "notes": "",
-      "versus": ""
+      "versus": "aspnet"
     },
     "postgresql-raw": {
       "setup_file": "setup_iis",
@@ -87,16 +91,17 @@
       "approach": "Realistic",
       "classification": "Fullstack",
       "database": "Postgres",
-      "framework": "aspnet-mvc",
+      "framework": "asp.net",
       "language": "C#",
+      "flavor": "Microsoft",
       "orm": "Raw",
-      "platform": "NET",
+      "platform": ".NET",
       "webserver": "IIS",
       "os": "Windows",
       "database_os": "Linux",
-      "display_name": "aspnet-mvc-raw",
+      "display_name": "asp.net-raw",
       "notes": "",
-      "versus": ""
+      "versus": "aspnet"
     },
     "mongodb-raw": {
       "setup_file": "setup_iis",
@@ -108,16 +113,17 @@
       "approach": "Realistic",
       "classification": "Fullstack",
       "database": "MongoDB",
-      "framework": "aspnet-mvc",
+      "framework": "asp.net",
       "language": "C#",
+      "flavor": "Microsoft",
       "orm": "Raw",
-      "platform": "NET",
+      "platform": ".NET",
       "webserver": "IIS",
       "os": "Windows",
       "database_os": "Linux",
-      "display_name": "aspnet-mvc-raw",
+      "display_name": "asp.net-raw",
       "notes": "",
-      "versus": ""
+      "versus": "aspnet"
     },
     "sqlserver-raw": {
       "setup_file": "setup_iis",
@@ -129,16 +135,17 @@
       "approach": "Realistic",
       "classification": "Fullstack",
       "database": "SQLServer",
-      "framework": "aspnet-mvc",
+      "framework": "asp.net-mvc",
       "language": "C#",
+      "flavor": "Microsoft",
       "orm": "Raw",
-      "platform": "NET",
+      "platform": ".NET",
       "webserver": "IIS",
       "os": "Windows",
       "database_os": "Windows",
-      "display_name": "aspnet-mvc-raw",
+      "display_name": "aspnet-raw",
       "notes": "",
-      "versus": ""
+      "versus": "aspnet"
     },
     "mysql-entityframework": {
       "setup_file": "setup_iis",
@@ -150,16 +157,17 @@
       "approach": "Realistic",
       "classification": "Fullstack",
       "database": "MySQL",
-      "framework": "aspnet-mvc",
+      "framework": "EntityFramework",
       "language": "C#",
+      "flavor": "Microsoft",
       "orm": "Full",
-      "platform": "NET",
+      "platform": ".NET",
       "webserver": "IIS",
       "os": "Windows",
       "database_os": "Linux",
-      "display_name": "aspnet-mvc",
+      "display_name": "EntityFramework",
       "notes": "",
-      "versus": ""
+      "versus": "aspnet"
     },
     "postgresql-entityframework": {
       "setup_file": "setup_iis",
@@ -171,16 +179,17 @@
       "approach": "Realistic",
       "classification": "Fullstack",
       "database": "Postgres",
-      "framework": "aspnet-mvc",
+      "framework": "EntityFramework",
       "language": "C#",
+      "flavor": "Microsoft",
       "orm": "Full",
-      "platform": "NET",
+      "platform": ".NET",
       "webserver": "IIS",
       "os": "Windows",
       "database_os": "Linux",
-      "display_name": "aspnet-mvc",
+      "display_name": "EntityFramework",
       "notes": "",
-      "versus": ""
+      "versus": "aspnet"
     },
     "sqlserver-entityframework": {
       "setup_file": "setup_iis",
@@ -192,16 +201,17 @@
       "approach": "Realistic",
       "classification": "Fullstack",
       "database": "SQLServer",
-      "framework": "aspnet-mvc",
+      "framework": "EntityFramework",
       "language": "C#",
+      "flavor": "Microsoft",
       "orm": "Full",
-      "platform": "NET",
+      "platform": ".NET",
       "webserver": "IIS",
       "os": "Windows",
       "database_os": "Windows",
-      "display_name": "aspnet-mvc",
+      "display_name": "EntityFramework",
       "notes": "",
-      "versus": ""
+      "versus": "aspnet"
     },
     "mono": {
       "setup_file": "setup_nginx",
@@ -209,54 +219,57 @@
       "plaintext_url": "/plaintext",
       "port": 8080,
       "approach": "Realistic",
-      "classification": "Fullstack",
+      "classification": "Platform",
       "database": "None",
-      "framework": "aspnet-mvc",
+      "framework": "None",
       "language": "C#",
+      "flavor": "Mono",
       "orm": "Raw",
-      "platform": "Mono",
+      "platform": "ASP.NET",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "aspnet-mvc-mono",
+      "display_name": "ASP.NET",
       "notes": "",
-      "versus": ""
+      "versus": "aspnet-mono"
     },
     "mono-jsonnet": {
       "setup_file": "setup_nginx",
       "json_url": "/json/jsonnet",
       "port": 8080,
       "approach": "Realistic",
-      "classification": "Platform",
+      "classification": "Fullstack",
       "database": "None",
-      "framework": "aspnet",
+      "framework": "JSONNet",
       "language": "C#",
+      "flavor": "Mono",
       "orm": "Raw",
-      "platform": "Mono",
+      "platform": "ASP.NET",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "aspnet-jsonnet-mono",
+      "display_name": "JSONNet",
       "notes": "",
-      "versus": ""
+      "versus": "aspnet-mono"
     },
     "mono-servicestack": {
       "setup_file": "setup_nginx",
       "json_url": "/json/servicestack",
       "port": 8080,
       "approach": "Realistic",
-      "classification": "Platform",
+      "classification": "Fullstack",
       "database": "None",
-      "framework": "aspnet",
+      "framework": "ServiceStack",
       "language": "C#",
+      "flavor": "Mono",
       "orm": "Raw",
-      "platform": "Mono",
+      "platform": "ASP.NET",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "aspnet-svcstk-mono",
+      "display_name": "ServiceStack",
       "notes": "",
-      "versus": ""
+      "versus": "aspnet-mono"
     },
     "mono-mysql-raw": {
       "setup_file": "setup_nginx",
@@ -268,18 +281,19 @@
       "update_url": "/ado/mysql/update?queries=",
       "port": 8080,
       "approach": "Realistic",
-      "classification": "Fullstack",
+      "classification": "Platform",
       "database": "MySQL",
-      "framework": "aspnet-mvc",
+      "framework": "None",
       "language": "C#",
+      "flavor": "Mono",
       "orm": "Raw",
-      "platform": "Mono",
+      "platform": "ASP.NET",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "aspnet-mvc-mono-raw",
+      "display_name": "ASP.NET-raw",
       "notes": "",
-      "versus": ""
+      "versus": "aspnet"
     },
     "mono-postgresql-raw": {
       "setup_file": "setup_nginx",
@@ -289,18 +303,19 @@
       "update_url": "/ado/postgresql/update?queries=",
       "port": 8080,
       "approach": "Realistic",
-      "classification": "Fullstack",
+      "classification": "Platform",
       "database": "Postgres",
-      "framework": "aspnet-mvc",
+      "framework": "None",
       "language": "C#",
+      "flavor": "Mono",
       "orm": "Raw",
-      "platform": "Mono",
+      "platform": "ASP.NET",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "aspnet-mvc-mono-raw",
+      "display_name": "ASP.NET-raw",
       "notes": "",
-      "versus": ""
+      "versus": "aspnet"
     },
     "mono-mongodb-raw": {
       "setup_file": "setup_nginx",
@@ -310,18 +325,19 @@
       "update_url": "/mongodb/update?queries=",
       "port": 8080,
       "approach": "Realistic",
-      "classification": "Fullstack",
+      "classification": "Platform",
       "database": "MongoDB",
-      "framework": "aspnet-mvc",
+      "framework": "None",
       "language": "C#",
+      "flavor": "Mono",
       "orm": "Raw",
-      "platform": "Mono",
+      "platform": "ASP.NET",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "aspnet-mvc-mono-raw",
+      "display_name": "aspnet-raw",
       "notes": "",
-      "versus": ""
+      "versus": "aspnet"
     },
     "mono-mysql-entityframework": {
       "setup_file": "setup_nginx",
@@ -333,16 +349,17 @@
       "approach": "Realistic",
       "classification": "Fullstack",
       "database": "MySQL",
-      "framework": "aspnet-mvc",
+      "framework": "EntityFramework",
       "language": "C#",
+      "flavor": "Mono",
       "orm": "Full",
-      "platform": "Mono",
+      "platform": "ASP.NET",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "aspnet-mvc-mono",
+      "display_name": "EntityFramework",
       "notes": "Entity framework",
-      "versus": ""
+      "versus": "aspnet"
     },
     "mono-postgresql-entityframework": {
       "setup_file": "setup_nginx",
@@ -354,16 +371,17 @@
       "approach": "Realistic",
       "classification": "Fullstack",
       "database": "Postgres",
-      "framework": "aspnet-mvc",
+      "framework": "EntityFramework",
       "language": "C#",
+      "flavor": "Mono",
       "orm": "Full",
-      "platform": "Mono",
+      "platform": "ASP.NET",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "aspnet-mvc-mono",
+      "display_name": "EntityFramework",
       "notes": "Entity framework",
-      "versus": ""
+      "versus": "aspnet"
     }
   }]
 }

frameworks/CSharp/aspnetcore/benchmark_config.json

@@ -10,6 +10,7 @@
       "database": "None",
       "framework": "aspnetcore",
       "language": "C#",
+      "flavor": "Mono",
       "orm": "Raw",
       "platform": "NET",
       "flavor": "CoreCLR",

frameworks/CSharp/evhttp-sharp/benchmark_config.json

@@ -11,14 +11,15 @@
       "database": "None",
       "framework": "evhttp-sharp",
       "language": "C#",
+      "flavor": "Mono",
       "orm": "Raw",
-      "platform": "Mono",
+      "platform": "None",
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "evhttp-sharp",
       "notes": "",
-      "versus": ""
+      "versus": "evhttp-sharp"
     }
   }]
 }

frameworks/CSharp/nancy/benchmark_config.json

@@ -13,14 +13,15 @@
       "database": "MySQL",
       "framework": "nancy",
       "language": "C#",
+      "flavor": "Microsoft",
       "orm": "Raw",
-      "platform": "NET",
+      "platform": ".NET",
       "webserver": "IIS",
       "os": "Windows",
       "database_os": "Linux",
       "display_name": "nancy",
       "notes": "",
-      "versus": ""
+      "versus": "nancy"
     },
     "mono": {
       "setup_file": "setup_nginx",
@@ -34,14 +35,15 @@
       "database": "MySQL",
       "framework": "nancy",
       "language": "C#",
+      "flavor": "Mono",
       "orm": "Raw",
-      "platform": "Mono",
+      "platform": ".NET",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "nancy",
       "notes": "",
-      "versus": ""
+      "versus": "nancy"
     }
 
   }]

frameworks/CSharp/revenj/benchmark_config.json

@@ -1,5 +1,5 @@
 {
-  "framework": "Revenj.NET",
+  "framework": "Revenj",
   "tests": [{
     "windows": {
       "setup_file": "setup",
@@ -11,18 +11,19 @@
       "fortune_url": "/bench/fortunes",
       "port": 8080,
       "approach": "Realistic",
-      "classification": "Platform",
+      "classification": "Fullstack",
       "database": "Postgres",
       "database_os": "Linux",
-      "framework": "Revenj.NET",
+      "framework": "Revenj",
       "language": "C#",
+      "flavor": "Microsoft",
       "orm": "Full",
-      "platform": ".NET",
-      "webserver": "Revenj.NET",
+      "platform": "None",
+      "webserver": "None",
       "os": "Windows",
-      "display_name": "Revenj.NET",
+      "display_name": "Revenj",
       "notes": "",
-      "versus": ""
+      "versus": "Revenj"
     },
     "default": {
       "setup_file": "setup",
@@ -34,18 +35,19 @@
       "fortune_url": "/bench/fortunes",
       "port": 8080,
       "approach": "Realistic",
-      "classification": "Platform",
+      "classification": "Fullstack",
       "database": "Postgres",
       "database_os": "Linux",
-      "framework": "Revenj.NET",
+      "framework": "Revenj",
       "language": "C#",
+      "flavor": "Mono",
       "orm": "Full",
-      "platform": "Mono",
-      "webserver": "Revenj.NET",
+      "platform": "None",
+      "webserver": "None",
       "os": "Linux",
-      "display_name": "Revenj.NET",
+      "display_name": "Revenj",
       "notes": "",
-      "versus": ""
+      "versus": "Revenj"
     }
   }]
 }

frameworks/CSharp/servicestack/benchmark_config.json

@@ -7,18 +7,19 @@
       "plaintext_url": "/plaintext",
       "port": 8080,
       "approach": "Realistic",
-      "classification": "Platform",
+      "classification": "Fullstack",
       "database": "None",
       "framework": "servicestack",
       "language": "C#",
+      "flavor": "Microsoft",
       "orm": "Raw",
-      "platform": "NET",
+      "platform": "None",
       "webserver": "IIS",
       "os": "Windows",
       "database_os": "Linux",
       "display_name": "servicestack",
       "notes": "",
-      "versus": ""
+      "versus": "servicestack"
     },
     "iis-sqlserver": {
       "setup_file": "setup_iis",
@@ -28,18 +29,19 @@
       "update_url": "/sqlserver/updates/",
       "port": 8080,
       "approach": "Realistic",
-      "classification": "Platform",
+      "classification": "Fullstack",
       "database": "SQLServer",
       "framework": "servicestack",
       "language": "C#",
+      "flavor": "Microsoft",
       "orm": "Raw",
-      "platform": "NET",
+      "platform": "None",
       "webserver": "IIS",
       "os": "Windows",
       "database_os": "Windows",
       "display_name": "servicestack",
       "notes": "",
-      "versus": ""
+      "versus": "servicestack"
     },
     "iis-mysql": {
       "setup_file": "setup_iis",
@@ -49,18 +51,19 @@
       "update_url": "/mysql/updates/",
       "port": 8080,
       "approach": "Realistic",
-      "classification": "Platform",
+      "classification": "Fullstack",
       "database": "MySQL",
       "framework": "servicestack",
       "language": "C#",
+      "flavor": "Microsoft",
       "orm": "Raw",
-      "platform": "NET",
+      "platform": "None",
       "webserver": "IIS",
       "os": "Windows",
       "database_os": "Linux",
       "display_name": "servicestack",
       "notes": "",
-      "versus": ""
+      "versus": "servicestack"
     },
     "iis-postgresql": {
       "setup_file": "setup_iis",
@@ -70,18 +73,19 @@
       "update_url": "/postgresql/updates/",
       "port": 8080,
       "approach": "Realistic",
-      "classification": "Platform",
+      "classification": "Fullstack",
       "database": "Postgres",
       "framework": "servicestack",
       "language": "C#",
+      "flavor": "Microsoft",
       "orm": "Raw",
-      "platform": "NET",
+      "platform": "None",
       "webserver": "IIS",
       "os": "Windows",
       "database_os": "Linux",
       "display_name": "servicestack",
       "notes": "",
-      "versus": ""
+      "versus": "servicestack"
     },
     "iis-mongodb": {
       "setup_file": "setup_iis",
@@ -92,18 +96,19 @@
       "update_url": "/mongodb/updates/",
       "port": 8080,
       "approach": "Realistic",
-      "classification": "Platform",
+      "classification": "Fullstack",
       "database": "MongoDB",
       "framework": "servicestack",
       "language": "C#",
+      "flavor": "Microsoft",
       "orm": "Raw",
-      "platform": "NET",
+      "platform": "None",
       "webserver": "IIS",
       "os": "Windows",
       "database_os": "Linux",
       "display_name": "servicestack",
       "notes": "",
-      "versus": ""
+      "versus": "servicestack"
     },
     "nginx-default": {
       "setup_file": "setup_nginx",
@@ -111,18 +116,19 @@
       "plaintext_url": "/plaintext",
       "port": 8080,
       "approach": "Realistic",
-      "classification": "Platform",
+      "classification": "Fullstack",
       "database": "None",
       "framework": "servicestack",
       "language": "C#",
+      "flavor": "Mono",
       "orm": "Raw",
-      "platform": "Mono",
+      "platform": "None",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "servicestack",
       "notes": "",
-      "versus": ""
+      "versus": "servicestack"
     },
     "nginx-sqlserver": {
       "setup_file": "setup_nginx",
@@ -132,12 +138,13 @@
       "update_url": "/sqlserver/updates/",
       "port": 8080,
       "approach": "Realistic",
-      "classification": "Platform",
+      "classification": "Fullstack",
       "database": "SQLServer",
       "framework": "servicestack",
       "language": "C#",
+      "flavor": "Mono",
       "orm": "Raw",
-      "platform": "Mono",
+      "platform": "None",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Windows",
@@ -153,18 +160,19 @@
       "update_url": "/mysql/updates/",
       "port": 8080,
       "approach": "Realistic",
-      "classification": "Platform",
+      "classification": "Fullstack",
       "database": "MySQL",
       "framework": "servicestack",
       "language": "C#",
+      "flavor": "Mono",
       "orm": "Raw",
-      "platform": "Mono",
+      "platform": "None",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "servicestack",
       "notes": "",
-      "versus": ""
+      "versus": "servicestack"
     },
     "nginx-postgresql": {
       "setup_file": "setup_nginx",
@@ -174,18 +182,19 @@
       "update_url": "/postgresql/updates/",
       "port": 8080,
       "approach": "Realistic",
-      "classification": "Platform",
+      "classification": "Fullstack",
       "database": "Postgres",
       "framework": "servicestack",
       "language": "C#",
+      "flavor": "Mono",
       "orm": "Raw",
-      "platform": "Mono",
+      "platform": "None",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "servicestack",
       "notes": "",
-      "versus": ""
+      "versus": "servicestack"
     },
     "nginx-mongodb": {
       "setup_file": "setup_nginx",
@@ -195,18 +204,19 @@
       "update_url": "/mongodb/updates/",
       "port": 8080,
       "approach": "Realistic",
-      "classification": "Platform",
+      "classification": "Fullstack",
       "database": "MongoDB",
       "framework": "servicestack",
       "language": "C#",
+      "flavor": "Mono",
       "orm": "Raw",
-      "platform": "Mono",
+      "platform": "None",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "servicestack",
       "notes": "",
-      "versus": ""
+      "versus": "servicestack"
     },
     "xsp-default": {
       "setup_file": "setup_xsp",
@@ -214,18 +224,19 @@
       "plaintext_url": "/plaintext",
       "port": 8080,
       "approach": "Realistic",
-      "classification": "Platform",
+      "classification": "Fullstack",
       "database": "None",
       "framework": "servicestack",
       "language": "C#",
+      "flavor": "Mono",
       "orm": "Raw",
-      "platform": "Mono",
+      "platform": "None",
       "webserver": "XSP",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "servicestack",
       "notes": "",
-      "versus": ""
+      "versus": "servicestack"
     }, 
     "xsp-sqlserver": {
       "setup_file": "setup_xsp",
@@ -235,18 +246,19 @@
       "update_url": "/sqlserver/updates/",
       "port": 8080,
       "approach": "Realistic",
-      "classification": "Platform",
+      "classification": "Fullstack",
       "database": "SQLServer",
       "framework": "servicestack",
       "language": "C#",
+      "flavor": "Mono",
       "orm": "Raw",
-      "platform": "Mono",
+      "platform": "None",
       "webserver": "XSP",
       "os": "Linux",
       "database_os": "Windows",
       "display_name": "servicestack",
       "notes": "",
-      "versus": ""
+      "versus": "servicestack"
     },
     "xsp-mysql": {
       "setup_file": "setup_xsp",
@@ -256,18 +268,18 @@
       "update_url": "/mysql/updates/",
       "port": 8080,
       "approach": "Realistic",
-      "classification": "Platform",
+      "classification": "Fullstack",
       "database": "MySQL",
       "framework": "servicestack",
       "language": "C#",
       "orm": "Raw",
-      "platform": "Mono",
+      "platform": "None",
       "webserver": "XSP",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "servicestack",
       "notes": "",
-      "versus": ""
+      "versus": "servicestack"
     },
     "xsp-postgresql": {
       "setup_file": "setup_xsp",
@@ -277,18 +289,19 @@
       "update_url": "/postgresql/updates/",
       "port": 8080,
       "approach": "Realistic",
-      "classification": "Platform",
+      "classification": "Fullstack",
       "database": "Postgres",
       "framework": "servicestack",
       "language": "C#",
+      "flavor": "Mono",
       "orm": "Raw",
-      "platform": "Mono",
+      "platform": "None",
       "webserver": "XSP",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "servicestack",
       "notes": "",
-      "versus": ""
+      "versus": "servicestack"
     },
     "xsp-mongodb": {
       "setup_file": "setup_xsp",
@@ -298,18 +311,19 @@
       "update_url": "/mongodb/updates/",
       "port": 8080,
       "approach": "Realistic",
-      "classification": "Platform",
+      "classification": "Fullstack",
       "database": "MongoDB",
       "framework": "servicestack",
       "language": "C#",
+      "flavor": "Mono",
       "orm": "Raw",
-      "platform": "Mono",
+      "platform": "None",
       "webserver": "XSP",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "servicestack",
       "notes": "",
-      "versus": ""
+      "versus": "servicestack"
     }
   }]
 }

frameworks/Clojure/aleph/benchmark_config.json

@@ -7,10 +7,11 @@
       "plaintext_url": "/plaintext",
       "port": 8080,
       "approach": "Realistic",
-      "classification": "Platform",
+      "classification": "Micro",
       "database": "None",
       "framework": "aleph",
       "language": "Clojure",
+      "flavor": "None",
       "orm": "Raw",
       "platform": "Netty",
       "webserver": "None",

frameworks/Clojure/compojure/benchmark_config.json

@@ -15,6 +15,7 @@
       "database": "MySQL",
       "framework": "compojure",
       "language": "Clojure",
+      "flavor": "None",
       "orm": "Micro",
       "platform": "Servlet",
       "webserver": "Resin",
@@ -36,6 +37,7 @@
       "database": "MySQL",
       "framework": "compojure",
       "language": "Clojure",
+      "flavor": "None",
       "orm": "Raw",
       "platform": "Servlet",
       "webserver": "Resin",

frameworks/Clojure/http-kit/benchmark_config.json

@@ -13,16 +13,17 @@
       "approach": "Realistic",
       "classification": "Platform",
       "database": "MySQL",
-      "framework": "http-kit",
+      "framework": "None",
       "language": "Clojure",
+      "flavor": "None",
       "orm": "Micro",
-      "platform": "http-kit",
+      "platform": "Ring",
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "http-kit",
       "notes": "",
-      "versus": ""
+      "versus": "http-kit"
     },
     "raw": {
       "setup_file": "setup",
@@ -34,16 +35,17 @@
       "approach": "Realistic",
       "classification": "Platform",
       "database": "MySQL",
-      "framework": "http-kit",
+      "framework": "None",
       "language": "Clojure",
+      "flavor": "None",
       "orm": "Raw",
-      "platform": "http-kit",
+      "platform": "Ring",
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "http-kit",
       "notes": "",
-      "versus": ""
+      "versus": "http-kit"
     }
   }]
 }

frameworks/Clojure/luminus/benchmark_config.json

@@ -11,18 +11,19 @@
       "update_url": "/updates/",
       "port": 3000,
       "approach": "Realistic",
-      "classification": "Platform",
+      "classification": "Micro",
       "database": "Postgres",
       "framework": "luminus",
       "language": "Clojure",
+      "flavor": "None",
       "orm": "Raw",
-      "platform": "Immutant",
+      "platform": "Ring",
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "luminus",
       "notes": "",
-      "versus": "servlet"
+      "versus": "undertow"
     }
   }]
 }

frameworks/Clojure/pedestal/benchmark_config.json

@@ -16,12 +16,13 @@
       "orm": "micro",
       "framework": "pedestal",
       "language": "Clojure",
-      "platform": "Servlet",
-      "webserver": "Jetty",
+      "flavor": "None",
+      "platform": "Undertow",
+      "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "pedestal",
-      "notes": "servlet"
+      "notes": "undertow"
     }
   }]
 }

frameworks/Crystal/crystal-raw/benchmark_config.json → frameworks/Crystal/crystal/benchmark_config.json

@@ -7,18 +7,19 @@
       "plaintext_url": "/plaintext",
       "port": 8080,
       "approach": "Realistic",
-      "classification": "Micro",
+      "classification": "Platform",
       "database": "Postgres",
-      "framework": "crystal",
+      "framework": "None",
       "language": "Crystal",
+      "flavor": "None",
       "orm": "Raw",
-      "platform": "Crystal",
+      "platform": "None",
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "Crystal",
       "notes": "",
-      "versus": "ruby"
+      "versus": "crystal"
     }
   }]
 }

frameworks/Crystal/kemal/benchmark_config.json

@@ -15,14 +15,15 @@
       "database": "Postgres",
       "framework": "kemal",
       "language": "Crystal",
+      "flavor": "None",
       "orm": "micro",
-      "platform": "Crystal",
+      "platform": "None",
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "Kemal (PostgreSQL)",
       "notes": "",
-      "versus": "ruby"
+      "versus": "crystal"
     },
     "redis": {
       "setup_file": "setup-redis",
@@ -38,14 +39,15 @@
       "database": "Redis",
       "framework": "kemal",
       "language": "Crystal",
+      "flavor": "None",
       "orm": "micro",
-      "platform": "Crystal",
+      "platform": "None",
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "Kemal (Redis)",
       "notes": "",
-      "versus": "ruby"
+      "versus": "crystal"
     }
   }]
 }

frameworks/D/vibed/benchmark_config.json

@@ -11,12 +11,13 @@
       "update_url": "/updates?queries=",
       "port": 8080,
       "approach": "Realistic",
-      "classification": "Platform",
+      "classification": "Micro",
       "database": "MongoDB",
-      "framework": "vibed",
+      "framework": "vibe.d",
       "language": "D",
+      "flavor": "DLang2",
       "orm": "Micro",
-      "platform": "D",
+      "platform": "None",
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
@@ -38,8 +39,9 @@
       "database": "MongoDB",
       "framework": "vibed",
       "language": "D",
+      "flavor": "DLang2",
       "orm": "Micro",
-      "platform": "D",
+      "platform": "None",
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",

frameworks/Dart/dart-raw/benchmark_config.json

@@ -10,13 +10,14 @@
       "update_url": "/updates?queries=",
       "plaintext_url": "/plaintext",
       "port": 8080,
-      "approach": "Realistic",
+      "approach": "Stripped",
       "classification": "Platform",
       "database": "Postgres",
-      "framework": "dart",
+      "framework": "None",
       "language": "Dart",
+      "flavor": "None",
       "orm": "Raw",
-      "platform": "Dart",
+      "platform": "None",
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",

frameworks/Dart/redstone/benchmark_config.json

@@ -15,12 +15,13 @@
       "database": "Postgres",
       "framework": "redstone",
       "language": "Dart",
+      "flavor": "None",
       "orm": "Micro",
-      "platform": "Dart",
+      "platform": "None",
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "redstone-postgresql",
+      "display_name": "redstone",
       "notes": "",
       "versus": "dart"
     },
@@ -36,12 +37,13 @@
       "database": "MongoDB",
       "framework": "redstone",
       "language": "Dart",
+      "flavor": "None",
       "orm": "Micro",
-      "platform": "Dart",
+      "platform": "None",
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "redstone-mongodb",
+      "display_name": "redstone",
       "notes": "",
       "versus": "dart"
     }

frameworks/Dart/start/benchmark_config.json

@@ -15,8 +15,9 @@
       "database": "Postgres",
       "framework": "start",
       "language": "Dart",
+      "flavor": "None",
       "orm": "Raw",
-      "platform": "Dart",
+      "platform": "None",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
@@ -36,8 +37,9 @@
       "database": "MongoDB",
       "framework": "start",
       "language": "Dart",
+      "flavor": "None",
       "orm": "Raw",
-      "platform": "Dart",
+      "platform": "None",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",

frameworks/Dart/stream/benchmark_config.json

@@ -15,8 +15,9 @@
       "database": "Postgres",
       "framework": "stream",
       "language": "Dart",
+      "flavor": "None",
       "orm": "Raw",
-      "platform": "Dart",
+      "platform": "None",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
@@ -36,8 +37,9 @@
       "database": "MongoDB",
       "framework": "stream",
       "language": "Dart",
+      "flavor": "None",
       "orm": "Raw",
-      "platform": "Dart",
+      "platform": "None",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",

frameworks/Elixir/cowboy/benchmark_config.json

@@ -6,17 +6,18 @@
             "json_url": "/json",
             "plaintext_url": "/plaintext",
             "port": 8080,
-            "approach": "Realistic",
+            "approach": "Stripped",
             "classification": "Platform",
             "database": "None",
-            "framework": "cowboy",
-            "language": "elixir",
+            "framework": "None",
+            "language": "Elixir",
+            "flavor": "None",
             "orm": "raw",
-            "platform": "Erlang/OTP",
-            "webserver": "cowboy",
+            "platform": "None",
+            "webserver": "None",
             "os": "Linux",
             "database_os": "Linux",
-            "display_name": "elixir-cowboy",
+            "display_name": "Cowboy",
             "notes": "",
             "versus": ""
         }

frameworks/Elixir/phoenix/benchmark_config.json

@@ -14,10 +14,11 @@
             "classification": "Micro",
             "database": "Postgres",
             "framework": "Phoenix",
-            "language": "elixir",
+            "language": "Elixir",
+            "flavor": "None",
             "orm": "full",
-            "platform": "Erlang/OTP",
-            "webserver": "cowboy",
+            "platform": "Cowboy",
+            "webserver": "None",
             "os": "Linux",
             "database_os": "Linux",
             "display_name": "Phoenix",

frameworks/Erlang/chicagoboss/benchmark_config.json

@@ -9,11 +9,12 @@
       "approach": "Realistic",
       "classification": "Fullstack",
       "database": "None",
-      "framework": "chicagoboss",
+      "framework": "ChicagoBoss",
       "language": "Erlang",
+      "flavor": "None",
       "orm": "raw",
-      "platform": "cowboy",
-      "webserver": "cowboy",
+      "platform": "Cowboy",
+      "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "ChicagoBoss",

frameworks/Erlang/cowboy/benchmark_config.json

@@ -8,17 +8,18 @@
       "db_url": "/db",
       "query_url": "/query?queries=",
       "port": 8080,
-      "approach": "Realistic",
+      "approach": "Stripped",
       "classification": "Platform",
       "database": "MySQL",
-      "framework": "cowboy",
+      "framework": "None",
       "language": "Erlang",
+      "flavor": "None",
       "orm": "Raw",
-      "platform": "Cowboy",
+      "platform": "None",
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "cowboy",
+      "display_name": "Cowboy",
       "notes": "",
       "versus": ""
   }}]

frameworks/Erlang/elli/benchmark_config.json

@@ -7,13 +7,14 @@
       "json_url": "/json",
       "db_url": "/db",
       "port": 8080,
-      "approach": "Realistic",
+      "approach": "Stripped",
       "classification": "Platform",
       "database": "MySQL",
-      "framework": "elli",
+      "framework": "None",
       "language": "Erlang",
+      "flavor": "None",
       "orm": "Raw",
-      "platform": "elli",
+      "platform": "None",
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",

frameworks/Erlang/mochiweb/benchmark_config.json

@@ -6,13 +6,14 @@
       "json_url": "/json",
       "plaintext_url": "/plaintext",
       "port": 8080,
-      "approach": "Realistic",
+      "approach": "Stripped",
       "classification": "Platform",
       "database": "MySQL",
-      "framework": "Mochiweb",
+      "framework": "None",
       "language": "Erlang",
+      "flavor": "None",
       "orm": "Raw",
-      "platform": "Erlang",
+      "platform": "None",
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",

frameworks/Go/beego/benchmark_config.json

@@ -12,8 +12,9 @@
       "database": "MySQL",
       "framework": "beego",
       "language": "Go",
+      "flavor": "None",
       "orm": "Micro",
-      "platform": "Go",
+      "platform": "None",
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",

frameworks/Go/echo/benchmark_config.json

@@ -12,15 +12,16 @@
       "port": 8080,
       "approach": "Realistic",
       "classification": "Micro",
-      "database": "Postgres",
-      "framework": "echo",
+      "database": "MySQL",
+      "framework": "None",
       "language": "Go",
+      "flavor": "None",
       "orm": "Raw",
-      "platform": "Go",
+      "platform": "None",
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "echo",
+      "display_name": "Echo",
       "notes": "",
       "versus": "go"
     },
@@ -36,14 +37,15 @@
       "approach": "Realistic",
       "classification": "Micro",
       "database": "Postgres",
-      "framework": "echo",
+      "framework": "None",
       "language": "Go",
+      "flavor": "None",
       "orm": "Raw",
-      "platform": "Go",
+      "platform": "None",
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "echo-std",
+      "display_name": "Echo-std",
       "notes": "",
       "versus": "go"
     },
@@ -59,14 +61,15 @@
       "approach": "Realistic",
       "classification": "Micro",
       "database": "Postgres",
-      "framework": "echo",
+      "framework": "None",
       "language": "Go",
+      "flavor": "None",
       "orm": "Raw",
-      "platform": "Go",
+      "platform": "None",
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "echo-prefork",
+      "display_name": "Echo-prefork",
       "notes": "",
       "versus": "go"
     }

frameworks/Go/falcore/benchmark_config.json

@@ -13,14 +13,15 @@
       "approach": "Realistic",
       "classification": "Micro",
       "database": "MySQL",
-      "framework": "falcore",
+      "framework": "Falcore",
       "language": "Go",
+      "flavor": "None",
       "orm": "Raw",
-      "platform": "Go",
+      "platform": "None",
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "falcore",
+      "display_name": "Falcore",
       "notes": "",
       "versus": "go"
     }

frameworks/Go/fasthttp/benchmark_config.json

@@ -13,83 +13,57 @@
       "approach": "Realistic",
       "classification": "Platform",
       "database": "MySQL",
-      "framework": "fasthttp",
+      "framework": "None",
       "language": "Go",
+      "flavor": "None",
       "orm": "Raw",
-      "platform": "Go",
+      "platform": "None",
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "fasthttp-mysql",
+      "display_name": "FastHTTP",
       "notes": "",
       "versus": "go"
     },
     "mysql-prefork": {
       "setup_file": "setup-mysql-prefork",
-      "json_url": "/json",
       "db_url": "/db",
       "query_url": "/queries?queries=",
-      "fortune_url": "/fortune",
       "update_url": "/update?queries=",
-      "plaintext_url": "/plaintext",
       "port": 8080,
       "approach": "Realistic",
       "classification": "Platform",
       "database": "MySQL",
-      "framework": "fasthttp",
-      "language": "Go",
-      "orm": "Raw",
-      "platform": "Go",
-      "webserver": "None",
-      "os": "Linux",
-      "database_os": "Linux",
-      "display_name": "fasthttp-mysql-prefork",
-      "notes": "",
-      "versus": "go"
-    },
-    "postgresql": {
-      "setup_file": "setup-postgresql",
-      "json_url": "/json",
-      "db_url": "/db",
-      "query_url": "/queries?queries=",
-      "fortune_url": "/fortune",
-      "update_url": "/update?queries=",
-      "plaintext_url": "/plaintext",
-      "port": 8080,
-      "approach": "Realistic",
-      "classification": "Platform",
-      "database": "Postgres",
-      "framework": "fasthttp",
+      "framework": "None",
       "language": "Go",
+      "flavor": "None",
       "orm": "Raw",
-      "platform": "Go",
+      "platform": "None",
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "fasthttp-postgresql",
+      "display_name": "FastHTTP",
       "notes": "",
       "versus": "go"
     },
     "postgresql-prefork": {
       "setup_file": "setup-postgresql-prefork",
-      "json_url": "/json",
       "db_url": "/db",
       "query_url": "/queries?queries=",
-      "fortune_url": "/fortune",
       "update_url": "/update?queries=",
-      "plaintext_url": "/plaintext",
       "port": 8080,
       "approach": "Realistic",
       "classification": "Platform",
       "database": "Postgres",
-      "framework": "fasthttp",
+      "framework": "None",
       "language": "Go",
+      "flavor": "None",
       "orm": "Raw",
-      "platform": "Go",
+      "platform": "None",
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "fasthttp-postgresql-prefork",
+      "display_name": "FastHTTP",
       "notes": "",
       "versus": "go"
     }

frameworks/Go/gin/benchmark_config.json

@@ -11,12 +11,13 @@
       "plaintext_url": "/plaintext",
       "port": 8080,
       "approach": "Realistic",
-      "classification": "Platform",
+      "classification": "Micro",
       "database": "MySQL",
       "framework": "gin",
       "language": "Go",
+      "flavor": "None",
       "orm": "Raw",
-      "platform": "Go",
+      "platform": "None",
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",

frameworks/Go/go-std-mongodb/.gitignore

@@ -1,2 +0,0 @@
-/pkg/
-/src/gopkg.in/

frameworks/Go/go-std-mysql/.gitignore

@@ -1,2 +0,0 @@
-/pkg/
-/src/github.com/

frameworks/Go/go-std/benchmark_config.json

@@ -10,17 +10,18 @@
       "update_url": "/update?queries=",
       "plaintext_url": "/plaintext",
       "port": 8080,
-      "approach": "Realistic",
+      "approach": "Stripped",
       "classification": "Platform",
       "database": "MySQL",
       "framework": "go",
       "language": "Go",
+      "flavor": "None",
       "orm": "Raw",
-      "platform": "Go",
+      "platform": "None",
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "go-mysql",
+      "display_name": "Go",
       "notes": "",
       "versus": "go"
     },
@@ -31,17 +32,18 @@
       "fortune_url": "/fortuneInterpolate",
       "update_url": "/updateInterpolate?queries=",
       "port": 8080,
-      "approach": "Realistic",
+      "approach": "Stripped",
       "classification": "Platform",
       "database": "MySQL",
-      "framework": "go",
+      "framework": "None",
       "language": "Go",
+      "flavor": "None",
       "orm": "Raw",
-      "platform": "Go",
+      "platform": "None",
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "go-mysql-interpolate",
+      "display_name": "Go-interpolate",
       "notes": "",
       "versus": "go"
     },
@@ -54,17 +56,18 @@
       "update_url": "/update?queries=",
       "plaintext_url": "/plaintext",
       "port": 8080,
-      "approach": "Realistic",
+      "approach": "Stripped",
       "classification": "Platform",
       "database": "MySQL",
-      "framework": "go",
+      "framework": "None",
       "language": "Go",
+      "flavor": "None",
       "orm": "Raw",
-      "platform": "Go",
+      "platform": "None",
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "go-mysql-prefork",
+      "display_name": "Go-prefork",
       "notes": "",
       "versus": "go"
     },
@@ -78,14 +81,15 @@
       "approach": "Realistic",
       "classification": "Platform",
       "database": "MongoDB",
-      "framework": "go",
+      "framework": "None",
       "language": "Go",
+      "flavor": "None",
       "orm": "Raw",
-      "platform": "Go",
+      "platform": "None",
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "go-mongodb",
+      "display_name": "Go",
       "notes": "mongodb implementation for go net/http",
       "versus": "go"
     },
@@ -99,14 +103,15 @@
       "approach": "Realistic",
       "classification": "Platform",
       "database": "Postgres",
-      "framework": "go",
+      "framework": "None",
       "language": "Go",
+      "flavor": "None",
       "orm": "Raw",
-      "platform": "Go",
+      "platform": "None",
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "go-postgresql",
+      "display_name": "Go",
       "notes": "",
       "versus": "go"
     }

frameworks/Go/goji/benchmark_config.json

@@ -11,12 +11,13 @@
       "plaintext_url": "/plaintext",
       "port": 8080,
       "approach": "Realistic",
-      "classification": "Platform",
+      "classification": "Micro",
       "database": "MySQL",
       "framework": "Goji",
       "language": "Go",
+      "flavor": "None",
       "orm": "Raw",
-      "platform": "Go",
+      "platform": "None",
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",

frameworks/Go/kami/benchmark_config.json

@@ -11,12 +11,13 @@
       "plaintext_url": "/plaintext",
       "port": 8080,
       "approach": "Realistic",
-      "classification": "Platform",
+      "classification": "Micro",
       "database": "MySQL",
       "framework": "kami",
       "language": "Go",
+      "flavor": "None",
       "orm": "Raw",
-      "platform": "Go",
+      "platform": "None",
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",

frameworks/Go/revel/benchmark_config.json

@@ -9,14 +9,15 @@
       "approach": "Realistic",
       "classification": "Fullstack",
       "database": "MySQL",
-      "framework": "revel",
+      "framework": "None",
       "language": "Go",
+      "flavor": "None",
       "orm": "Raw",
-      "platform": "Go",
+      "platform": "None",
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "revel",
+      "display_name": "Revel",
       "notes": "",
       "versus": "go"
     },
@@ -30,14 +31,15 @@
       "approach": "Realistic",
       "classification": "Fullstack",
       "database": "MySQL",
-      "framework": "revel",
+      "framework": "None",
       "language": "Go",
+      "flavor": "None",
       "orm": "Raw",
-      "platform": "Go",
+      "platform": "None",
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "revel-raw",
+      "display_name": "Revel-raw",
       "notes": "",
       "versus": "go"
     },
@@ -51,14 +53,15 @@
       "approach": "Realistic",
       "classification": "Fullstack",
       "database": "MySQL",
-      "framework": "revel",
+      "framework": "None",
       "language": "Go",
+      "flavor": "None",
       "orm": "micro",
-      "platform": "Go",
+      "platform": "None",
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "revel-jet",
+      "display_name": "Revel-jet",
       "notes": "",
       "versus": "go"
     },
@@ -72,14 +75,15 @@
       "approach": "Realistic",
       "classification": "Fullstack",
       "database": "MySQL",
-      "framework": "revel",
+      "framework": "None",
       "language": "Go",
+      "flavor": "None",
       "orm": "micro",
-      "platform": "Go",
+      "platform": "None",
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "revel-qbs",
+      "display_name": "Revel-qbs",
       "notes": "",
       "versus": "go"
     }

frameworks/Go/webgo/benchmark_config.json

@@ -8,14 +8,15 @@
       "approach": "Realistic",
       "classification": "Micro",
       "database": "None",
-      "framework": "webgo",
+      "framework": "Webgo",
       "language": "Go",
-      "orm": "Full",
-      "platform": "Go",
+      "flavor": "None",
+      "orm": "Raw",
+      "platform": "None",
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "webgo",
+      "display_name": "Webgo",
       "notes": "",
       "versus": "go"
     }

frameworks/Groovy/grails/benchmark_config.json

@@ -13,14 +13,15 @@
       "approach": "Realistic",
       "classification": "Fullstack",
       "database": "MySQL",
-      "framework": "grails",
+      "framework": "Grails",
       "language": "Groovy",
+      "flavor": "Groovy2",
       "orm": "Full",
       "platform": "Servlet",
-      "webserver": "Resin",
+      "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "grails",
+      "display_name": "Grails",
       "notes": "",
       "versus": "servlet"
     }

frameworks/Haskell/servant/benchmark_config.json

@@ -13,8 +13,9 @@
       "approach": "Realistic",
       "classification": "Micro",
       "database": "Postgres",
-      "framework": "None",
+      "framework": "Servant",
       "language": "Haskell",
+      "flavor": "GHC710",
       "orm": "Raw",
       "platform": "Wai",
       "webserver": "Warp",

frameworks/Haskell/snap/benchmark_config.json

@@ -11,14 +11,15 @@
       "approach": "Realistic",
       "classification": "Micro",
       "database": "MySQL",
-      "framework": "snap",
+      "framework": "Snap",
       "language": "Haskell",
+      "flavor": "GHC78",
       "orm": "Full",
-      "platform": "Snap",
+      "platform": "None",
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "snap",
+      "display_name": "Snap",
       "notes": "",
       "versus": ""
     }

frameworks/Haskell/spock/benchmark_config.json

@@ -13,14 +13,15 @@
       "approach": "Realistic",
       "classification": "Micro",
       "database": "Postgres",
-      "framework": "spock",
+      "framework": "Spock",
       "language": "Haskell",
+      "flavor": "GHC710",
       "orm": "Raw",
       "platform": "Wai",
       "webserver": "Warp",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "spock",
+      "display_name": "Spock",
       "notes": "",
       "versus": ""
     }

frameworks/Haskell/wai/benchmark_config.json

@@ -6,13 +6,14 @@
       "json_url": "/json",
       "plaintext_url": "/plaintext",
       "port": 8000,
-      "approach": "Realistic",
+      "approach": "Stripped",
       "classification": "Platform",
       "database": "None",
-      "framework": "wai",
+      "framework": "None",
       "language": "Haskell",
+      "flavor": "GHC78",
       "orm": "Full",
-      "platform": "Wai",
+      "platform": "None",
       "webserver": "Warp",
       "os": "Linux",
       "database_os": "Linux",

frameworks/Haskell/yesod/benchmark_config.json

@@ -15,6 +15,7 @@
       "database": "MySQL",
       "framework": "yesod",
       "language": "Haskell",
+      "flavor": "GHC710",
       "orm": "Raw",
       "platform": "Wai",
       "webserver": "Warp",
@@ -34,6 +35,7 @@
       "database": "MongoDB",
       "framework": "yesod",
       "language": "Haskell",
+      "flavor": "GHC710",
       "orm": "Raw",
       "platform": "Wai",
       "webserver": "Warp",

frameworks/Java/activeweb/benchmark_config.json

@@ -13,11 +13,12 @@
       "approach": "Realistic",
       "classification": "Fullstack",
       "database": "MySQL",
-      "framework": "activeweb",
+      "framework": "ActiveWeb",
       "language": "Java",
+      "flavor": "None",
       "orm": "Micro",
       "platform": "Servlet",
-      "webserver": "Resin",
+      "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "ActiveWeb",
@@ -34,11 +35,12 @@
       "approach": "Realistic",
       "classification": "Fullstack",
       "database": "MySQL",
-      "framework": "activeweb",
+      "framework": "ActiveWeb",
       "language": "Java",
+      "flavor": "None",
       "orm": "Micro",
       "platform": "Servlet",
-      "webserver": "Resin",
+      "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "ActiveWeb",

frameworks/Java/baratine/benchmark_config.json

@@ -6,17 +6,18 @@
       "json_url": "/json",
       "plaintext_url": "/plaintext",
       "port": 8080,
-      "approach": "Realistic",
+      "approach": "Stripped",
       "classification": "Platform",
       "database": "None",
-      "framework": "baratine",
+      "framework": "None",
       "language": "Java",
+      "flavor": "None",
       "orm": "Raw",
       "platform": "Baratine",
-      "webserver": "Baratine",
+      "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "baratine",
+      "display_name": "Baratine",
       "notes": "",
       "versus": "baratine"
     }

frameworks/Java/bayou/benchmark_config.json

@@ -6,13 +6,14 @@
             "json_url": "/json",
             "plaintext_url": "/plaintext",
             "port": 8080,
-            "approach": "Realistic",
+            "approach": "Stripped",
             "classification": "Platform",
             "database": "None",
-            "framework": "bayou.io",
+            "framework": "None",
             "language": "Java",
+            "flavor": "None",
             "orm": "Raw",
-            "platform": "bayou.io",
+            "platform": "Bayou",
             "webserver": "None",
             "os": "Linux",
             "database_os": "Linux",

frameworks/Java/beyondj/benchmark_config.json

@@ -13,8 +13,9 @@
       "approach": "Realistic",
       "classification": "Fullstack",
       "database": "MySQL",
-      "framework": "beyondj",
+      "framework": "BeyondJ",
       "language": "Java",
+      "flavor": "None",
       "orm": "Full",
       "platform": "Servlet",
       "webserver": "None",

frameworks/Java/comsat-servlet/benchmark_config.json

@@ -10,11 +10,12 @@
         "approach": "Realistic",
         "classification": "Platform",
         "database": "None",
-        "framework": "comsat-servlet",
+        "framework": "None",
         "language": "Java",
+        "flavor": "None",
         "orm": "Raw",
-        "platform": "Comsat Servlet",
-        "webserver": "Jetty",
+        "platform": "Servlet",
+        "webserver": "None",
         "os": "Linux",
         "database_os": "Linux",
         "display_name": "comsat-servlet-jetty",
@@ -29,14 +30,15 @@
         "approach": "Realistic",
         "classification": "Platform",
         "database": "None",
-        "framework": "comsat-servlet",
+        "framework": "None",
         "language": "Java",
+        "flavor": "None",
         "orm": "Raw",
-        "platform": "Comsat Servlet",
-        "webserver": "Undertow",
+        "platform": "Servlet",
+        "webserver": "None",
         "os": "Linux",
         "database_os": "Linux",
-        "display_name": "comsat-servlet-undertow",
+        "display_name": "Comsat",
         "notes": "Comsat servlet on embedded Undertow",
         "versus": ""
       }

frameworks/Java/comsat-webactors/benchmark_config.json

@@ -10,14 +10,15 @@
         "approach": "Realistic",
         "classification": "Platform",
         "database": "None",
-        "framework": "comsat-webactors",
+        "framework": "None",
         "language": "Java",
+        "flavor": "None",
         "orm": "Raw",
-        "platform": "Comsat Web Actors",
-        "webserver": "Netty",
+        "platform": "Comsat",
+        "webserver": "None",
         "os": "Linux",
         "database_os": "Linux",
-        "display_name": "comsat-actors-netty",
+        "display_name": "Comsat",
         "notes": "Comsat Web Actors run as Netty handler",
         "versus": ""
       },
@@ -29,14 +30,15 @@
         "approach": "Realistic",
         "classification": "Platform",
         "database": "None",
-        "framework": "comsat-webactors",
+        "framework": "None",
         "language": "Java",
+        "flavor": "None",
         "orm": "Raw",
-        "platform": "Comsat Web Actors",
-        "webserver": "Undertow",
+        "platform": "Comsat",
+        "webserver": "None",
         "os": "Linux",
         "database_os": "Linux",
-        "display_name": "comsat-actors-undertow",
+        "display_name": "Comsat",
         "notes": "Comsat Web Actors run as Undertow handler",
         "versus": ""
       }

frameworks/Java/curacao/benchmark_config.json

@@ -7,16 +7,17 @@
       "plaintext_url": "/curacao/plaintext",
       "port": 8080,
       "approach": "Realistic",
-      "classification": "Platform",
+      "classification": "Micro",
       "database": "None",
-      "framework": "curacao",
+      "framework": "Curacao",
       "language": "Java",
+      "flavor": "None",
       "orm": "Raw",
       "platform": "Servlet",
-      "webserver": "Resin",
+      "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "curacao",
+      "display_name": "Curacao",
       "notes": "",
       "versus": "servlet"
     }

frameworks/Java/dropwizard/benchmark_config.json

@@ -13,14 +13,15 @@
       "approach": "Realistic",
       "classification": "Fullstack",
       "database": "MySQL",
-      "framework": "dropwizard",
+      "framework": "Dropwizard",
       "language": "Java",
+      "flavor": "None",
       "orm": "Full",
-      "platform": "Jetty",
-      "webserver": "Jetty",
+      "platform": "JAX-RS",
+      "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "dropwizard",
+      "display_name": "Dropwizard",
       "notes": "dropwizard mysql using hibernate",
       "versus": "servlet"
     },
@@ -36,12 +37,13 @@
       "database": "MongoDB",
       "framework": "dropwizard",
       "language": "Java",
+      "flavor": "None",
       "orm": "Full",
-      "platform": "Jetty",
-      "webserver": "Jetty",
+      "platform": "JAX-RS",
+      "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "dropwizard",
+      "display_name": "Dropwizard",
       "notes": "dropwizard mongodb using mongojack",
       "versus": ""
     },
@@ -57,9 +59,10 @@
       "database": "Postgres",
       "framework": "dropwizard",
       "language": "Java",
+      "flavor": "None",
       "orm": "Full",
-      "platform": "Jetty",
-      "webserver": "Jetty",
+      "platform": "JAX-RS",
+      "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "dropwizard",

frameworks/Java/gemini/benchmark_config.json

@@ -9,14 +9,15 @@
       "approach": "Realistic",
       "classification": "Fullstack",
       "database": "None",
-      "framework": "gemini",
+      "framework": "Gemini",
       "language": "Java",
+      "flavor": "None",
       "orm": "Micro",
       "platform": "Servlet",
-      "webserver": "None",
+      "webserver": "Resin",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "gemini",
+      "display_name": "Gemini",
       "notes": "",
       "versus": "servlet"
     },
@@ -32,12 +33,13 @@
       "database": "MySQL",
       "framework": "gemini",
       "language": "Java",
+      "flavor": "None",
       "orm": "Micro",
       "platform": "Servlet",
       "webserver": "Resin",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "gemini-mysql",
+      "display_name": "Gemini",
       "notes": "",
       "versus": "servlet"
     },
@@ -53,12 +55,13 @@
       "database": "Postgres",
       "framework": "gemini",
       "language": "Java",
+      "flavor": "None",
       "orm": "Micro",
       "platform": "Servlet",
       "webserver": "Resin",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "gemini-postgres",
+      "display_name": "Gemini",
       "notes": "",
       "versus": "servlet"
     }   

frameworks/Java/grizzly-bm/benchmark_config.json

@@ -9,14 +9,15 @@
       "approach": "Realistic",
       "classification": "Micro",
       "database": "None",
-      "framework": "grizzly",
+      "framework": "Grizzly",
       "language": "Java",
+      "flavor": "None",
       "orm": "Raw",
       "platform": "Servlet",
-      "webserver": "Grizzly",
+      "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "grizzly",
+      "display_name": "Grizzly",
       "notes": "",
       "versus": ""
     }

frameworks/Java/grizzly-jersey/benchmark_config.json

@@ -12,16 +12,17 @@
       "approach": "Realistic",
       "classification": "Micro",
       "database": "MySQL",
-      "framework": "grizzly-jersey",
+      "framework": "Grizzly",
       "language": "Java",
+      "flavor": "None",
       "orm": "Full",
-      "platform": "Servlet",
-      "webserver": "Grizzly",
+      "platform": "JAX-RS",
+      "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "grizzly-jersey",
+      "display_name": "Grizzly",
       "notes": "",
-      "versus": "grizzly"
+      "versus": ""
     }
   }]
 }

frameworks/Java/jawn/benchmark_config.json

@@ -15,6 +15,7 @@
       "database": "MySQL",
       "framework": "jawn",
       "language": "Java",
+      "flavor": "None",
       "orm": "Raw",
       "platform": "Servlet",
       "webserver": "Undertow",

frameworks/Java/jetty-servlet/benchmark_config.json

@@ -9,16 +9,17 @@
       "approach": "Realistic",
       "classification": "Platform",
       "database": "None",
-      "framework": "servlet",
+      "framework": "None",
       "language": "Java",
+      "flavor": "None",
       "orm": "Raw",
       "platform": "Jetty",
-      "webserver": "Jetty",
+      "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "jetty-servlet",
+      "display_name": "jetty",
       "notes": "Jetty 9.2 with ServletContext",
-      "versus": ""
+      "versus": "servlet"
     }
   }]
 }

frameworks/Java/jetty/benchmark_config.json

@@ -9,16 +9,17 @@
       "approach": "Stripped",
       "classification": "Platform",
       "database": "None",
-      "framework": "servlet",
+      "framework": "None",
       "language": "Java",
+      "flavor": "None",
       "orm": "Raw",
       "platform": "Jetty",
-      "webserver": "Jetty",
+      "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "jetty",
       "notes": "Jetty 9.3 with Handler",
-      "versus": ""
+      "versus": "servlet"
     }
   }]
 }

frameworks/Java/jlhttp/benchmark_config.json

@@ -6,10 +6,11 @@
       "json_url": "/json",
       "plaintext_url": "/plaintext",
       "port": 8080,
-      "approach": "Realistic",
+      "approach": "Stripped",
       "classification": "Platform",
       "database": "None",
-      "framework": "JLHTTP",
+      "framework": "None",
+      "flavor": "None",
       "language": "Java",
       "orm": "Raw",
       "platform": "JLHTTP",

frameworks/Java/jooby/benchmark_config.json

@@ -12,14 +12,15 @@
       "database": "None",
       "framework": "jooby",
       "language": "Java",
+      "flavor": "None",
       "orm": "Raw",
       "platform": "Netty",
-      "webserver": "Netty",
+      "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "Jooby",
       "notes": "",
-      "versus": ""
+      "versus": "netty"
     }
   }]
 }

frameworks/Java/netty/benchmark_config.json

@@ -11,6 +11,7 @@
       "database": "None",
       "framework": "netty",
       "language": "Java",
+      "flavor": "None",
       "orm": "Raw",
       "platform": "Netty",
       "webserver": "None",

frameworks/Java/ninja-standalone/benchmark_config.json

@@ -15,14 +15,15 @@
       "database": "MySQL",
       "framework": "ninja",
       "language": "Java",
+      "flavor": "None",
       "orm": "Full",
       "platform": "Jetty",
-      "webserver": "Jetty",
+      "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "ninja-standalone",
+      "display_name": "Ninja",
       "notes": "",
-      "versus": ""
+      "versus": "jetty"
     }
   }]
 }

frameworks/Java/officefloor/benchmark_config.json

@@ -15,9 +15,10 @@
       "database": "MySQL",
       "framework": "officefloor",
       "language": "Java",
+      "flavor": "None",
       "orm": "Full",
-      "platform": "OfficeFloor",
-      "webserver": "WoOF (Web on OfficeFloor)",
+      "platform": "None",
+      "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "officefloor",

frameworks/Java/permeagility/benchmark_config.json

@@ -13,14 +13,15 @@
       "approach": "Realistic",
       "classification": "Platform",
       "database": "None",
-      "framework": "permeagility",
+      "framework": "None",
       "language": "Java",
+      "flavor": "None",
       "orm": "Raw",
       "platform": "PermeAgility",
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "permeagility",
+      "display_name": "PermeAgility",
       "notes": "PermeAgility 0.7.5",
       "versus": ""
     }

frameworks/Java/play1/benchmark_config.json

@@ -12,6 +12,7 @@
       "database": "MySQL",
       "framework": "play1",
       "language": "Java",
+      "flavor": "None",
       "orm": "Full",
       "platform": "Netty",
       "webserver": "None",

frameworks/Java/play2-java/benchmark_config.json

@@ -7,6 +7,7 @@
         "setup_file": "setup_java", 
         "framework": "play2", 
         "language": "Java", 
+        "flavor": "None",
         "orm": "Raw", 
         "os": "Linux", 
         "database": "None", 
@@ -26,6 +27,7 @@
         "setup_file": "setup_java_ebean_hikaricp", 
         "framework": "play2", 
         "language": "Java", 
+        "flavor": "None",
         "orm": "Full", 
         "os": "Linux", 
         "database": "MySQL", 
@@ -47,6 +49,7 @@
         "setup_file": "setup_java_jpa_hikaricp", 
         "framework": "play2", 
         "language": "Java", 
+        "flavor": "None",
         "orm": "Full", 
         "os": "Linux", 
         "database": "MySQL", 

frameworks/Java/rapidoid/benchmark_config.json

@@ -1,26 +1,25 @@
 {
   "framework": "rapidoid",
-  "tests": [
-    {
-      "default": {
-        "setup_file": "setup-low-level",
-        "json_url": "/json",
-        "plaintext_url": "/plaintext",
-        "port": 8080,
-        "approach": "Realistic",
-        "classification": "Platform",
-        "database": "None",
-        "framework": "rapidoid-http-fast",
-        "language": "Java",
-        "orm": "Raw",
-        "platform": "Rapidoid",
-        "webserver": "None",
-        "os": "Linux",
-        "database_os": "Linux",
-        "display_name": "rapidoid-http-fast",
-        "notes": "",
-        "versus": ""
-      }
+  "tests": [{
+    "default": {
+      "setup_file": "setup",
+      "json_url": "/json",
+      "plaintext_url": "/plaintext",
+      "port": 8080,
+      "approach": "Stripped",
+      "classification": "Platform",
+      "database": "None",
+      "framework": "None",
+      "language": "Java",
+      "flavor": "None",
+      "orm": "Raw",
+      "platform": "None",
+      "webserver": "None",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "Rapidoid",
+      "notes": "",
+      "versus": "rapidoid"
     }
-  ]
+  }]
 }

frameworks/Java/restexpress/benchmark_config.json

@@ -11,6 +11,7 @@
       "database": "None",
       "framework": "rest-express",
       "language": "Java",
+      "flavor": "None",
       "orm": "Raw",
       "platform": "Netty",
       "webserver": "None",
@@ -30,6 +31,7 @@
       "database": "MySQL",
       "framework": "rest-express",
       "language": "Java",
+      "flavor": "None",
       "orm": "Raw",
       "platform": "Netty",
       "webserver": "None",
@@ -49,6 +51,7 @@
       "database": "MongoDB",
       "framework": "rest-express",
       "language": "Java",
+      "flavor": "None",
       "orm": "Raw",
       "platform": "Netty",
       "webserver": "None",

frameworks/Java/revenj/benchmark_config.json

@@ -11,10 +11,11 @@
       "fortune_url": "/revenj/fortunes",
       "port": 8080,
       "approach": "Realistic",
-      "classification": "Platform",
+      "classification": "Fullstack",
       "database": "Postgres",
       "framework": "Revenj.JVM",
       "language": "Java",
+      "flavor": "None",
       "orm": "Full",
       "platform": "Servlet",
       "webserver": "Resin",

frameworks/Java/sabina/benchmark_config.json

@@ -0,0 +1,105 @@
+{
+  "framework": "sabina",
+  "tests": [{
+    "default": {
+      "json_url": "/json",
+      "db_url": "/db",
+      "query_url": "/query?queries=",
+      "fortune_url": "/fortune",
+      "update_url": "/update?queries=",
+      "plaintext_url": "/plaintext",
+
+      "port": 5050,
+      "setup_file": "undertow-mongodb",
+      "approach": "Realistic",
+      "classification": "Micro",
+      "database": "MongoDB",
+      "framework": "Sabina",
+      "language": "Java",
+      "flavor": "None",
+      "orm": "Raw",
+      "platform": "Servlet",
+      "webserver": "None",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "Sabina Undertow MongoDB",
+      "notes": "",
+      "versus": "servlet"
+    },
+    "undertow-mysql": {
+      "json_url": "/json",
+      "db_url": "/db",
+      "query_url": "/query?queries=",
+      "fortune_url": "/fortune",
+      "update_url": "/update?queries=",
+      "plaintext_url": "/plaintext",
+
+      "port": 5050,
+      "setup_file": "undertow",
+      "approach": "Realistic",
+      "classification": "Micro",
+      "database": "MySQL",
+      "framework": "Sabina",
+      "language": "Java",
+      "flavor": "None",
+      "orm": "Raw",
+      "platform": "Servlet",
+      "webserver": "None",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "Sabina Undertow MySQL",
+      "notes": "",
+      "versus": "servlet"
+    },
+    "jetty-mysql": {
+      "json_url": "/json",
+      "db_url": "/db",
+      "query_url": "/query?queries=",
+      "fortune_url": "/fortune",
+      "update_url": "/update?queries=",
+      "plaintext_url": "/plaintext",
+
+      "port": 5050,
+      "setup_file": "jetty",
+      "approach": "Realistic",
+      "classification": "Micro",
+      "database": "MySQL",
+      "framework": "Sabina",
+      "language": "Java",
+      "flavor": "None",
+      "orm": "Raw",
+      "platform": "Servlet",
+      "webserver": "None",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "Sabina Jetty MySQL",
+      "notes": "",
+      "versus": "servlet"
+    },
+    "jetty-mongodb": {
+      "json_url": "/json",
+      "db_url": "/db",
+      "query_url": "/query?queries=",
+      "fortune_url": "/fortune",
+      "update_url": "/update?queries=",
+      "plaintext_url": "/plaintext",
+
+      "port": 5050,
+      "setup_file": "jetty-mongodb",
+      "approach": "Realistic",
+      "classification": "Micro",
+      "database": "MongoDB",
+      "framework": "Sabina",
+      "language": "Java",
+      "flavor": "None",
+      "orm": "Raw",
+      "platform": "Servlet",
+      "webserver": "None",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "Sabina Jetty MongoDB",
+      "notes": "",
+      "versus": "servlet"
+    }
+  }]
+}

frameworks/Java/servlet/benchmark_config.json

@@ -9,8 +9,9 @@
       "approach": "Realistic",
       "classification": "Platform",
       "database": "None",
-      "framework": "servlet",
+      "framework": "None",
       "language": "Java",
+      "flavor": "None",
       "orm": "Raw",
       "platform": "Servlet",
       "webserver": "Resin",
@@ -30,8 +31,9 @@
       "approach": "Realistic",
       "classification": "Platform",
       "database": "MySQL",
-      "framework": "servlet",
+      "framework": "None",
       "language": "Java",
+      "flavor": "None",
       "orm": "Raw",
       "platform": "Servlet",
       "webserver": "Resin",
@@ -50,8 +52,9 @@
       "approach": "Realistic",
       "classification": "Platform",
       "database": "Postgres",
-      "framework": "servlet",
+      "framework": "None",
       "language": "Java",
+      "flavor": "None",
       "orm": "Raw",
       "platform": "Servlet",
       "webserver": "Resin",

frameworks/Java/servlet3-cass/benchmark_config.json

@@ -6,10 +6,10 @@
       "json_url": "/servlet3-cass/json",
       "plaintext_url": "/servlet3-cass/plaintext",
       "port": 8080,
-      "approach": "Realistic",
+      "approach": "Stripped",
       "classification": "Platform",
       "database": "None",
-      "framework": "servlet3-cass",
+      "framework": "None",
       "language": "Java",
       "orm": "Raw",
       "platform": "Servlet",
@@ -26,11 +26,12 @@
       "query_url": "/servlet3-cass/queries?queries=",
       "update_url": "/servlet3-cass/updates?queries=",
       "port": 8080,
-      "approach": "Realistic",
+      "approach": "Stripped",
       "classification": "Platform",
       "database": "Cassandra",
-      "framework": "servlet3-cass",
+      "framework": "None",
       "language": "Java",
+      "flavor": "None",
       "orm": "Raw",
       "platform": "Servlet",
       "webserver": "Resin",

frameworks/Java/spark/benchmark_config.json

@@ -13,6 +13,7 @@
       "database": "MySQL",
       "framework": "spark",
       "language": "Java",
+      "flavor": "None",
       "orm": "Full",
       "platform": "Servlet",
       "webserver": "Resin",

frameworks/Java/spring/benchmark_config.json

@@ -15,6 +15,7 @@
       "database": "MySQL",
       "framework": "spring",
       "language": "Java",
+      "flavor": "None",
       "orm": "Full",
       "platform": "Servlet",
       "webserver": "Tomcat",

frameworks/Java/tapestry/benchmark_config.json

@@ -14,6 +14,7 @@
       "database": "MySQL",
       "framework": "tapestry",
       "language": "Java",
+      "flavor": "None",
       "orm": "Full",
       "platform": "Servlet",
       "webserver": "Resin",

frameworks/Java/undertow-edge/README.md

@@ -1,17 +0,0 @@
-# Undertow Edge Benchmarking Test
-
-This is the undertow portion of a [benchmarking test suite](../) comparing a variety of web development platforms.
-
-Edge version of undertow framework uses native implementation of xnio instead of NIO
-
-### JSON Encoding Test
-* [JSON test source](src/main/java/hello/HelloWebServer.java)
-
-## Versions
-Undertow 1.0.0.Beta31 (http://undertow.io)
-
-## Test URLs
-
-### JSON Encoding Test
-
-    http://localhost:8080

frameworks/Java/undertow-edge/benchmark_config.json

@@ -1,89 +0,0 @@
-{
-  "framework": "undertow-edge",
-  "tests": [{
-    "default": {
-      "setup_file": "setup",
-      "json_url": "/json",
-      "plaintext_url": "/plaintext",
-      "cache_url": "/cache",
-      "port": 8080,
-      "approach": "Realistic",
-      "classification": "Platform",
-      "database": "None",
-      "framework": "undertow-edge",
-      "language": "Java",
-      "orm": "Raw",
-      "platform": "Undertow Edge",
-      "webserver": "None",
-      "os": "Linux",
-      "database_os": "Linux",
-      "display_name": "undertow edge",
-      "notes": "",
-      "versus": ""
-    },
-    "mysql" : {
-      "setup_file": "setup",
-      "db_url": "/db/mysql",
-      "query_url": "/queries/mysql?queries=",
-      "fortune_url": "/fortunes/mysql",
-      "update_url": "/updates/mysql?queries=",
-      "port": 8080,
-      "approach": "Realistic",
-      "classification": "Platform",
-      "database": "MySQL",
-      "framework": "undertow-edge",
-      "language": "Java",
-      "orm": "Raw",
-      "platform": "Undertow Edge",
-      "webserver": "None",
-      "os": "Linux",
-      "database_os": "Linux",
-      "display_name": "undertow edge",
-      "notes": "",
-      "versus": ""
-    },
-    "postgresql" : {
-      "setup_file": "setup",
-      "db_url": "/db/postgresql",
-      "query_url": "/queries/postgresql?queries=",
-      "fortune_url": "/fortunes/postgresql",
-      "update_url": "/updates/postgresql?queries=",
-      "port": 8080,
-      "approach": "Realistic",
-      "classification": "Platform",
-      "database": "Postgres",
-      "framework": "undertow-edge",
-      "language": "Java",
-      "orm": "Raw",
-      "platform": "Undertow Edge",
-      "webserver": "None",
-      "os": "Linux",
-      "database_os": "Linux",
-      "display_name": "undertow edge",
-      "notes": "",
-      "versus": ""
-    },
-    "mongodb" : {
-      "setup_file": "setup",
-      "db_url": "/db/mongodb",
-      "query_url": "/queries/mongodb?queries=",
-      "fortune_url": "/fortunes/mongodb",
-      "update_url": "/updates/mongodb?queries=",
-      "port": 8080,
-      "approach": "Realistic",
-      "classification": "Platform",
-      "database": "MongoDB",
-      "framework": "undertow-edge",
-      "language": "Java",
-      "orm": "Raw",
-      "platform": "Undertow Edge",
-      "webserver": "None",
-      "os": "Linux",
-      "database_os": "Linux",
-      "display_name": "undertow edge",
-      "notes": "",
-      "versus": ""
-    }
-  }]
-}
-

frameworks/Java/undertow-edge/pom.xml

@@ -1,219 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.jboss</groupId>
-        <artifactId>jboss-parent</artifactId>
-        <version>12</version>
-    </parent>
-
-    <groupId>com.techempower</groupId>
-    <artifactId>undertow-edge</artifactId>
-    <version>0.1</version>
-
-    <properties>
-        <postgres-jdbc.version>9.4.1208</postgres-jdbc.version>
-    </properties>
-
-    <dependencies>
-        <!-- Web server -->
-        <dependency>
-            <groupId>io.undertow</groupId>
-            <artifactId>undertow-core</artifactId>
-            <version>1.0.13.Final</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.jboss.xnio</groupId>
-                    <artifactId>xnio-nio</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.jboss.xnio</groupId>
-            <artifactId>xnio-api</artifactId>
-            <version>3.2.1.Final</version>
-        </dependency>
-        <dependency>
-            <groupId>org.jboss.xnio</groupId>
-            <artifactId>xnio-native</artifactId>
-            <version>1.0.0.Beta1</version>
-        </dependency>
-        <!-- Database drivers -->
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-            <version>5.1.38</version>
-        </dependency>
-        <dependency>
-            <groupId>org.postgresql</groupId>
-	    <artifactId>postgresql</artifactId>
-            <version>${postgres-jdbc.version}</version>
-	</dependency>
-        <dependency>
-            <groupId>org.mongodb</groupId>
-            <artifactId>mongo-java-driver</artifactId>
-            <version>2.11.2</version>
-        </dependency>
-        <!-- Database connection pooling -->
-        <dependency>
-            <groupId>commons-dbcp</groupId>
-            <artifactId>commons-dbcp</artifactId>
-            <version>1.4</version>
-        </dependency>
-        <!-- Caching (and misc. utilities) -->
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-            <version>14.0.1</version>
-        </dependency>
-        <!-- JSON encoding -->
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-            <version>2.3.0</version>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
-            <version>2.3.0</version>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core</artifactId>
-            <version>2.3.0</version>
-        </dependency>
-        <!-- HTML templates -->
-        <dependency>
-            <groupId>com.github.spullara.mustache.java</groupId>
-            <artifactId>compiler</artifactId>
-            <version>0.8.13</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <inherited>true</inherited>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.1</version>
-                <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
-                    <optimize>true</optimize>
-                    <debug>false</debug>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>com.googlecode.maven-download-plugin</groupId>
-                <artifactId>maven-download-plugin</artifactId>
-                <version>1.1.0</version>
-                <executions>
-                    <execution>
-                        <id>install-xnio-native</id>
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>wget</goal>
-                        </goals>
-                        <configuration>
-                            <url>http://downloads.jboss.org/xnio/native/1.0/1.0.0.Beta1/xnio-native-1.0.0.Beta1.zip</url>
-                            <unpack>true</unpack>
-                            <outputDirectory>${project.build.directory}</outputDirectory>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <configuration>
-
-                            <target>
-                                <copy todir="${project.build.directory}" file="${project.build.directory}/${native.path}"/>
-                            </target>
-
-                        </configuration>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <version>2.4</version>
-                <configuration>
-                    <archive>
-                        <manifest>
-                            <mainClass>hello.HelloWebServer</mainClass>
-                        </manifest>
-                    </archive>
-                    <attach>
-                    </attach>
-                    <descriptorRefs>
-                        <descriptorRef>jar-with-dependencies</descriptorRef>
-                    </descriptorRefs>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>make-assembly</id>
-                        <!-- this is used for inheritance merges -->
-                        <phase>package</phase>
-                        <!-- bind to the packaging phase -->
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-    <profiles>
-        <profile>
-            <id>32bit-native</id>
-            <activation>
-                <os>
-                    <arch>x86</arch>
-                </os>
-            </activation>
-            <properties>
-                <native.path>linux-i686/libxnio.so</native.path>
-            </properties>
-        </profile>
-
-        <profile>
-            <id>64bit-native</id>
-            <activation>
-                <os>
-                    <arch>amd64</arch>
-                </os>
-            </activation>
-            <properties>
-                <native.path>linux-x86_64/libxnio.so</native.path>
-            </properties>
-        </profile>
-    </profiles>
-    <repositories>
-        <repository>
-            <id>jboss-public-repository-group</id>
-            <name>JBoss Public Maven Repository Group</name>
-            <url>https://repository.jboss.org/nexus/content/groups/public/</url>
-            <layout>default</layout>
-            <releases>
-                <enabled>true</enabled>
-                <updatePolicy>never</updatePolicy>
-            </releases>
-            <snapshots>
-                <enabled>true</enabled>
-                <updatePolicy>never</updatePolicy>
-            </snapshots>
-        </repository>
-    </repositories>
-
-</project>

frameworks/Java/undertow-edge/setup.sh

@@ -1,8 +0,0 @@
-#!/bin/bash
-
-sed -i 's|127.0.0.1|'${DBHOST}'|g' src/main/resources/hello/server.properties
-
-fw_depends java maven
-
-mvn clean package
-java -Djava.library.path=target/ -jar target/undertow-edge-0.1-jar-with-dependencies.jar &

frameworks/Java/undertow-edge/source_code

@@ -1,4 +0,0 @@
-./undertow/src/main/java/hello/
-./undertow/src/main/java/hello/HelloWebServer.java
-./undertow/src/main/java/hello/World.java
-./undertow/src/main/java/hello/Fortune.java

frameworks/Java/undertow-edge/src/main/java/hello/CacheHandler.java

@@ -1,37 +0,0 @@
-package hello;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.cache.LoadingCache;
-import io.undertow.server.HttpHandler;
-import io.undertow.server.HttpServerExchange;
-import io.undertow.util.Headers;
-
-import java.util.Objects;
-
-import static hello.HelloWebServer.JSON_UTF8;
-
-/**
- * Handles the cache access test.
- */
-final class CacheHandler implements HttpHandler {
-  private final ObjectMapper objectMapper;
-  private final LoadingCache<Integer, World> worldCache;
-
-  CacheHandler(ObjectMapper objectMapper,
-               LoadingCache<Integer, World> worldCache) {
-    this.objectMapper = Objects.requireNonNull(objectMapper);
-    this.worldCache = Objects.requireNonNull(worldCache);
-  }
-
-  @Override
-  public void handleRequest(HttpServerExchange exchange) throws Exception {
-    int queries = Helper.getQueries(exchange);
-    World[] worlds = new World[queries];
-    for (int i = 0; i < queries; i++) {
-      worlds[i] = worldCache.get(Helper.randomWorld());
-    }
-    exchange.getResponseHeaders().put(
-        Headers.CONTENT_TYPE, JSON_UTF8);
-    exchange.getResponseSender().send(objectMapper.writeValueAsString(worlds));
-  }
-}

frameworks/Java/undertow-edge/src/main/java/hello/DbMongoHandler.java

@@ -1,68 +0,0 @@
-package hello;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.mongodb.BasicDBObject;
-import com.mongodb.DB;
-import com.mongodb.DBObject;
-import io.undertow.server.HttpHandler;
-import io.undertow.server.HttpServerExchange;
-import io.undertow.util.Headers;
-
-import java.util.Objects;
-
-import static hello.HelloWebServer.JSON_UTF8;
-
-/**
- * Handles the single- and multiple-query database tests using MongoDB.
- */
-final class DbMongoHandler implements HttpHandler {
-  private final ObjectMapper objectMapper;
-  private final DB database;
-  private final boolean multiple;
-
-  DbMongoHandler(ObjectMapper objectMapper, DB database, boolean multiple) {
-    this.objectMapper = Objects.requireNonNull(objectMapper);
-    this.database = Objects.requireNonNull(database);
-    this.multiple = multiple;
-  }
-
-  @Override
-  public void handleRequest(HttpServerExchange exchange) throws Exception {
-    if (exchange.isInIoThread()) {
-      exchange.dispatch(this);
-      return;
-    }
-    
-    int queries = 1;
-    if(multiple)
-    {
-      queries = Helper.getQueries(exchange);
-    }
-    
-    World[] worlds = new World[queries];
-    for (int i = 0; i < queries; i++) {
-      DBObject object = database.getCollection("World").findOne(
-          new BasicDBObject("_id", Helper.randomWorld()));
-      worlds[i] = new World(
-          //
-          // The creation script for the Mongo database inserts these numbers as
-          // JavaScript numbers, which resolve to Doubles in Java.
-          //
-          ((Number) object.get("_id")).intValue(),
-          ((Number) object.get("randomNumber")).intValue());
-    }
-    exchange.getResponseHeaders().put(
-        Headers.CONTENT_TYPE, JSON_UTF8);
-    
-    if (multiple)
-    {
-      // If a multiple query then response must be an array
-      exchange.getResponseSender().send(objectMapper.writeValueAsString(worlds));
-    }
-    else
-    {
-      // If a single query then response must be an object
-      exchange.getResponseSender().send(objectMapper.writeValueAsString(worlds[0]));
-    }
-  }
-}

frameworks/Java/undertow-edge/src/main/java/hello/DbSqlHandler.java

@@ -1,75 +0,0 @@
-package hello;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-import io.undertow.server.HttpHandler;
-import io.undertow.server.HttpServerExchange;
-import io.undertow.util.Headers;
-
-import javax.sql.DataSource;
-
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.util.Objects;
-
-import static hello.HelloWebServer.JSON_UTF8;
-
-/**
- * Handles the single- and multiple-query database tests using a SQL database.
- */
-final class DbSqlHandler implements HttpHandler {
-  private final ObjectMapper objectMapper;
-  private final DataSource database;
-  private final boolean multiple;
-
-  DbSqlHandler(ObjectMapper objectMapper, DataSource database, boolean multiple) {
-    this.objectMapper = Objects.requireNonNull(objectMapper);
-    this.database = Objects.requireNonNull(database);
-    this.multiple = multiple;
-  }
-
-  @Override
-  public void handleRequest(HttpServerExchange exchange) throws Exception {
-    if (exchange.isInIoThread()) {
-      exchange.dispatch(this);
-      return;
-    }
-    
-    int queries = 1;
-    if(multiple)
-    {
-      queries = Helper.getQueries(exchange);
-    }
-    
-    World[] worlds = new World[queries];
-    try (Connection connection = database.getConnection();
-         PreparedStatement statement = connection.prepareStatement(
-             "SELECT * FROM World WHERE id = ?",
-             ResultSet.TYPE_FORWARD_ONLY,
-             ResultSet.CONCUR_READ_ONLY)) {
-      for (int i = 0; i < queries; i++) {
-        statement.setInt(1, Helper.randomWorld());
-        try (ResultSet resultSet = statement.executeQuery()) {
-          resultSet.next();
-          worlds[i] = new World(
-              resultSet.getInt("id"),
-              resultSet.getInt("randomNumber"));
-        }
-      }
-    }
-    exchange.getResponseHeaders().put(
-        Headers.CONTENT_TYPE, JSON_UTF8);
-    
-    if (multiple)
-    {
-      // If a multiple query then response must be an array
-      exchange.getResponseSender().send(objectMapper.writeValueAsString(worlds));
-    }
-    else
-    {
-      // If a single query then response must be an object
-      exchange.getResponseSender().send(objectMapper.writeValueAsString(worlds[0]));
-    }
-  }
-}

frameworks/Java/undertow-edge/src/main/java/hello/Fortune.java

@@ -1,25 +0,0 @@
-package hello;
-
-/**
- * The model for the "fortune" database table.
- */
-public final class Fortune implements Comparable<Fortune> {
-  public int id;
-  public String message;
-
-  /**
-   * Constructs a new fortune object with the given parameters.
-   *
-   * @param id the ID of the fortune
-   * @param message the message of the fortune
-   */
-  public Fortune(int id, String message) {
-    this.id = id;
-    this.message = message;
-  }
-
-  @Override
-  public int compareTo(Fortune other) {
-    return message.compareTo(other.message);
-  }
-}