Merge branch 'master' of https://github.com/TechEmpower/FrameworkBenchmarks

README.md

@@ -24,8 +24,7 @@ $ sudo apt-get install openssh-server
 ```
 * If Ubuntu is already installed, run the following command and follow the prompts.
 ```bash
-$ sudo adduser tfb
-$ sudo usermod -a -G sudo tfb
+$ sudo useradd -m -G sudo tfb
 ```
 * Log in as `tfb`
 * Fully update **NOTE**: If you update the kernel (linux-firmware), it is generally a good idea to reboot aftewards.

activeweb/install.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-fw_depends java resin
+fw_depends java resin maven

curacao/README.md

@@ -1,10 +1,11 @@
 # Curacao Benchmarking Test
 
-This is the Curacao portion of TechEmpower's [benchmarking test suite](../) comparing a variety of web development platforms.
+Curacao is an open-source toolkit for building REST/HTTP-based integration layers on top of asynchronous Servlets.
 
 ## Versions
 
-Curacao 2.0-M10 https://github.com/markkolich/curacao
+Curacao 2.6.2
+https://github.com/markkolich/curacao
 
 ## Tests
 

curacao/install.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-fw_depends java
+fw_depends java maven

dropwizard-mongodb/install.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-fw_depends java
+fw_depends java maven

dropwizard/install.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-fw_depends java
+fw_depends java maven

gemini/install.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-fw_depends java resin
+fw_depends java resin maven

grizzly-bm/install.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-fw_depends java
+fw_depends java maven

grizzly-jersey/install.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-fw_depends java 
+fw_depends java maven

jetty-servlet/install.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-fw_depends java
+fw_depends java maven

netty/install.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-fw_depends java
+fw_depends java maven

ninja-resin/install.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-fw_depends java resin
+fw_depends java resin maven

ninja-standalone/install.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-fw_depends java
+fw_depends java maven

play-activate-mysql/install.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-fw_depends java
+fw_depends java maven

restexpress/install.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-fw_depends java
+fw_depends java maven

servlet/install.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-fw_depends java resin
+fw_depends java resin maven

servlet3-cass/install.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-fw_depends java resin
+fw_depends java resin maven

spark/install.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-fw_depends java resin
+fw_depends java resin maven

spring/install.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-fw_depends java
+fw_depends java maven

tapestry/install.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-fw_depends java resin
+fw_depends java resin maven

toolset/setup/linux/installer.py

@@ -191,9 +191,11 @@ class Installer:
     sudo cp -R -p /var/log/mongodb /ssd/log/
     sudo start mongodb
 
+
     ##############################
     # Apache Cassandra
     ##############################
+    sudo apt-get install -qqy openjdk-7-jdk
     export CASS_V=2.0.7
     wget http://archive.apache.org/dist/cassandra/$CASS_V/apache-cassandra-$CASS_V-bin.tar.gz
     tar xzf apache-cassandra-$CASS_V-bin.tar.gz
@@ -217,7 +219,7 @@ class Installer:
     """ % (self.benchmarker.database_host, self.benchmarker.database_host, self.benchmarker.database_host)
     
     print("\nINSTALL: %s" % self.benchmarker.database_ssh_string)
-    p = subprocess.Popen(self.benchmarker.database_ssh_string.split(" "), stdin=subprocess.PIPE)
+    p = subprocess.Popen(self.benchmarker.database_ssh_string.split(" ") + ["bash"], stdin=subprocess.PIPE)
     p.communicate(remote_script)
     returncode = p.returncode
     if returncode != 0:

undertow-edge/install.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-fw_depends java
+fw_depends java maven

undertow/install.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-fw_depends java
+fw_depends java maven

wicket/install.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-fw_depends java resin
+fw_depends java resin maven

wildfly-ee7/install.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-fw_depends java
+fw_depends java maven