Merge branch 'round-14' into add-missing-php-tests

frameworks/Java/vertx-web/pom.xml

@@ -12,7 +12,7 @@
   <properties>
     <!-- the main class -->
     <main.verticle>io.vertx.benchmark.App</main.verticle>
-    <vertx.version>3.2.1</vertx.version>
+    <vertx.version>3.3.2</vertx.version>
   </properties>
 
   <dependencies>

frameworks/Java/vertx-web/src/main/java/io/vertx/benchmark/App.java

@@ -33,7 +33,13 @@ public class App extends AbstractVerticle {
     private final HandlebarsTemplateEngine engine;
 
     public MongoDB(Vertx vertx, JsonObject config) {
-      this.database = MongoClient.createShared(vertx, config);
+      final JsonObject mongoConfig = config.copy();
+
+      // mongo is configured without credentials
+      mongoConfig.remove("username");
+      mongoConfig.remove("password");
+
+      this.database = MongoClient.createShared(vertx, mongoConfig);
       this.engine = HandlebarsTemplateEngine.create();
     }
 

frameworks/Java/vertx/pom.xml

@@ -8,7 +8,7 @@
 	<properties>
 		<!-- the main class -->
 		<main.class>vertx.WebServer</main.class>
-		<stack.version>3.2.1</stack.version>
+		<stack.version>3.3.2</stack.version>
 	</properties>
 
 	<repositories>

frameworks/PHP/cygnite-php-framework/deploy/nginx.conf

@@ -15,7 +15,7 @@ events {
 
 
 http {
-    include       /usr/local/nginx/conf/mime.types;
+    include       /home/knewman/FrameworkBenchmarks/installs/nginx/conf/mime.types;
     default_type  application/octet-stream;
 
     #log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
@@ -65,7 +65,7 @@ http {
         #    proxy_pass   http://127.0.0.1;
         #}
 
-        root /home/ubuntu/FrameworkBenchmarks/cygnite-php-framework/;
+        root /home/knewman/FrameworkBenchmarks/frameworks/PHP/cygnite-php-framework/;
         index  index.php;
 
         location / {
@@ -80,7 +80,7 @@ http {
             fastcgi_index  index.php;
 #            fastcgi_param  SCRIPT_FILENAME  /scripts$fastcgi_script_name;
             fastcgi_param  SCRIPT_FILENAME  $document_root$fastcgi_script_name;
-            include        /usr/local/nginx/conf/fastcgi_params;
+            include        /home/knewman/FrameworkBenchmarks/installs/nginx/conf/fastcgi_params;
         }
 
         # deny access to .htaccess files, if Apache's document root

toolset/setup/linux/languages/rbx-2.4.sh

@@ -12,6 +12,9 @@ RETCODE=$(fw_exists ${IROOT}/rbx-2.4.installed)
 # update this when it changes
 RBX_VERSION=2.4.1
 
+# This version of RBX needs clang 3.4
+sudo apt-get -yq --force-yes install clang-3.4
+
 # We assume single-user installation as
 # done in our rvm.sh script and
 # in Travis-CI

toolset/setup/linux/languages/rbx-2.5.sh

@@ -12,6 +12,9 @@ RETCODE=$(fw_exists ${IROOT}/rbx-2.5.installed)
 # update this when it changes
 RBX_VERSION=2.5.2
 
+# This version of RBX needs clang 3.4
+sudo apt-get -yq --force-yes install clang-3.4
+
 # We assume single-user installation as
 # done in our rvm.sh script and
 # in Travis-CI

toolset/setup/linux/prerequisites.sh

@@ -3,11 +3,12 @@
 set -x
 export DEBIAN_FRONTEND=noninteractive
 
+source $FWROOT/toolset/setup/linux/bash_functions.sh
+
 RETCODE=$(fw_exists fwbm_prereqs_installed)
 [ ! "$RETCODE" == 0 ] || { \
   echo "Prerequisites installed!"; 
-  return 0; 
-}
+  return 0; }
 
 
 # Use a more recent version of Mongo shell