msmith-techempower 9 years ago
parent
commit
1cfff59009
64 changed files with 255 additions and 143 deletions
  1. 1 0
      frameworks/CSharp/aspnetcore/benchmark_config.json
  2. 2 1
      frameworks/D/vibed/benchmark_config.json
  3. 2 1
      frameworks/Haskell/servant/benchmark_config.json
  4. 1 1
      frameworks/Haskell/snap/benchmark_config.json
  5. 2 1
      frameworks/Java/baratine/benchmark_config.json
  6. 1 1
      frameworks/Java/bayou/benchmark_config.json
  7. 4 3
      frameworks/Java/comsat-servlet/benchmark_config.json
  8. 2 2
      frameworks/Java/comsat-webactors/benchmark_config.json
  9. 1 1
      frameworks/Java/gemini/benchmark_config.json
  10. 1 0
      frameworks/Java/grizzly-jersey/benchmark_config.json
  11. 1 0
      frameworks/Java/jawn/benchmark_config.json
  12. 5 4
      frameworks/Java/jetty-servlet/benchmark_config.json
  13. 4 3
      frameworks/Java/jetty/benchmark_config.json
  14. 1 1
      frameworks/Java/jlhttp/benchmark_config.json
  15. 3 2
      frameworks/Java/jooby/benchmark_config.json
  16. 1 0
      frameworks/Java/netty/benchmark_config.json
  17. 4 3
      frameworks/Java/ninja-standalone/benchmark_config.json
  18. 3 2
      frameworks/Java/officefloor/benchmark_config.json
  19. 3 2
      frameworks/Java/permeagility/benchmark_config.json
  20. 1 0
      frameworks/Java/play1/benchmark_config.json
  21. 3 0
      frameworks/Java/play2-java/benchmark_config.json
  22. 3 2
      frameworks/Java/rapidoid/benchmark_config.json
  23. 3 0
      frameworks/Java/restexpress/benchmark_config.json
  24. 2 1
      frameworks/Java/revenj/benchmark_config.json
  25. 4 0
      frameworks/Java/sabina/benchmark_config.json
  26. 6 3
      frameworks/Java/servlet/benchmark_config.json
  27. 5 4
      frameworks/Java/servlet3-cass/benchmark_config.json
  28. 1 0
      frameworks/Java/spark/benchmark_config.json
  29. 1 0
      frameworks/Java/spring/benchmark_config.json
  30. 1 0
      frameworks/Java/tapestry/benchmark_config.json
  31. 16 12
      frameworks/Java/undertow-edge/benchmark_config.json
  32. 6 5
      frameworks/Java/undertow-jersey-c3p0/benchmark_config.json
  33. 5 5
      frameworks/Java/undertow-jersey-hikaricp/benchmark_config.json
  34. 8 4
      frameworks/Java/undertow/benchmark_config.json
  35. 7 3
      frameworks/Java/vertx-web/benchmark_config.json
  36. 2 1
      frameworks/Java/vertx/benchmark_config.json
  37. 1 0
      frameworks/Java/wicket/benchmark_config.json
  38. 2 1
      frameworks/Java/wildfly-ee7/benchmark_config.json
  39. 6 3
      frameworks/JavaScript/express/benchmark_config.json
  40. 8 4
      frameworks/JavaScript/hapi/benchmark_config.json
  41. 2 1
      frameworks/JavaScript/koa/benchmark_config.json
  42. 10 5
      frameworks/JavaScript/nodejs/benchmark_config.json
  43. 2 1
      frameworks/JavaScript/ringojs-convenient/benchmark_config.json
  44. 3 2
      frameworks/JavaScript/ringojs/benchmark_config.json
  45. 4 2
      frameworks/JavaScript/sailsjs/benchmark_config.json
  46. 2 1
      frameworks/Kotlin/hexagon/benchmark_config.json
  47. 1 1
      frameworks/PHP/phalcon-micro/benchmark_config.json
  48. 2 2
      frameworks/PHP/phalcon/benchmark_config.json
  49. 20 10
      frameworks/Python/asyncio/benchmark_config.json
  50. 9 4
      frameworks/Python/bottle/benchmark_config.json
  51. 6 4
      frameworks/Python/cherrypy/benchmark_config.json
  52. 6 3
      frameworks/Python/django/benchmark_config.json
  53. 6 3
      frameworks/Python/falcon/benchmark_config.json
  54. 11 5
      frameworks/Python/flask/benchmark_config.json
  55. 2 1
      frameworks/Python/historical/benchmark_config.json
  56. 5 4
      frameworks/Python/klein/benchmark_config.json
  57. 4 2
      frameworks/Python/pyramid/benchmark_config.json
  58. 9 6
      frameworks/Python/tornado/benchmark_config.json
  59. 1 0
      frameworks/Python/turbogears/benchmark_config.json
  60. 5 3
      frameworks/Python/uwsgi/benchmark_config.json
  61. 2 1
      frameworks/Python/web2py/benchmark_config.json
  62. 4 2
      frameworks/Python/wheezyweb/benchmark_config.json
  63. 3 2
      frameworks/Python/wsgi/benchmark_config.json
  64. 3 2
      frameworks/Racket/racket-ws/benchmark_config.json

+ 1 - 0
frameworks/CSharp/aspnetcore/benchmark_config.json

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

+ 2 - 1
frameworks/D/vibed/benchmark_config.json

@@ -39,8 +39,9 @@
       "database": "MongoDB",
       "database": "MongoDB",
       "framework": "vibed",
       "framework": "vibed",
       "language": "D",
       "language": "D",
+      "flavor": "DLang2",
       "orm": "Micro",
       "orm": "Micro",
-      "platform": "D",
+      "platform": "None",
       "webserver": "None",
       "webserver": "None",
       "os": "Linux",
       "os": "Linux",
       "database_os": "Linux",
       "database_os": "Linux",

+ 2 - 1
frameworks/Haskell/servant/benchmark_config.json

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

+ 1 - 1
frameworks/Haskell/snap/benchmark_config.json

@@ -15,7 +15,7 @@
       "language": "Haskell",
       "language": "Haskell",
       "flavor": "GHC78",
       "flavor": "GHC78",
       "orm": "Full",
       "orm": "Full",
-      "platform": "Snap",
+      "platform": "None",
       "webserver": "None",
       "webserver": "None",
       "os": "Linux",
       "os": "Linux",
       "database_os": "Linux",
       "database_os": "Linux",

+ 2 - 1
frameworks/Java/baratine/benchmark_config.json

@@ -11,8 +11,9 @@
       "database": "None",
       "database": "None",
       "framework": "None",
       "framework": "None",
       "language": "Java",
       "language": "Java",
+      "flavor": "Java8",
       "orm": "Raw",
       "orm": "Raw",
-      "platform": "None",
+      "platform": "Baratine",
       "webserver": "None",
       "webserver": "None",
       "os": "Linux",
       "os": "Linux",
       "database_os": "Linux",
       "database_os": "Linux",

+ 1 - 1
frameworks/Java/bayou/benchmark_config.json

@@ -13,7 +13,7 @@
             "language": "Java",
             "language": "Java",
             "flavor": "Java8",
             "flavor": "Java8",
             "orm": "Raw",
             "orm": "Raw",
-            "platform": "None",
+            "platform": "Bayou",
             "webserver": "None",
             "webserver": "None",
             "os": "Linux",
             "os": "Linux",
             "database_os": "Linux",
             "database_os": "Linux",

+ 4 - 3
frameworks/Java/comsat-servlet/benchmark_config.json

@@ -10,11 +10,12 @@
         "approach": "Realistic",
         "approach": "Realistic",
         "classification": "Platform",
         "classification": "Platform",
         "database": "None",
         "database": "None",
-        "framework": "comsat-servlet",
+        "framework": "None",
         "language": "Java",
         "language": "Java",
+        "flavor": "Java8",
         "orm": "Raw",
         "orm": "Raw",
-        "platform": "Comsat Servlet",
-        "webserver": "Jetty",
+        "platform": "Servlet",
+        "webserver": "None",
         "os": "Linux",
         "os": "Linux",
         "database_os": "Linux",
         "database_os": "Linux",
         "display_name": "comsat-servlet-jetty",
         "display_name": "comsat-servlet-jetty",

+ 2 - 2
frameworks/Java/comsat-webactors/benchmark_config.json

@@ -14,7 +14,7 @@
         "language": "Java",
         "language": "Java",
         "flavor": "Java8",
         "flavor": "Java8",
         "orm": "Raw",
         "orm": "Raw",
-        "platform": "None",
+        "platform": "Comsat",
         "webserver": "None",
         "webserver": "None",
         "os": "Linux",
         "os": "Linux",
         "database_os": "Linux",
         "database_os": "Linux",
@@ -34,7 +34,7 @@
         "language": "Java",
         "language": "Java",
         "flavor": "Java8",
         "flavor": "Java8",
         "orm": "Raw",
         "orm": "Raw",
-        "platform": "None",
+        "platform": "Comsat",
         "webserver": "None",
         "webserver": "None",
         "os": "Linux",
         "os": "Linux",
         "database_os": "Linux",
         "database_os": "Linux",

+ 1 - 1
frameworks/Java/gemini/benchmark_config.json

@@ -14,7 +14,7 @@
       "flavor": "Java8",
       "flavor": "Java8",
       "orm": "Micro",
       "orm": "Micro",
       "platform": "Servlet",
       "platform": "Servlet",
-      "webserver": "None",
+      "webserver": "Resin",
       "os": "Linux",
       "os": "Linux",
       "database_os": "Linux",
       "database_os": "Linux",
       "display_name": "Gemini",
       "display_name": "Gemini",

+ 1 - 0
frameworks/Java/grizzly-jersey/benchmark_config.json

@@ -14,6 +14,7 @@
       "database": "MySQL",
       "database": "MySQL",
       "framework": "Grizzly",
       "framework": "Grizzly",
       "language": "Java",
       "language": "Java",
+      "flavor": "Java8",
       "orm": "Full",
       "orm": "Full",
       "platform": "JAX-RS",
       "platform": "JAX-RS",
       "webserver": "None",
       "webserver": "None",

+ 1 - 0
frameworks/Java/jawn/benchmark_config.json

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

+ 5 - 4
frameworks/Java/jetty-servlet/benchmark_config.json

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

+ 4 - 3
frameworks/Java/jetty/benchmark_config.json

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

+ 1 - 1
frameworks/Java/jlhttp/benchmark_config.json

@@ -13,7 +13,7 @@
       "flavor": "Java8",
       "flavor": "Java8",
       "language": "Java",
       "language": "Java",
       "orm": "Raw",
       "orm": "Raw",
-      "platform": "None",
+      "platform": "JLHTTP",
       "webserver": "None",
       "webserver": "None",
       "os": "Linux",
       "os": "Linux",
       "database_os": "Linux",
       "database_os": "Linux",

+ 3 - 2
frameworks/Java/jooby/benchmark_config.json

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

+ 1 - 0
frameworks/Java/netty/benchmark_config.json

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

+ 4 - 3
frameworks/Java/ninja-standalone/benchmark_config.json

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

+ 3 - 2
frameworks/Java/officefloor/benchmark_config.json

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

+ 3 - 2
frameworks/Java/permeagility/benchmark_config.json

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

+ 1 - 0
frameworks/Java/play1/benchmark_config.json

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

+ 3 - 0
frameworks/Java/play2-java/benchmark_config.json

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

+ 3 - 2
frameworks/Java/rapidoid/benchmark_config.json

@@ -9,14 +9,15 @@
       "approach": "Stripped",
       "approach": "Stripped",
       "classification": "Platform",
       "classification": "Platform",
       "database": "None",
       "database": "None",
-      "framework": "rapidoid",
+      "framework": "None",
       "language": "Java",
       "language": "Java",
+      "flavor": "Java8",
       "orm": "Raw",
       "orm": "Raw",
       "platform": "Rapidoid",
       "platform": "Rapidoid",
       "webserver": "None",
       "webserver": "None",
       "os": "Linux",
       "os": "Linux",
       "database_os": "Linux",
       "database_os": "Linux",
-      "display_name": "rapidoid",
+      "display_name": "Rapidoid",
       "notes": "",
       "notes": "",
       "versus": "rapidoid"
       "versus": "rapidoid"
     }
     }

+ 3 - 0
frameworks/Java/restexpress/benchmark_config.json

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

+ 2 - 1
frameworks/Java/revenj/benchmark_config.json

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

+ 4 - 0
frameworks/Java/sabina/benchmark_config.json

@@ -16,6 +16,7 @@
       "database": "MongoDB",
       "database": "MongoDB",
       "framework": "Sabina",
       "framework": "Sabina",
       "language": "Java",
       "language": "Java",
+      "flavor": "Java8",
       "orm": "Raw",
       "orm": "Raw",
       "platform": "Servlet",
       "platform": "Servlet",
       "webserver": "None",
       "webserver": "None",
@@ -40,6 +41,7 @@
       "database": "MySQL",
       "database": "MySQL",
       "framework": "Sabina",
       "framework": "Sabina",
       "language": "Java",
       "language": "Java",
+      "flavor": "Java8",
       "orm": "Raw",
       "orm": "Raw",
       "platform": "Servlet",
       "platform": "Servlet",
       "webserver": "None",
       "webserver": "None",
@@ -64,6 +66,7 @@
       "database": "MySQL",
       "database": "MySQL",
       "framework": "Sabina",
       "framework": "Sabina",
       "language": "Java",
       "language": "Java",
+      "flavor": "Java8",
       "orm": "Raw",
       "orm": "Raw",
       "platform": "Servlet",
       "platform": "Servlet",
       "webserver": "None",
       "webserver": "None",
@@ -88,6 +91,7 @@
       "database": "MongoDB",
       "database": "MongoDB",
       "framework": "Sabina",
       "framework": "Sabina",
       "language": "Java",
       "language": "Java",
+      "flavor": "Java8",
       "orm": "Raw",
       "orm": "Raw",
       "platform": "Servlet",
       "platform": "Servlet",
       "webserver": "None",
       "webserver": "None",

+ 6 - 3
frameworks/Java/servlet/benchmark_config.json

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

+ 5 - 4
frameworks/Java/servlet3-cass/benchmark_config.json

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

+ 1 - 0
frameworks/Java/spark/benchmark_config.json

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

+ 1 - 0
frameworks/Java/spring/benchmark_config.json

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

+ 1 - 0
frameworks/Java/tapestry/benchmark_config.json

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

+ 16 - 12
frameworks/Java/undertow-edge/benchmark_config.json

@@ -7,13 +7,14 @@
       "plaintext_url": "/plaintext",
       "plaintext_url": "/plaintext",
       "cache_url": "/cache",
       "cache_url": "/cache",
       "port": 8080,
       "port": 8080,
-      "approach": "Realistic",
+      "approach": "Stripped",
       "classification": "Platform",
       "classification": "Platform",
       "database": "None",
       "database": "None",
-      "framework": "undertow-edge",
+      "framework": "None",
       "language": "Java",
       "language": "Java",
+      "flavor": "Java8",
       "orm": "Raw",
       "orm": "Raw",
-      "platform": "Undertow Edge",
+      "platform": "Undertow",
       "webserver": "None",
       "webserver": "None",
       "os": "Linux",
       "os": "Linux",
       "database_os": "Linux",
       "database_os": "Linux",
@@ -28,13 +29,14 @@
       "fortune_url": "/fortunes/mysql",
       "fortune_url": "/fortunes/mysql",
       "update_url": "/updates/mysql?queries=",
       "update_url": "/updates/mysql?queries=",
       "port": 8080,
       "port": 8080,
-      "approach": "Realistic",
+      "approach": "Stripped",
       "classification": "Platform",
       "classification": "Platform",
       "database": "MySQL",
       "database": "MySQL",
-      "framework": "undertow-edge",
+      "framework": "None",
       "language": "Java",
       "language": "Java",
+      "flavor": "Java8",
       "orm": "Raw",
       "orm": "Raw",
-      "platform": "Undertow Edge",
+      "platform": "Undertow",
       "webserver": "None",
       "webserver": "None",
       "os": "Linux",
       "os": "Linux",
       "database_os": "Linux",
       "database_os": "Linux",
@@ -49,13 +51,14 @@
       "fortune_url": "/fortunes/postgresql",
       "fortune_url": "/fortunes/postgresql",
       "update_url": "/updates/postgresql?queries=",
       "update_url": "/updates/postgresql?queries=",
       "port": 8080,
       "port": 8080,
-      "approach": "Realistic",
+      "approach": "Stripped",
       "classification": "Platform",
       "classification": "Platform",
       "database": "Postgres",
       "database": "Postgres",
-      "framework": "undertow-edge",
+      "framework": "None",
       "language": "Java",
       "language": "Java",
+      "flavor": "Java8",
       "orm": "Raw",
       "orm": "Raw",
-      "platform": "Undertow Edge",
+      "platform": "Undertow",
       "webserver": "None",
       "webserver": "None",
       "os": "Linux",
       "os": "Linux",
       "database_os": "Linux",
       "database_os": "Linux",
@@ -70,13 +73,14 @@
       "fortune_url": "/fortunes/mongodb",
       "fortune_url": "/fortunes/mongodb",
       "update_url": "/updates/mongodb?queries=",
       "update_url": "/updates/mongodb?queries=",
       "port": 8080,
       "port": 8080,
-      "approach": "Realistic",
+      "approach": "Stripped",
       "classification": "Platform",
       "classification": "Platform",
       "database": "MongoDB",
       "database": "MongoDB",
-      "framework": "undertow-edge",
+      "framework": "None",
       "language": "Java",
       "language": "Java",
+      "flavor": "Java8",
       "orm": "Raw",
       "orm": "Raw",
-      "platform": "Undertow Edge",
+      "platform": "Undertow",
       "webserver": "None",
       "webserver": "None",
       "os": "Linux",
       "os": "Linux",
       "database_os": "Linux",
       "database_os": "Linux",

+ 6 - 5
frameworks/Java/undertow-jersey-c3p0/benchmark_config.json

@@ -10,16 +10,17 @@
       "plaintext_url": "/plaintext",
       "plaintext_url": "/plaintext",
       "port": 8080,
       "port": 8080,
       "approach": "Realistic",
       "approach": "Realistic",
-      "classification": "Micro",
+      "classification": "Platform",
       "database": "MySQL",
       "database": "MySQL",
-      "framework": "undertow-jersey",
+      "framework": "Jersey",
       "language": "Java",
       "language": "Java",
+      "flavor": "Java8",
       "orm": "Full",
       "orm": "Full",
-      "platform": "Servlet",
-      "webserver": "Undertow",
+      "platform": "JAX-RS",
+      "webserver": "None",
       "os": "Linux",
       "os": "Linux",
       "database_os": "Linux",
       "database_os": "Linux",
-      "display_name": "undertow-jersey-c3p0",
+      "display_name": "Undertow",
       "notes": "",
       "notes": "",
       "versus": "undertow-jersey-hikaricp"
       "versus": "undertow-jersey-hikaricp"
     }
     }

+ 5 - 5
frameworks/Java/undertow-jersey-hikaricp/benchmark_config.json

@@ -10,16 +10,16 @@
       "plaintext_url": "/plaintext",
       "plaintext_url": "/plaintext",
       "port": 8080,
       "port": 8080,
       "approach": "Realistic",
       "approach": "Realistic",
-      "classification": "Micro",
+      "classification": "Platform",
       "database": "MySQL",
       "database": "MySQL",
-      "framework": "undertow-jersey",
+      "framework": "Jersey",
       "language": "Java",
       "language": "Java",
       "orm": "Full",
       "orm": "Full",
-      "platform": "Servlet",
-      "webserver": "Undertow",
+      "platform": "JAX-RS",
+      "webserver": "None",
       "os": "Linux",
       "os": "Linux",
       "database_os": "Linux",
       "database_os": "Linux",
-      "display_name": "undertow-jersey-hikaricp",
+      "display_name": "Undertow-hikaricp",
       "notes": "",
       "notes": "",
       "versus": "undertow-jersey-c3p0"
       "versus": "undertow-jersey-c3p0"
     }
     }

+ 8 - 4
frameworks/Java/undertow/benchmark_config.json

@@ -10,8 +10,9 @@
       "approach": "Realistic",
       "approach": "Realistic",
       "classification": "Platform",
       "classification": "Platform",
       "database": "None",
       "database": "None",
-      "framework": "undertow",
+      "framework": "None",
       "language": "Java",
       "language": "Java",
+      "flavor": "Java8",
       "orm": "Raw",
       "orm": "Raw",
       "platform": "Undertow",
       "platform": "Undertow",
       "webserver": "None",
       "webserver": "None",
@@ -31,8 +32,9 @@
       "approach": "Realistic",
       "approach": "Realistic",
       "classification": "Platform",
       "classification": "Platform",
       "database": "MySQL",
       "database": "MySQL",
-      "framework": "undertow",
+      "framework": "None",
       "language": "Java",
       "language": "Java",
+      "flavor": "Java8",
       "orm": "Raw",
       "orm": "Raw",
       "platform": "Undertow",
       "platform": "Undertow",
       "webserver": "None",
       "webserver": "None",
@@ -52,8 +54,9 @@
       "approach": "Realistic",
       "approach": "Realistic",
       "classification": "Platform",
       "classification": "Platform",
       "database": "Postgres",
       "database": "Postgres",
-      "framework": "undertow",
+      "framework": "None",
       "language": "Java",
       "language": "Java",
+      "flavor": "Java8",
       "orm": "Raw",
       "orm": "Raw",
       "platform": "Undertow",
       "platform": "Undertow",
       "webserver": "None",
       "webserver": "None",
@@ -73,8 +76,9 @@
       "approach": "Realistic",
       "approach": "Realistic",
       "classification": "Platform",
       "classification": "Platform",
       "database": "MongoDB",
       "database": "MongoDB",
-      "framework": "undertow",
+      "framework": "None",
       "language": "Java",
       "language": "Java",
+      "flavor": "Java8",
       "orm": "Raw",
       "orm": "Raw",
       "platform": "Undertow",
       "platform": "Undertow",
       "webserver": "None",
       "webserver": "None",

+ 7 - 3
frameworks/Java/vertx-web/benchmark_config.json

@@ -11,6 +11,7 @@
       "database": "None",
       "database": "None",
       "framework": "vertx-web",
       "framework": "vertx-web",
       "language": "Java",
       "language": "Java",
+      "flavor": "Java8",
       "orm": "Raw",
       "orm": "Raw",
       "platform": "vertx",
       "platform": "vertx",
       "webserver": "None",
       "webserver": "None",
@@ -32,12 +33,13 @@
       "database": "MongoDB",
       "database": "MongoDB",
       "framework": "vertx-web",
       "framework": "vertx-web",
       "language": "Java",
       "language": "Java",
+      "flavor": "Java8",
       "orm": "Raw",
       "orm": "Raw",
       "platform": "vertx",
       "platform": "vertx",
       "webserver": "None",
       "webserver": "None",
       "os": "Linux",
       "os": "Linux",
       "database_os": "Linux",
       "database_os": "Linux",
-      "display_name": "vertx-web-mongodb",
+      "display_name": "vertx-web",
       "notes": "",
       "notes": "",
       "versus": ""
       "versus": ""
     },
     },
@@ -53,12 +55,13 @@
       "database": "Postgres",
       "database": "Postgres",
       "framework": "vertx-web",
       "framework": "vertx-web",
       "language": "Java",
       "language": "Java",
+      "flavor": "Java8",
       "orm": "Raw",
       "orm": "Raw",
       "platform": "vertx",
       "platform": "vertx",
       "webserver": "None",
       "webserver": "None",
       "os": "Linux",
       "os": "Linux",
       "database_os": "Linux",
       "database_os": "Linux",
-      "display_name": "vertx-web-mysql",
+      "display_name": "vertx-web",
       "notes": "",
       "notes": "",
       "versus": ""
       "versus": ""
     },
     },
@@ -74,12 +77,13 @@
       "database": "Postgres",
       "database": "Postgres",
       "framework": "vertx-web",
       "framework": "vertx-web",
       "language": "Java",
       "language": "Java",
+      "flavor": "Java8",
       "orm": "Raw",
       "orm": "Raw",
       "platform": "vertx",
       "platform": "vertx",
       "webserver": "None",
       "webserver": "None",
       "os": "Linux",
       "os": "Linux",
       "database_os": "Linux",
       "database_os": "Linux",
-      "display_name": "vertx-web-postgres",
+      "display_name": "vertx-webs",
       "notes": "",
       "notes": "",
       "versus": ""
       "versus": ""
     }
     }

+ 2 - 1
frameworks/Java/vertx/benchmark_config.json

@@ -9,8 +9,9 @@
       "approach": "Realistic",
       "approach": "Realistic",
       "classification": "Platform",
       "classification": "Platform",
       "database": "None",
       "database": "None",
-      "framework": "vertx",
+      "framework": "None",
       "language": "Java",
       "language": "Java",
+      "flavor": "Java8",
       "orm": "Raw",
       "orm": "Raw",
       "platform": "Netty",
       "platform": "Netty",
       "webserver": "None",
       "webserver": "None",

+ 1 - 0
frameworks/Java/wicket/benchmark_config.json

@@ -15,6 +15,7 @@
       "database": "MySQL",
       "database": "MySQL",
       "framework": "wicket",
       "framework": "wicket",
       "language": "Java",
       "language": "Java",
+      "flavor": "Java8",
       "orm": "Full",
       "orm": "Full",
       "platform": "Servlet",
       "platform": "Servlet",
       "webserver": "Resin",
       "webserver": "Resin",

+ 2 - 1
frameworks/Java/wildfly-ee7/benchmark_config.json

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

+ 6 - 3
frameworks/JavaScript/express/benchmark_config.json

@@ -11,8 +11,9 @@
       "database": "None",
       "database": "None",
       "framework": "express",
       "framework": "express",
       "language": "JavaScript",
       "language": "JavaScript",
+      "flavor": "NodeJS",
       "orm": "Full",
       "orm": "Full",
-      "platform": "nodejs",
+      "platform": "None",
       "webserver": "None",
       "webserver": "None",
       "os": "Linux",
       "os": "Linux",
       "database_os": "Linux",
       "database_os": "Linux",
@@ -31,8 +32,9 @@
       "database": "MongoDB",
       "database": "MongoDB",
       "framework": "express",
       "framework": "express",
       "language": "JavaScript",
       "language": "JavaScript",
+      "flavor": "NodeJS",
       "orm": "Full",
       "orm": "Full",
-      "platform": "nodejs",
+      "platform": "None",
       "webserver": "None",
       "webserver": "None",
       "os": "Linux",
       "os": "Linux",
       "database_os": "Linux",
       "database_os": "Linux",
@@ -52,8 +54,9 @@
       "database": "MySQL",
       "database": "MySQL",
       "framework": "express",
       "framework": "express",
       "language": "JavaScript",
       "language": "JavaScript",
+      "flavor": "NodeJS",
       "orm": "Full",
       "orm": "Full",
-      "platform": "nodejs",
+      "platform": "None",
       "webserver": "None",
       "webserver": "None",
       "os": "Linux",
       "os": "Linux",
       "database_os": "Linux",
       "database_os": "Linux",

+ 8 - 4
frameworks/JavaScript/hapi/benchmark_config.json

@@ -11,8 +11,9 @@
       "database": "None",
       "database": "None",
       "framework": "hapi",
       "framework": "hapi",
       "language": "JavaScript",
       "language": "JavaScript",
+      "flavor": "NodeJS",
       "orm": "Raw",
       "orm": "Raw",
-      "platform": "nodejs",
+      "platform": "None",
       "webserver": "None",
       "webserver": "None",
       "os": "Linux",
       "os": "Linux",
       "database_os": "Linux",
       "database_os": "Linux",
@@ -32,8 +33,9 @@
       "database": "MongoDB",
       "database": "MongoDB",
       "framework": "hapi",
       "framework": "hapi",
       "language": "JavaScript",
       "language": "JavaScript",
+      "flavor": "NodeJS",
       "orm": "Full",
       "orm": "Full",
-      "platform": "nodejs",
+      "platform": "None",
       "webserver": "None",
       "webserver": "None",
       "os": "Linux",
       "os": "Linux",
       "database_os": "Linux",
       "database_os": "Linux",
@@ -53,8 +55,9 @@
       "database": "MySQL",
       "database": "MySQL",
       "framework": "hapi",
       "framework": "hapi",
       "language": "JavaScript",
       "language": "JavaScript",
+      "flavor": "NodeJS",
       "orm": "Full",
       "orm": "Full",
-      "platform": "nodejs",
+      "platform": "None",
       "webserver": "None",
       "webserver": "None",
       "os": "Linux",
       "os": "Linux",
       "database_os": "Linux",
       "database_os": "Linux",
@@ -74,8 +77,9 @@
       "database": "Postgres",
       "database": "Postgres",
       "framework": "hapi",
       "framework": "hapi",
       "language": "JavaScript",
       "language": "JavaScript",
+      "flavor": "NodeJS",
       "orm": "Full",
       "orm": "Full",
-      "platform": "nodejs",
+      "platform": "None",
       "webserver": "None",
       "webserver": "None",
       "os": "Linux",
       "os": "Linux",
       "database_os": "Linux",
       "database_os": "Linux",

+ 2 - 1
frameworks/JavaScript/koa/benchmark_config.json

@@ -15,8 +15,9 @@
       "database": "MongoDB",
       "database": "MongoDB",
       "framework": "koa",
       "framework": "koa",
       "language": "JavaScript",
       "language": "JavaScript",
+      "flavor": "NodeJS",
       "orm": "Raw",
       "orm": "Raw",
-      "platform": "nodejs",
+      "platform": "None",
       "webserver": "None",
       "webserver": "None",
       "os": "Linux",
       "os": "Linux",
       "database_os": "Linux",
       "database_os": "Linux",

+ 10 - 5
frameworks/JavaScript/nodejs/benchmark_config.json

@@ -13,8 +13,9 @@
       "approach": "Realistic",
       "approach": "Realistic",
       "classification": "Platform",
       "classification": "Platform",
       "database": "MySQL",
       "database": "MySQL",
-      "framework": "nodejs",
+      "framework": "None",
       "language": "JavaScript",
       "language": "JavaScript",
+      "flavor": "NodeJS",
       "orm": "Raw",
       "orm": "Raw",
       "platform": "nodejs",
       "platform": "nodejs",
       "webserver": "None",
       "webserver": "None",
@@ -34,8 +35,9 @@
       "approach": "Realistic",
       "approach": "Realistic",
       "classification": "Platform",
       "classification": "Platform",
       "database": "MongoDB",
       "database": "MongoDB",
-      "framework": "nodejs",
+      "framework": "None",
       "language": "JavaScript",
       "language": "JavaScript",
+      "flavor": "NodeJS",
       "orm": "Full",
       "orm": "Full",
       "platform": "nodejs",
       "platform": "nodejs",
       "webserver": "None",
       "webserver": "None",
@@ -55,8 +57,9 @@
       "approach": "Realistic",
       "approach": "Realistic",
       "classification": "Platform",
       "classification": "Platform",
       "database": "MongoDB",
       "database": "MongoDB",
-      "framework": "nodejs",
+      "framework": "None",
       "language": "JavaScript",
       "language": "JavaScript",
+      "flavor": "NodeJS",
       "orm": "Raw",
       "orm": "Raw",
       "platform": "nodejs",
       "platform": "nodejs",
       "webserver": "None",
       "webserver": "None",
@@ -76,8 +79,9 @@
       "approach": "Realistic",
       "approach": "Realistic",
       "classification": "Platform",
       "classification": "Platform",
       "database": "MySQL",
       "database": "MySQL",
-      "framework": "nodejs",
+      "framework": "None",
       "language": "JavaScript",
       "language": "JavaScript",
+      "flavor": "NodeJS",
       "orm": "Full",
       "orm": "Full",
       "platform": "nodejs",
       "platform": "nodejs",
       "webserver": "None",
       "webserver": "None",
@@ -97,8 +101,9 @@
       "approach": "Realistic",
       "approach": "Realistic",
       "classification": "Platform",
       "classification": "Platform",
       "database": "Postgres",
       "database": "Postgres",
-      "framework": "nodejs",
+      "framework": "None",
       "language": "JavaScript",
       "language": "JavaScript",
+      "flavor": "NodeJS",
       "orm": "Full",
       "orm": "Full",
       "platform": "nodejs",
       "platform": "nodejs",
       "webserver": "None",
       "webserver": "None",

+ 2 - 1
frameworks/JavaScript/ringojs-convenient/benchmark_config.json

@@ -15,9 +15,10 @@
       "database": "MySQL",
       "database": "MySQL",
       "framework": "ringo",
       "framework": "ringo",
       "language": "JavaScript",
       "language": "JavaScript",
+      "flavor": "RingoJS",
       "orm": "Micro",
       "orm": "Micro",
       "platform": "ringojs",
       "platform": "ringojs",
-      "webserver": "Jetty",
+      "webserver": "None",
       "os": "Linux",
       "os": "Linux",
       "database_os": "Linux",
       "database_os": "Linux",
       "display_name": "ringojs-conv",
       "display_name": "ringojs-conv",

+ 3 - 2
frameworks/JavaScript/ringojs/benchmark_config.json

@@ -13,11 +13,12 @@
       "approach": "Realistic",
       "approach": "Realistic",
       "classification": "Platform",
       "classification": "Platform",
       "database": "MySQL",
       "database": "MySQL",
-      "framework": "ringo",
+      "framework": "None",
       "language": "JavaScript",
       "language": "JavaScript",
+      "flavor": "RingoJS",
       "orm": "Raw",
       "orm": "Raw",
       "platform": "ringojs",
       "platform": "ringojs",
-      "webserver": "Jetty",
+      "webserver": "None",
       "os": "Linux",
       "os": "Linux",
       "database_os": "Linux",
       "database_os": "Linux",
       "display_name": "ringojs",
       "display_name": "ringojs",

+ 4 - 2
frameworks/JavaScript/sailsjs/benchmark_config.json

@@ -13,8 +13,9 @@
       "approach": "Realistic",
       "approach": "Realistic",
       "classification": "Fullstack",
       "classification": "Fullstack",
       "database": "None",
       "database": "None",
-      "framework": "sailsjs",
+      "framework": "None",
       "language": "JavaScript",
       "language": "JavaScript",
+      "flavor": "NodeJS",
       "orm": "Micro",
       "orm": "Micro",
       "platform": "nodejs",
       "platform": "nodejs",
       "webserver": "None",
       "webserver": "None",
@@ -33,8 +34,9 @@
       "approach": "Realistic",
       "approach": "Realistic",
       "classification": "Fullstack",
       "classification": "Fullstack",
       "database": "Postgres",
       "database": "Postgres",
-      "framework": "sailsjs",
+      "framework": "None",
       "language": "JavaScript",
       "language": "JavaScript",
+      "flavor": "NodeJS",
       "orm": "Full",
       "orm": "Full",
       "platform": "nodejs",
       "platform": "nodejs",
       "webserver": "None",
       "webserver": "None",

+ 2 - 1
frameworks/Kotlin/hexagon/benchmark_config.json

@@ -17,12 +17,13 @@
                 "database" : "MongoDB",
                 "database" : "MongoDB",
                 "framework" : "Hexagon",
                 "framework" : "Hexagon",
                 "language" : "Kotlin",
                 "language" : "Kotlin",
+                "flavor" : "Java8",
                 "orm" : "Raw",
                 "orm" : "Raw",
                 "platform" : "Netty",
                 "platform" : "Netty",
                 "webserver" : "None",
                 "webserver" : "None",
                 "os" : "Linux",
                 "os" : "Linux",
                 "database_os" : "Linux",
                 "database_os" : "Linux",
-                "display_name" : "Hexagon MongoDB",
+                "display_name" : "Hexagon",
                 "notes" : "http://there4.co/hexagon",
                 "notes" : "http://there4.co/hexagon",
                 "versus" : "servlet"
                 "versus" : "servlet"
             }
             }

+ 1 - 1
frameworks/PHP/phalcon-micro/benchmark_config.json

@@ -14,7 +14,7 @@
       "framework": "phalcon",
       "framework": "phalcon",
       "language": "PHP",
       "language": "PHP",
       "flavor": "PHP7",
       "flavor": "PHP7",
-      "orm": "Full",
+      "orm": "raw",
       "platform": "None",
       "platform": "None",
       "webserver": "nginx",
       "webserver": "nginx",
       "os": "Linux",
       "os": "Linux",

+ 2 - 2
frameworks/PHP/phalcon/benchmark_config.json

@@ -16,7 +16,7 @@
       "framework": "phalcon",
       "framework": "phalcon",
       "language": "PHP",
       "language": "PHP",
       "flavor": "PHP7",
       "flavor": "PHP7",
-      "orm": "Full",
+      "orm": "raw",
       "platform": "None",
       "platform": "None",
       "webserver": "nginx",
       "webserver": "nginx",
       "os": "Linux",
       "os": "Linux",
@@ -37,7 +37,7 @@
       "framework": "phalcon",
       "framework": "phalcon",
       "language": "PHP",
       "language": "PHP",
       "flavor": "PHP7",
       "flavor": "PHP7",
-      "orm": "Full",
+      "orm": "raw",
       "platform": "None",
       "platform": "None",
       "webserver": "nginx",
       "webserver": "nginx",
       "os": "Linux",
       "os": "Linux",

+ 20 - 10
frameworks/Python/asyncio/benchmark_config.json

@@ -15,13 +15,15 @@
       "database": "Postgres",
       "database": "Postgres",
       "framework": "aiohttp.web",
       "framework": "aiohttp.web",
       "language": "Python",
       "language": "Python",
+      "flavor": "Python3",
       "orm": "Raw",
       "orm": "Raw",
       "platform": "API-Hour",
       "platform": "API-Hour",
       "webserver": "Gunicorn",
       "webserver": "Gunicorn",
       "os": "Linux",
       "os": "Linux",
       "database_os": "Linux",
       "database_os": "Linux",
-      "display_name": "API-Hour+aiohttp.web+pgsql",
-      "notes": "Python 3 + API-Hour + AsyncIO + aiohttp.web + PostgreSQL"
+      "display_name": "Asyncio",
+      "notes": "Python 3 + API-Hour + AsyncIO + aiohttp.web + PostgreSQL",
+      "versus": "asyncio"
     },
     },
     "mysql": {
     "mysql": {
       "setup_file": "aiohttp.web/setup",
       "setup_file": "aiohttp.web/setup",
@@ -35,13 +37,15 @@
       "database": "MySQL",
       "database": "MySQL",
       "framework": "aiohttp.web",
       "framework": "aiohttp.web",
       "language": "Python",
       "language": "Python",
+      "flavor": "Python3",
       "orm": "Raw",
       "orm": "Raw",
       "platform": "API-Hour",
       "platform": "API-Hour",
       "webserver": "Gunicorn",
       "webserver": "Gunicorn",
       "os": "Linux",
       "os": "Linux",
       "database_os": "Linux",
       "database_os": "Linux",
-      "display_name": "API-Hour+aiohttp.web+mysql",
-      "notes": "Python 3 + API-Hour + AsyncIO + aiohttp.web + MySQL"
+      "display_name": "Asyncio",
+      "notes": "Python 3 + API-Hour + AsyncIO + aiohttp.web + MySQL",
+      "versus": "asyncio"
     },
     },
     "json": {
     "json": {
       "setup_file": "yocto_http/setup",
       "setup_file": "yocto_http/setup",
@@ -52,13 +56,15 @@
       "database": "None",
       "database": "None",
       "framework": "AsyncIO",
       "framework": "AsyncIO",
       "language": "Python",
       "language": "Python",
+      "flavor": "Python3",
       "orm": "Raw",
       "orm": "Raw",
       "platform": "API-Hour",
       "platform": "API-Hour",
       "webserver": "Gunicorn",
       "webserver": "Gunicorn",
       "os": "Linux",
       "os": "Linux",
       "database_os": "Linux",
       "database_os": "Linux",
-      "display_name": "API-Hour+AsyncIO",
-      "notes": "Python 3 + API-Hour + AsyncIO"
+      "display_name": "Asyncio",
+      "notes": "Python 3 + API-Hour + AsyncIO",
+      "versus": "asyncio"
     },
     },
     "dbs": {
     "dbs": {
       "setup_file": "yocto_http/setup",
       "setup_file": "yocto_http/setup",
@@ -71,13 +77,15 @@
       "database": "None",
       "database": "None",
       "framework": "AsyncIO",
       "framework": "AsyncIO",
       "language": "Python",
       "language": "Python",
+      "flavor": "Python3",
       "orm": "Raw",
       "orm": "Raw",
       "platform": "API-Hour",
       "platform": "API-Hour",
       "webserver": "Gunicorn",
       "webserver": "Gunicorn",
       "os": "Linux",
       "os": "Linux",
       "database_os": "Linux",
       "database_os": "Linux",
-      "display_name": "API-Hour+AsyncIO",
-      "notes": "Python 3 + API-Hour + AsyncIO"
+      "display_name": "Asyncio",
+      "notes": "Python 3 + API-Hour + AsyncIO",
+      "versus": "asyncio"
     },
     },
     "plaintext": {
     "plaintext": {
       "setup_file": "yocto_http/setup",
       "setup_file": "yocto_http/setup",
@@ -88,13 +96,15 @@
       "database": "None",
       "database": "None",
       "framework": "AsyncIO",
       "framework": "AsyncIO",
       "language": "Python",
       "language": "Python",
+      "flavor": "Python3",
       "orm": "Raw",
       "orm": "Raw",
       "platform": "API-Hour",
       "platform": "API-Hour",
       "webserver": "Gunicorn",
       "webserver": "Gunicorn",
       "os": "Linux",
       "os": "Linux",
       "database_os": "Linux",
       "database_os": "Linux",
-      "display_name": "API-Hour+AsyncIO",
-      "notes": "Python 3 + API-Hour + AsyncIO"
+      "display_name": "Asyncio",
+      "notes": "Python 3 + API-Hour + AsyncIO",
+      "versus": "asyncio"
     }
     }
   }]
   }]
 }
 }

+ 9 - 4
frameworks/Python/bottle/benchmark_config.json

@@ -15,12 +15,13 @@
       "database": "MySQL",
       "database": "MySQL",
       "framework": "bottle",
       "framework": "bottle",
       "language": "Python",
       "language": "Python",
+      "flavor": "Python2",
       "orm": "Full",
       "orm": "Full",
       "platform": "Meinheld",
       "platform": "Meinheld",
       "webserver": "None",
       "webserver": "None",
       "os": "Linux",
       "os": "Linux",
       "database_os": "Linux",
       "database_os": "Linux",
-      "display_name": "Bottle-Py2",
+      "display_name": "Bottle",
       "notes": "CPython 2",
       "notes": "CPython 2",
       "versus": "wsgi"
       "versus": "wsgi"
     },
     },
@@ -38,12 +39,13 @@
       "database": "MySQL",
       "database": "MySQL",
       "framework": "bottle",
       "framework": "bottle",
       "language": "Python",
       "language": "Python",
+      "flavor": "Python3",
       "orm": "Full",
       "orm": "Full",
       "platform": "Meinheld",
       "platform": "Meinheld",
       "webserver": "None",
       "webserver": "None",
       "os": "Linux",
       "os": "Linux",
       "database_os": "Linux",
       "database_os": "Linux",
-      "display_name": "Bottle-Py3",
+      "display_name": "Bottle",
       "notes": "CPython 3",
       "notes": "CPython 3",
       "versus": "wsgi"
       "versus": "wsgi"
     },
     },
@@ -61,12 +63,13 @@
       "database": "MySQL",
       "database": "MySQL",
       "framework": "bottle",
       "framework": "bottle",
       "language": "Python",
       "language": "Python",
+      "flavor": "PyPy",
       "orm": "Full",
       "orm": "Full",
       "platform": "Tornado",
       "platform": "Tornado",
       "webserver": "None",
       "webserver": "None",
       "os": "Linux",
       "os": "Linux",
       "database_os": "Linux",
       "database_os": "Linux",
-      "display_name": "Bottle-PyPy",
+      "display_name": "Bottle",
       "notes": "PyPy",
       "notes": "PyPy",
       "versus": "wsgi"
       "versus": "wsgi"
     },
     },
@@ -82,12 +85,13 @@
       "database": "MySQL",
       "database": "MySQL",
       "framework": "bottle",
       "framework": "bottle",
       "language": "Python",
       "language": "Python",
+      "flavor": "Python2",
       "orm": "Raw",
       "orm": "Raw",
       "platform": "Meinheld",
       "platform": "Meinheld",
       "webserver": "None",
       "webserver": "None",
       "os": "Linux",
       "os": "Linux",
       "database_os": "Linux",
       "database_os": "Linux",
-      "display_name": "Bottle-raw-Py2",
+      "display_name": "Bottle-raw",
       "notes": "CPython 2",
       "notes": "CPython 2",
       "versus": "wsgi"
       "versus": "wsgi"
     },
     },
@@ -105,6 +109,7 @@
       "database": "MySQL",
       "database": "MySQL",
       "framework": "bottle",
       "framework": "bottle",
       "language": "Python",
       "language": "Python",
+      "flavor": "Python2",
       "orm": "Full",
       "orm": "Full",
       "platform": "uWSGI",
       "platform": "uWSGI",
       "webserver": "nginx",
       "webserver": "nginx",

+ 6 - 4
frameworks/Python/cherrypy/benchmark_config.json

@@ -15,12 +15,13 @@
       "database": "MySQL",
       "database": "MySQL",
       "framework": "CherryPy",
       "framework": "CherryPy",
       "language": "Python",
       "language": "Python",
+      "flavor": "Python2",
       "orm": "Full",
       "orm": "Full",
-      "platform": "CherryPy",
+      "platform": "None",
       "webserver": "None",
       "webserver": "None",
       "os": "Linux",
       "os": "Linux",
       "database_os": "Linux",
       "database_os": "Linux",
-      "display_name": "cherrypy",
+      "display_name": "CherryPy",
       "notes": "CPython 2.7"
       "notes": "CPython 2.7"
     },
     },
      "py3": {
      "py3": {
@@ -37,12 +38,13 @@
       "database": "MySQL",
       "database": "MySQL",
       "framework": "CherryPy",
       "framework": "CherryPy",
       "language": "Python",
       "language": "Python",
+      "flavor": "Python3",
       "orm": "Full",
       "orm": "Full",
-      "platform": "CherryPy",
+      "platform": "None",
       "webserver": "None",
       "webserver": "None",
       "os": "Linux",
       "os": "Linux",
       "database_os": "Linux",
       "database_os": "Linux",
-      "display_name": "cherrypy-py3",
+      "display_name": "CherryPy",
       "notes": "CPython 3.4"
       "notes": "CPython 3.4"
     }
     }
   }]
   }]

+ 6 - 3
frameworks/Python/django/benchmark_config.json

@@ -15,12 +15,13 @@
       "database": "MySQL",
       "database": "MySQL",
       "framework": "django",
       "framework": "django",
       "language": "Python",
       "language": "Python",
+      "flavor": "Python2",
       "orm": "Full",
       "orm": "Full",
       "platform": "Meinheld",
       "platform": "Meinheld",
       "webserver": "None",
       "webserver": "None",
       "os": "Linux",
       "os": "Linux",
       "database_os": "Linux",
       "database_os": "Linux",
-      "display_name": "Django-Py2",
+      "display_name": "Django",
       "notes": "CPython 2.7",
       "notes": "CPython 2.7",
       "versus": "wsgi"
       "versus": "wsgi"
     },
     },
@@ -38,12 +39,13 @@
       "database": "MySQL",
       "database": "MySQL",
       "framework": "django",
       "framework": "django",
       "language": "Python",
       "language": "Python",
+      "flavor": "Python3",
       "orm": "Full",
       "orm": "Full",
       "platform": "Meinheld",
       "platform": "Meinheld",
       "webserver": "None",
       "webserver": "None",
       "os": "Linux",
       "os": "Linux",
       "database_os": "Linux",
       "database_os": "Linux",
-      "display_name": "Django-Py3",
+      "display_name": "Django",
       "notes": "CPython 3.4",
       "notes": "CPython 3.4",
       "versus": "wsgi"
       "versus": "wsgi"
     },
     },
@@ -59,12 +61,13 @@
       "database": "Postgres",
       "database": "Postgres",
       "framework": "django",
       "framework": "django",
       "language": "Python",
       "language": "Python",
+      "flavor": "Python2",
       "orm": "Full",
       "orm": "Full",
       "platform": "Meinheld",
       "platform": "Meinheld",
       "webserver": "None",
       "webserver": "None",
       "os": "Linux",
       "os": "Linux",
       "database_os": "Linux",
       "database_os": "Linux",
-      "display_name": "Django-Postgres-Py2",
+      "display_name": "Django",
       "notes": "CPython 2.7",
       "notes": "CPython 2.7",
       "versus": "wsgi"
       "versus": "wsgi"
     }
     }

+ 6 - 3
frameworks/Python/falcon/benchmark_config.json

@@ -11,12 +11,13 @@
       "database": "None",
       "database": "None",
       "framework": "Falcon",
       "framework": "Falcon",
       "language": "Python",
       "language": "Python",
+      "flavor": "Python2",
       "orm": "Raw",
       "orm": "Raw",
       "platform": "Gunicorn/Meinheld",
       "platform": "Gunicorn/Meinheld",
       "webserver": "None",
       "webserver": "None",
       "os": "Linux",
       "os": "Linux",
       "database_os": "Linux",
       "database_os": "Linux",
-      "display_name": "Falcon-Py2",
+      "display_name": "Falcon",
       "notes": "CPython 2",
       "notes": "CPython 2",
       "versus": "wsgi"
       "versus": "wsgi"
     },
     },
@@ -30,12 +31,13 @@
       "database": "None",
       "database": "None",
       "framework": "Falcon",
       "framework": "Falcon",
       "language": "Python",
       "language": "Python",
+      "flavor": "Python3",
       "orm": "Raw",
       "orm": "Raw",
       "platform": "Gunicorn/Meinheld",
       "platform": "Gunicorn/Meinheld",
       "webserver": "None",
       "webserver": "None",
       "os": "Linux",
       "os": "Linux",
       "database_os": "Linux",
       "database_os": "Linux",
-      "display_name": "Falcon-Py3",
+      "display_name": "Falcon",
       "notes": "CPython 3",
       "notes": "CPython 3",
       "versus": "wsgi"
       "versus": "wsgi"
     },
     },
@@ -49,12 +51,13 @@
       "database": "None",
       "database": "None",
       "framework": "Falcon",
       "framework": "Falcon",
       "language": "Python",
       "language": "Python",
+      "flavor": "PyPy",
       "orm": "Raw",
       "orm": "Raw",
       "platform": "Gunicorn/Tornado",
       "platform": "Gunicorn/Tornado",
       "webserver": "None",
       "webserver": "None",
       "os": "Linux",
       "os": "Linux",
       "database_os": "Linux",
       "database_os": "Linux",
-      "display_name": "Falcon-PyPy",
+      "display_name": "Falcon",
       "notes": "PyPy",
       "notes": "PyPy",
       "versus": "wsgi"
       "versus": "wsgi"
     }
     }

+ 11 - 5
frameworks/Python/flask/benchmark_config.json

@@ -15,12 +15,13 @@
       "database": "MySQL",
       "database": "MySQL",
       "framework": "flask",
       "framework": "flask",
       "language": "Python",
       "language": "Python",
+      "flavor": "Python2",
       "orm": "Full",
       "orm": "Full",
       "platform": "Meinheld",
       "platform": "Meinheld",
       "webserver": "None",
       "webserver": "None",
       "os": "Linux",
       "os": "Linux",
       "database_os": "Linux",
       "database_os": "Linux",
-      "display_name": "Flask-Py2",
+      "display_name": "Flask",
       "notes": "CPython 2.7",
       "notes": "CPython 2.7",
       "versus": "wsgi"
       "versus": "wsgi"
     },
     },
@@ -36,6 +37,7 @@
       "database": "MySQL",
       "database": "MySQL",
       "framework": "flask",
       "framework": "flask",
       "language": "Python",
       "language": "Python",
+      "flavor": "Python2",
       "orm": "Raw",
       "orm": "Raw",
       "platform": "Meinheld",
       "platform": "Meinheld",
       "webserver": "None",
       "webserver": "None",
@@ -59,12 +61,13 @@
       "database": "MySQL",
       "database": "MySQL",
       "framework": "flask",
       "framework": "flask",
       "language": "Python",
       "language": "Python",
+      "flavor": "Python3",
       "orm": "Full",
       "orm": "Full",
       "platform": "Meinheld",
       "platform": "Meinheld",
       "webserver": "None",
       "webserver": "None",
       "os": "Linux",
       "os": "Linux",
       "database_os": "Linux",
       "database_os": "Linux",
-      "display_name": "Flask-Py3",
+      "display_name": "Flask",
       "notes": "CPython 3.4",
       "notes": "CPython 3.4",
       "versus": "wsgi"
       "versus": "wsgi"
     },
     },
@@ -82,12 +85,13 @@
       "database": "MySQL",
       "database": "MySQL",
       "framework": "flask",
       "framework": "flask",
       "language": "Python",
       "language": "Python",
+      "flavor": "PyPy",
       "orm": "Full",
       "orm": "Full",
       "platform": "Tornado",
       "platform": "Tornado",
       "webserver": "None",
       "webserver": "None",
       "os": "Linux",
       "os": "Linux",
       "database_os": "Linux",
       "database_os": "Linux",
-      "display_name": "Flask-PyPy",
+      "display_name": "Flask",
       "notes": "PyPy 2.5",
       "notes": "PyPy 2.5",
       "versus": "wsgi"
       "versus": "wsgi"
     },
     },
@@ -103,12 +107,13 @@
       "database": "MySQL",
       "database": "MySQL",
       "framework": "flask",
       "framework": "flask",
       "language": "Python",
       "language": "Python",
+      "flavor": "PyPy",
       "orm": "Raw",
       "orm": "Raw",
       "platform": "Tornado",
       "platform": "Tornado",
       "webserver": "None",
       "webserver": "None",
       "os": "Linux",
       "os": "Linux",
       "database_os": "Linux",
       "database_os": "Linux",
-      "display_name": "Flask-PyPy-raw",
+      "display_name": "Flask-raw",
       "notes": "PyPy 2.5",
       "notes": "PyPy 2.5",
       "versus": "wsgi"
       "versus": "wsgi"
     },
     },
@@ -126,12 +131,13 @@
       "database": "MySQL",
       "database": "MySQL",
       "framework": "flask",
       "framework": "flask",
       "language": "Python",
       "language": "Python",
+      "flavor": "Python2",
       "orm": "Full",
       "orm": "Full",
       "platform": "uWSGI",
       "platform": "uWSGI",
       "webserver": "nginx",
       "webserver": "nginx",
       "os": "Linux",
       "os": "Linux",
       "database_os": "Linux",
       "database_os": "Linux",
-      "display_name": "Flask-nginx-uWSGI",
+      "display_name": "Flask",
       "notes": "CPython 2.7",
       "notes": "CPython 2.7",
       "versus": "wsgi"
       "versus": "wsgi"
     }
     }

+ 2 - 1
frameworks/Python/historical/benchmark_config.json

@@ -15,8 +15,9 @@
       "database": "MySQL",
       "database": "MySQL",
       "framework": "Webware",
       "framework": "Webware",
       "language": "Python",
       "language": "Python",
+      "flavor": "Python2",
       "orm": "Full",
       "orm": "Full",
-      "platform": "Apache",
+      "platform": "None",
       "webserver": "None",
       "webserver": "None",
       "os": "Linux",
       "os": "Linux",
       "database_os": "Linux",
       "database_os": "Linux",

+ 5 - 4
frameworks/Python/klein/benchmark_config.json

@@ -13,14 +13,15 @@
       "approach": "Realistic",
       "approach": "Realistic",
       "classification": "Micro",
       "classification": "Micro",
       "database": "MySQL",
       "database": "MySQL",
-      "framework": "Twisted Klein",
+      "framework": "Klein",
       "language": "Python",
       "language": "Python",
+      "flavor": "Python2",
       "orm": "Full",
       "orm": "Full",
-      "platform": "Twisted Web",
-      "webserver": "None",
+      "platform": "None",
+      "webserver": "Twisted Web",
       "os": "Linux",
       "os": "Linux",
       "database_os": "Linux",
       "database_os": "Linux",
-      "display_name": "Twisted Klein",
+      "display_name": "Klein",
       "notes": "CPython 2.7"
       "notes": "CPython 2.7"
     }
     }
   }]
   }]

+ 4 - 2
frameworks/Python/pyramid/benchmark_config.json

@@ -15,12 +15,13 @@
       "database": "Postgres",
       "database": "Postgres",
       "framework": "pyramid",
       "framework": "pyramid",
       "language": "Python",
       "language": "Python",
+      "flavor": "Python3",
       "orm": "Full",
       "orm": "Full",
       "platform": "Meinheld",
       "platform": "Meinheld",
       "webserver": "None",
       "webserver": "None",
       "os": "Linux",
       "os": "Linux",
       "database_os": "Linux",
       "database_os": "Linux",
-      "display_name": "Pyramid-Py3",
+      "display_name": "Pyramid",
       "notes": "",
       "notes": "",
       "versus": "wsgi"
       "versus": "wsgi"
     },
     },
@@ -38,12 +39,13 @@
       "database": "Postgres",
       "database": "Postgres",
       "framework": "pyramid",
       "framework": "pyramid",
       "language": "Python",
       "language": "Python",
+      "flavor": "Python2",
       "orm": "Full",
       "orm": "Full",
       "platform": "Meinheld",
       "platform": "Meinheld",
       "webserver": "None",
       "webserver": "None",
       "os": "Linux",
       "os": "Linux",
       "database_os": "Linux",
       "database_os": "Linux",
-      "display_name": "Pyramid-Py2",
+      "display_name": "Pyramid",
       "notes": "",
       "notes": "",
       "versus": "wsgi"
       "versus": "wsgi"
     }
     }

+ 9 - 6
frameworks/Python/tornado/benchmark_config.json

@@ -11,14 +11,15 @@
       "approach": "Realistic",
       "approach": "Realistic",
       "classification": "Platform",
       "classification": "Platform",
       "database": "MongoDB",
       "database": "MongoDB",
-      "framework": "tornado",
+      "framework": "None",
       "language": "Python",
       "language": "Python",
+      "flavor": "Python2",
       "orm": "Raw",
       "orm": "Raw",
       "platform": "Tornado",
       "platform": "Tornado",
       "webserver": "None",
       "webserver": "None",
       "os": "Linux",
       "os": "Linux",
       "database_os": "Linux",
       "database_os": "Linux",
-      "display_name": "Tornado-MongoDB-Py2",
+      "display_name": "Tornado-raw",
       "notes": "CPython 2.7",
       "notes": "CPython 2.7",
       "versus": ""
       "versus": ""
     },
     },
@@ -30,14 +31,15 @@
       "approach": "Realistic",
       "approach": "Realistic",
       "classification": "Platform",
       "classification": "Platform",
       "database": "Postgres",
       "database": "Postgres",
-      "framework": "tornado",
+      "framework": "None",
       "language": "Python",
       "language": "Python",
+      "flavor": "Python2",
       "orm": "Raw",
       "orm": "Raw",
       "platform": "Tornado",
       "platform": "Tornado",
       "webserver": "None",
       "webserver": "None",
       "os": "Linux",
       "os": "Linux",
       "database_os": "Linux",
       "database_os": "Linux",
-      "display_name": "Tornado-Postgres-Py2",
+      "display_name": "Tornado-raw",
       "notes": "CPython 2.7",
       "notes": "CPython 2.7",
       "versus": ""
       "versus": ""
     },
     },
@@ -51,14 +53,15 @@
       "approach": "Realistic",
       "approach": "Realistic",
       "classification": "Platform",
       "classification": "Platform",
       "database": "MongoDB",
       "database": "MongoDB",
-      "framework": "tornado",
+      "framework": "None",
       "language": "Python",
       "language": "Python",
+      "flavor": "Python3",
       "orm": "Raw",
       "orm": "Raw",
       "platform": "Tornado",
       "platform": "Tornado",
       "webserver": "None",
       "webserver": "None",
       "os": "Linux",
       "os": "Linux",
       "database_os": "Linux",
       "database_os": "Linux",
-      "display_name": "Tornado-MongoDB-Py3",
+      "display_name": "Tornado-raw",
       "notes": "CPython 3.4",
       "notes": "CPython 3.4",
       "versus": ""
       "versus": ""
     }
     }

+ 1 - 0
frameworks/Python/turbogears/benchmark_config.json

@@ -15,6 +15,7 @@
       "database": "MySQL",
       "database": "MySQL",
       "framework": "TurboGears",
       "framework": "TurboGears",
       "language": "Python",
       "language": "Python",
+      "flavor": "Python2",
       "orm": "Full",
       "orm": "Full",
       "platform": "Meinheld",
       "platform": "Meinheld",
       "webserver": "None",
       "webserver": "None",

+ 5 - 3
frameworks/Python/uwsgi/benchmark_config.json

@@ -8,8 +8,9 @@
       "approach": "Stripped",
       "approach": "Stripped",
       "classification": "Platform",
       "classification": "Platform",
       "database": "None",
       "database": "None",
-      "framework": "wsgi",
+      "framework": "None",
       "language": "Python",
       "language": "Python",
+      "flavor": "Python2",
       "orm": "Raw",
       "orm": "Raw",
       "platform": "wsgi",
       "platform": "wsgi",
       "webserver": "uWSGI",
       "webserver": "uWSGI",
@@ -26,14 +27,15 @@
       "approach": "Stripped",
       "approach": "Stripped",
       "classification": "Platform",
       "classification": "Platform",
       "database": "None",
       "database": "None",
-      "framework": "wsgi",
+      "framework": "None",
       "language": "Python",
       "language": "Python",
+      "flavor": "Python2",
       "orm": "Raw",
       "orm": "Raw",
       "platform": "wsgi",
       "platform": "wsgi",
       "webserver": "nginx-uWSGI",
       "webserver": "nginx-uWSGI",
       "os": "Linux",
       "os": "Linux",
       "database_os": "Linux",
       "database_os": "Linux",
-      "display_name": "uwsgi-nginx-uWSGI",
+      "display_name": "uwsgi",
       "notes": "",
       "notes": "",
       "versus": ""
       "versus": ""
     }
     }

+ 2 - 1
frameworks/Python/web2py/benchmark_config.json

@@ -15,8 +15,9 @@
       "database": "MySQL",
       "database": "MySQL",
       "framework": "web2py",
       "framework": "web2py",
       "language": "Python",
       "language": "Python",
+      "flavor": "Python2",
       "orm": "Full",
       "orm": "Full",
-      "platform": "web2Py",
+      "platform": "None",
       "webserver": "None",
       "webserver": "None",
       "os": "Linux",
       "os": "Linux",
       "database_os": "Linux",
       "database_os": "Linux",

+ 4 - 2
frameworks/Python/wheezyweb/benchmark_config.json

@@ -15,12 +15,13 @@
       "database": "MySQL",
       "database": "MySQL",
       "framework": "wheezy.web",
       "framework": "wheezy.web",
       "language": "Python",
       "language": "Python",
+      "flavor": "Python2",
       "orm": "Full",
       "orm": "Full",
       "platform": "Meinheld",
       "platform": "Meinheld",
       "webserver": "None",
       "webserver": "None",
       "os": "Linux",
       "os": "Linux",
       "database_os": "Linux",
       "database_os": "Linux",
-      "display_name": "wheezy.web-py2",
+      "display_name": "wheezy.web",
       "notes": ""
       "notes": ""
     },
     },
     "py3": {
     "py3": {
@@ -37,12 +38,13 @@
       "database": "MySQL",
       "database": "MySQL",
       "framework": "wheezy.web",
       "framework": "wheezy.web",
       "language": "Python",
       "language": "Python",
+      "flavor": "Python3",
       "orm": "Full",
       "orm": "Full",
       "platform": "Meinheld",
       "platform": "Meinheld",
       "webserver": "None",
       "webserver": "None",
       "os": "Linux",
       "os": "Linux",
       "database_os": "Linux",
       "database_os": "Linux",
-      "display_name": "wheezy.web-py3",
+      "display_name": "wheezy.web",
       "notes": ""
       "notes": ""
     }
     }
   }]
   }]

+ 3 - 2
frameworks/Python/wsgi/benchmark_config.json

@@ -9,14 +9,15 @@
       "approach": "Stripped",
       "approach": "Stripped",
       "classification": "Platform",
       "classification": "Platform",
       "database": "None",
       "database": "None",
-      "framework": "wsgi",
+      "framework": "None",
       "language": "Python",
       "language": "Python",
+      "flavor": "Python3",
       "orm": "Raw",
       "orm": "Raw",
       "platform": "Meinheld",
       "platform": "Meinheld",
       "webserver": "None",
       "webserver": "None",
       "os": "Linux",
       "os": "Linux",
       "database_os": "Linux",
       "database_os": "Linux",
-      "display_name": "meinheld",
+      "display_name": "wsgi",
       "notes": "",
       "notes": "",
       "versus": "wsgi"
       "versus": "wsgi"
     }
     }

+ 3 - 2
frameworks/Racket/racket-ws/benchmark_config.json

@@ -12,12 +12,13 @@
       "database": "MySQL",
       "database": "MySQL",
       "framework": "racket-ws",
       "framework": "racket-ws",
       "language": "Racket",
       "language": "Racket",
+      "flavor": "Racket6.6",
       "orm": "Micro",
       "orm": "Micro",
-      "platform": "Racket",
+      "platform": "None",
       "webserver": "None",
       "webserver": "None",
       "os": "Linux",
       "os": "Linux",
       "database_os": "Linux",
       "database_os": "Linux",
-      "display_name": "racket-ws",
+      "display_name": "Racket-ws",
       "notes": "",
       "notes": "",
       "versus": ""
       "versus": ""
     }
     }