Merge branch 'master' into add-more-colors

Conflicts:
	toolset/benchmark/framework_test.py

.travis.yml

@@ -37,7 +37,6 @@ env:
     - "TESTDIR=Dart/dart-redstone"
     - "TESTDIR=Dart/dart-start"
     - "TESTDIR=Dart/dart-stream"
-    - "TESTDIR=Elixir/WeberFramework"
     - "TESTDIR=Erlang/cowboy"
     - "TESTDIR=Erlang/elli"
     - "TESTDIR=Go/beego"
@@ -150,7 +149,7 @@ env:
 before_install:
   # Need to install python modules before using 
   # python
-  - pip install -r config/python_requirements.txt
+  - pip install -r requirements.txt
 
   # Configure Travis-CI build environment for TFB
   #   e.g. setup databases, users, etc

config/benchmark_profile

@@ -18,7 +18,6 @@ export TFB_DISTRIB_CODENAME=$DISTRIB_CODENAME
 export TFB_DISTRIB_DESCRIPTION=$DISTRIB_DESCRIPTION
 
 
-export JAVA_HOME=/usr/lib/jvm/java-1.7.0-openjdk-amd64
 export RESIN_HOME=${IROOT}/resin-4.0.41
 export GRAILS_HOME=${IROOT}/grails-2.4.4
 export VERTX_HOME=${IROOT}/vert.x-2.1.1

deployment/vagrant-common/bootstrap.sh

@@ -122,7 +122,7 @@ if [ ! -e "~/.firstboot" ]; then
     echo "Cloning project from $GH_REPO $GH_BRANCH"
     git clone -b ${GH_BRANCH} https://github.com/${GH_REPO}.git $FWROOT
   fi
-  sudo pip install -r $FWROOT/config/python_requirements.txt
+  sudo pip install -r $FWROOT/requirements.txt
 
   # Everyone gets SSH access to localhost
   echo "Setting up SSH access to localhost"

deployment/vagrant-common/core.rb

@@ -95,6 +95,11 @@ def provider_virtualbox(config, role, ip_address='172.16.0.16')
       vb.gui = true
     end
 
+    # Improve Windows VirtualBox DNS resolution speed
+    # Addresses mitchellh/vagrant#1807 and TechEmpower/FrameworkBenchmarks#1288
+    vb.customize ["modifyvm", :id, "--natdnshostresolver1", "on"]
+    vb.customize ["modifyvm", :id, "--natdnsproxy1", "on"]
+
     vb.memory = ENV.fetch('TFB_VB_MEM', 3022)
     vb.cpus = ENV.fetch('TFB_VB_CPU', 2)
 

frameworks/Clojure/compojure/install.sh

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

frameworks/Clojure/compojure/setup.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
-export JAVA_HOME=/usr/lib/jvm/java-1.7.0-openjdk-amd64
+
+source $IROOT/java7.installed
+
 export RESIN_HOME=${IROOT}/resin-4.0.41
 export LEIN_HOME=$IROOT/lein
 

frameworks/Clojure/http-kit/install.sh

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

frameworks/Clojure/http-kit/setup.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-export JAVA_HOME=/usr/lib/jvm/java-1.7.0-openjdk-amd64
+source $IROOT/java7.installed
 export LEIN_HOME=$IROOT/lein
 
 cd hello

frameworks/Clojure/luminus/install.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-fw_depends resin leiningen
+fw_depends java7 resin leiningen 

frameworks/Clojure/luminus/setup.sh

@@ -1,5 +1,6 @@
 #!/bin/bash
-export JAVA_HOME=/usr/lib/jvm/java-1.7.0-openjdk-amd64
+
+source $IROOT/java7.installed
 export RESIN_HOME=${IROOT}/resin-4.0.41
 
 # Path vars must be set here

frameworks/Elixir/WeberFramework/.gitignore

@@ -1,6 +0,0 @@
-/ebin
-/deps
-erl_crash.dump
-/tmp
-_build
-/logs

frameworks/Elixir/WeberFramework/README.md

@@ -1,2 +0,0 @@
-WeberFramework
-=====

frameworks/Elixir/WeberFramework/benchmark_config.json

@@ -1,23 +0,0 @@
-{
-  "framework": "weber",
-  "tests": [{
-    "default": {
-      "setup_file": "setup_weber",
-      "json_url": "/json",
-      "plaintext_url": "/plaintext",
-      "port": 8080,
-      "approach": "Realistic",
-      "classification": "Platform",
-      "database": "Postgres",
-      "framework": "weber",
-      "language": "Elixir",
-      "orm": "Raw",
-      "platform": "Cowboy",
-      "webserver": "Cowboy",
-      "os": "Linux",
-      "database_os": "Linux",
-      "display_name": "weber",
-      "notes": "",
-      "versus": ""
-  }}]
-}

frameworks/Elixir/WeberFramework/install.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-fw_depends weber elixir

frameworks/Elixir/WeberFramework/lib/app.ex

@@ -1,18 +0,0 @@
-defmodule WeberFramework do
-
-  require Weber.Templates.ViewsLoader
-  
-  def start(_type, _args) do
-    # Set resources
-    Weber.Templates.ViewsLoader.set_up_resources(File.cwd!)
-    # compile all views
-    Weber.Templates.ViewsLoader.compile_views(File.cwd!)
-    # start weber application
-    Weber.run_weber
-  end
-
-  def stop(_state) do
-    :ok
-  end
-  
-end

frameworks/Elixir/WeberFramework/lib/config.ex

@@ -1,36 +0,0 @@
-defmodule Config do 
-
-  def config do
-    [webserver: 
-      [http_host: "localhost", 
-       http_port: 8080,
-       acceptors: 100,
-       ssl: false,
-       cacertfile_path: "",
-       certfile_path: "",
-       keyfile_path: ""
-      ],
-    ws: 
-      [ws_port: 8080,
-       ws_mod: :Handler
-      ],
-    use_internationalization: false,
-    localization:
-      [default_locale: :en_US,
-       use_locales: [:en_US]
-      ],
-    use_sessions: false,
-    session:
-      [max_age: 1440
-      ],
-    db:
-      [
-        db_host: "",
-        db_port: 5000,
-        db_username: "",
-        db_password: ""
-      ],
-    ]
-  end
-
-end

frameworks/Elixir/WeberFramework/lib/controllers/main.ex

@@ -1,13 +0,0 @@
-defmodule WeberFramework.Main do
-  
-  use Weber.Controller
-
-  def action_json(_, _) do
-    {:json, [message: "Hello, world!"], [{"Content-type", "application/json"}]}
-  end
-
-  def action_text(_, _) do
-  	{:text, "Hello, world!", [{"Content-type", "text/plain"}]}
-  end
-
-end

frameworks/Elixir/WeberFramework/lib/route.ex

@@ -1,9 +0,0 @@
-defmodule Route do
-
-  import Weber.Route
-  require Weber.Route
-  
-  route on("GET", "/json", :WeberFramework.Main, :action_json)
-     |> on("GET", "/plaintext", :WeberFramework.Main, :action_text)
-
-end

frameworks/Elixir/WeberFramework/lib/views/Main.html

@@ -1,235 +0,0 @@
-<!DOCTYPE html>
-<html itemscope itemtype="http://schema.org/WebPage" lang="en">
-
-<head>
-  <meta charset="utf-8">
-  <title>Welcome to Weber!</title>
-  <link href="img/favicon.ico" rel="shortcut icon" type="image/vnd.microsoft.icon">
-
-  <style>
-    /* Reset */
-    * {
-      margin: 0;
-      padding: 0;
-    }
-
-    /* Default */
-    body {
-      font: normal 13px proxima-nova, sans-serif;
-      color: #666;
-    }
-
-    a {
-      color: #4c0066;
-    }
-
-    code, pre {
-      background: #f9f9f9;
-      border: 1px solid #ddd;
-      border-radius: 3px;
-      display: block;
-      font-family: monospace;
-      margin: 5px 0;
-      padding: 20px 0 20px 30px;
-      white-space: pre;
-    }
-
-    blockquote {
-      background: #f9f9f9;
-      border-left: 10px solid #eee;
-      border-radius: 3px;
-      color: #888;
-      margin: 20px 0 20px 20px;
-      padding: 10px 12px;
-      quotes: "\201C""\201D""\2018""\2019";
-    }
-
-    blockquote:before {
-      color: #ccc;
-      content: open-quote;
-      font-size: 55px;
-      line-height: 1px;
-      margin-right: 15px;
-      vertical-align: -25px;
-    }
-
-    blockquote p {
-      display: inline;
-    }
-
-    p {
-      font-size: 120%;
-      line-height: 25px;
-      margin: 10px 0;
-    }
-
-    /* Classes */
-    .content {
-      margin: 0 auto;
-      padding: 0 10px;
-      width: 960px;
-    }
-
-    /* Structure */
-    header:after, main:after,
-    header:before, main:before {
-      content: " ";
-      display: table;
-    }
-
-    header:after, main:after {
-      clear: both;
-    }
-
-    header {
-      background: #4c0066;
-      height: 150px;
-      margin-bottom: 50px;
-    }
-
-    header .logo {
-      border-radius: 100%;
-      display: block;
-      float: left;
-      padding-top: 25px;
-    }
-
-    header .title {
-      color: #fff;
-      float: left;
-      line-height: 30px;
-      margin: 101px 0 0;
-      text-align: right;
-      width: 660px;
-    }
-
-    header .title h1 {
-      font-size: 100px;
-    }
-
-    main .guide {
-      float: right;
-      width: 610px;
-    }
-
-    main .guide article {
-      margin-bottom: 50px;
-    }
-
-    main .guide h3 {
-      color: #4c0066;
-      font-size: 150%;
-      text-transform: uppercase;
-    }
-
-    main aside {
-      float: left;
-      margin-right: 50px;
-      width: 300px;
-    }
-
-    .sidebar-box {
-      margin: 25px 20px;
-    }
-
-    .sidebar-box h3 {
-      font-size: 110%;
-      margin-bottom: 5px;
-      text-transform: uppercase;
-    }
-
-    .sidebar-box p {
-      font-size: 90%;
-      line-height: 100%;
-      margin: 0;
-    }
-
-    .sidebar-box ol {
-      background: #f9f9f9;
-      border: 1px solid #eee;
-      border-radius: 3px;
-      list-style: none;
-    }
-    
-    .sidebar-box ol a {
-      border-bottom: 1px solid #eee;
-      display: block;
-      padding: 10px 10px;
-      text-decoration: none;
-    }
-    
-    .sidebar-box ol li:last-child a {
-      border-bottom: none;
-    }
-
-    .sidebar-box ol a:hover {
-      background: #f5f5f5;
-    }
-
-    li {
-      margin-left: 20px;
-      font-size: 120%;
-    }
-
-    h4 {
-      font-size: 120%;
-    }
-
-
-  </style>
-</head>
-
-<body>
-  <header role="banner">
-    <div class="content">
-      <a class="logo" href="http://0xAX.github.io/weber" target="_blank">
-        <svg height="300" width="300" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-          <g>
-            <circle cx="150" cy="150" fill="#4c0066" r="147" stroke="#ffffff" stroke-width="6" />
-            <path d="M191.75,213.42l34.57-126.24c2.39-8.71-4.36-15.78-15.08-15.78c-10.721,0-21.02,7.06-23.01,15.78l-28.82,126.24c-1.99,8.71,3.47,15.78,12.21,15.78C180.35,229.2,189.359,222.141,191.75,213.42z" fill="#ffffff" />
-            <path d="M148.77,213.42l26.74-126.24c1.85-8.71-5.289-15.78-15.939-15.78c-10.66,0-20.47,7.06-21.92,15.78l-21.03,126.24c-1.45,8.71,4.41,15.78,13.09,15.78S146.92,222.141,148.77,213.42z" fill="#ffffff" />
-            <path d="M106.05,213.45l4.78-31.511c1.33-8.689-5.28-15.739-14.76-15.739c-9.47,0-17.9,7.05-18.82,15.739l-3.36,31.511c-0.92,8.7,5.36,15.75,14.05,15.75C96.62,229.2,104.73,222.15,106.05,213.45z" fill="#ffffff" />
-          </g>
-        </svg>
-      </a>
-
-      <div class="title">
-        <h1 style="margin-top: -20px;">Weber</h1>
-      </div>
-    </div>
-  </header>
-
-  <main class="content" role="main">
-    <div class="guide">
-      <article id="getting-started">
-        <h3>Getting started</h3>
-        <p>Welcome to the default <a href="https://github.com/0xAX/weber">Weber's</a> page. Weber is a MVC Rails like web framework which was built with <a href="http://elixir-lang.org/">Elixir</a> programming language. Build web applications quickly and efficiently as possible. Let's build Web with Elixir.</p>
-        <h4>Weber features:</h4>
-        <br/>
-        <ul>
-          <li>MVC web framework;</li>
-          <li>New project generation;</li>
-          <li>Json generation with exjson;</li>
-          <li>Websocket support;</li>
-          <li>HTML helpers;</li>
-          <li>Site internationalization</li>
-          <li>Sessions support;</li>
-          <li>and many more</li>
-        </ul>
-      </article>
-    </div>
-    
-    <aside role="contentinfo">
-      <div class="sidebar-box">
-        <h3>Links</h3>
-        <ol>
-          <li><a href="https://github.com/0xAX/weber">Weber source code</a></li>
-          <li><a href="http://0xax.github.io/weber/index.html">Weber site</a></li>
-          <li><a href="http://elixir-lang.org/">Elixir</a></li>
-        </ol>
-      </div>
-    </aside>
-  </main>
-</body>
-
-</html>

frameworks/Elixir/WeberFramework/mix.exs

@@ -1,24 +0,0 @@
-defmodule WeberFramework.Mixfile do
-  use Mix.Project
-
-  def project do
-    [ 
-      app: :WeberFramework,
-      version: "0.0.1",
-      deps: deps
-    ]
-  end
-
-  def application do
-    [
-      applications: [],
-      mod: {WeberFramework, []}
-    ]
-  end
-
-  defp deps do
-    [ 
-      { :weber, github: "0xAX/weber" } 
-    ]
-  end
-end

frameworks/Elixir/WeberFramework/public/index.html

@@ -1,235 +0,0 @@
-<!DOCTYPE html>
-<html itemscope itemtype="http://schema.org/WebPage" lang="en">
-
-<head>
-  <meta charset="utf-8">
-  <title>Welcome to Weber!</title>
-  <link href="img/favicon.ico" rel="shortcut icon" type="image/vnd.microsoft.icon">
-
-  <style>
-    /* Reset */
-    * {
-      margin: 0;
-      padding: 0;
-    }
-
-    /* Default */
-    body {
-      font: normal 13px proxima-nova, sans-serif;
-      color: #666;
-    }
-
-    a {
-      color: #4c0066;
-    }
-
-    code, pre {
-      background: #f9f9f9;
-      border: 1px solid #ddd;
-      border-radius: 3px;
-      display: block;
-      font-family: monospace;
-      margin: 5px 0;
-      padding: 20px 0 20px 30px;
-      white-space: pre;
-    }
-
-    blockquote {
-      background: #f9f9f9;
-      border-left: 10px solid #eee;
-      border-radius: 3px;
-      color: #888;
-      margin: 20px 0 20px 20px;
-      padding: 10px 12px;
-      quotes: "\201C""\201D""\2018""\2019";
-    }
-
-    blockquote:before {
-      color: #ccc;
-      content: open-quote;
-      font-size: 55px;
-      line-height: 1px;
-      margin-right: 15px;
-      vertical-align: -25px;
-    }
-
-    blockquote p {
-      display: inline;
-    }
-
-    p {
-      font-size: 120%;
-      line-height: 25px;
-      margin: 10px 0;
-    }
-
-    /* Classes */
-    .content {
-      margin: 0 auto;
-      padding: 0 10px;
-      width: 960px;
-    }
-
-    /* Structure */
-    header:after, main:after,
-    header:before, main:before {
-      content: " ";
-      display: table;
-    }
-
-    header:after, main:after {
-      clear: both;
-    }
-
-    header {
-      background: #4c0066;
-      height: 150px;
-      margin-bottom: 50px;
-    }
-
-    header .logo {
-      border-radius: 100%;
-      display: block;
-      float: left;
-      padding-top: 25px;
-    }
-
-    header .title {
-      color: #fff;
-      float: left;
-      line-height: 30px;
-      margin: 101px 0 0;
-      text-align: right;
-      width: 660px;
-    }
-
-    header .title h1 {
-      font-size: 100px;
-    }
-
-    main .guide {
-      float: right;
-      width: 610px;
-    }
-
-    main .guide article {
-      margin-bottom: 50px;
-    }
-
-    main .guide h3 {
-      color: #4c0066;
-      font-size: 150%;
-      text-transform: uppercase;
-    }
-
-    main aside {
-      float: left;
-      margin-right: 50px;
-      width: 300px;
-    }
-
-    .sidebar-box {
-      margin: 25px 20px;
-    }
-
-    .sidebar-box h3 {
-      font-size: 110%;
-      margin-bottom: 5px;
-      text-transform: uppercase;
-    }
-
-    .sidebar-box p {
-      font-size: 90%;
-      line-height: 100%;
-      margin: 0;
-    }
-
-    .sidebar-box ol {
-      background: #f9f9f9;
-      border: 1px solid #eee;
-      border-radius: 3px;
-      list-style: none;
-    }
-    
-    .sidebar-box ol a {
-      border-bottom: 1px solid #eee;
-      display: block;
-      padding: 10px 10px;
-      text-decoration: none;
-    }
-    
-    .sidebar-box ol li:last-child a {
-      border-bottom: none;
-    }
-
-    .sidebar-box ol a:hover {
-      background: #f5f5f5;
-    }
-
-    li {
-      margin-left: 20px;
-      font-size: 120%;
-    }
-
-    h4 {
-      font-size: 120%;
-    }
-
-
-  </style>
-</head>
-
-<body>
-  <header role="banner">
-    <div class="content">
-      <a class="logo" href="http://0xAX.github.io/weber" target="_blank">
-        <svg height="300" width="300" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-          <g>
-            <circle cx="150" cy="150" fill="#4c0066" r="147" stroke="#ffffff" stroke-width="6" />
-            <path d="M191.75,213.42l34.57-126.24c2.39-8.71-4.36-15.78-15.08-15.78c-10.721,0-21.02,7.06-23.01,15.78l-28.82,126.24c-1.99,8.71,3.47,15.78,12.21,15.78C180.35,229.2,189.359,222.141,191.75,213.42z" fill="#ffffff" />
-            <path d="M148.77,213.42l26.74-126.24c1.85-8.71-5.289-15.78-15.939-15.78c-10.66,0-20.47,7.06-21.92,15.78l-21.03,126.24c-1.45,8.71,4.41,15.78,13.09,15.78S146.92,222.141,148.77,213.42z" fill="#ffffff" />
-            <path d="M106.05,213.45l4.78-31.511c1.33-8.689-5.28-15.739-14.76-15.739c-9.47,0-17.9,7.05-18.82,15.739l-3.36,31.511c-0.92,8.7,5.36,15.75,14.05,15.75C96.62,229.2,104.73,222.15,106.05,213.45z" fill="#ffffff" />
-          </g>
-        </svg>
-      </a>
-
-      <div class="title">
-        <h1 style="margin-top: -20px;">Weber</h1>
-      </div>
-    </div>
-  </header>
-
-  <main class="content" role="main">
-    <div class="guide">
-      <article id="getting-started">
-        <h3>Getting started</h3>
-        <p>Welcome to the default <a href="https://github.com/0xAX/weber">Weber's</a> page. Weber is a MVC Rails like web framework which was built with <a href="http://elixir-lang.org/">Elixir</a> programming language. Build web applications quickly and efficiently as possible. Let's build Web with Elixir.</p>
-        <h4>Weber features:</h4>
-        <br/>
-        <ul>
-          <li>MVC web framework;</li>
-          <li>New project generation;</li>
-          <li>Json generation with exjson;</li>
-          <li>Websocket support;</li>
-          <li>HTML helpers;</li>
-          <li>Site internationalization</li>
-          <li>Sessions support;</li>
-          <li>and many more</li>
-        </ul>
-      </article>
-    </div>
-    
-    <aside role="contentinfo">
-      <div class="sidebar-box">
-        <h3>Links</h3>
-        <ol>
-          <li><a href="https://github.com/0xAX/weber">Weber source code</a></li>
-          <li><a href="http://0xax.github.io/weber/index.html">Weber site</a></li>
-          <li><a href="http://elixir-lang.org/">Elixir</a></li>
-        </ol>
-      </div>
-    </aside>
-  </main>
-</body>
-
-</html>

frameworks/Elixir/WeberFramework/setup_weber.py

@@ -1,18 +0,0 @@
-import sys
-import subprocess
-
-def start(args, logfile, errfile):
-    try:
-        subprocess.check_call("mix deps.get", cwd="WeberFramework", shell=True, stderr=errfile, stdout=logfile)
-        subprocess.check_call("mix compile --all --force", cwd="WeberFramework", shell=True, stderr=errfile, stdout=logfile)
-        subprocess.check_call("./start.sh", cwd="WeberFramework", shell=True, stderr=errfile, stdout=logfile)
-        return 0
-    except subprocess.CalledProcessError:
-        return 1
- 
-def stop(logfile, errfile):
-    try:
-        subprocess.check_call("killall beam", shell=True, cwd="/usr/bin")
-        return 0
-    except subprocess.CalledProcessError:
-        return 1

frameworks/Elixir/WeberFramework/start.sh

@@ -1,7 +0,0 @@
-#!/usr/bin/env sh
-
-if [ ! -f deps ]; then
-  mix deps.get && mix compile
-fi
-
-exec elixir --detached -S mix run --no-halt

frameworks/Elixir/WeberFramework/test/WeberFramework_test.exs

@@ -1,7 +0,0 @@
-defmodule WeberFrameworkTest do
-  use ExUnit.Case
-
-  test "the truth" do
-    assert(true)
-  end
-end

frameworks/Elixir/WeberFramework/test/test_helper.exs

@@ -1 +0,0 @@
-ExUnit.start

frameworks/Groovy/grails/install.sh

@@ -1,7 +1,6 @@
 #!/bin/bash
-export JAVA_HOME=/usr/lib/jvm/java-1.7.0-openjdk-amd64
-export RESIN_HOME=${IROOT}/resin-4.0.41
 
+export RESIN_HOME=${IROOT}/resin-4.0.41
 export GRAILS_PATH=${IROOT}/grails-2.4.4/bin/
 
-fw_depends grails resin
+fw_depends java7 grails resin 

frameworks/Groovy/grails/setup.sh

@@ -1,6 +1,7 @@
 #!/bin/bash
 
-export JAVA_HOME=/usr/lib/jvm/java-1.7.0-openjdk-amd64
+source $IROOT/java7.installed
+
 export RESIN_HOME=${IROOT}/resin-4.0.41
 export GRAILS_PATH=${IROOT}/grails-2.4.4/bin/
 

frameworks/Java/activeweb/install.sh

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

frameworks/Java/activeweb/setup.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
-export JAVA_HOME=/usr/lib/jvm/java-1.7.0-openjdk-amd64
+
+# load java environment variables
+source $IROOT/java7.installed
 export RESIN_HOME=${IROOT}/resin-4.0.41
 
 sed -i 's|localhost|'"${DBHOST}"'|g' src/main/webapp/WEB-INF/resin-web.xml

frameworks/Java/curacao/install.sh

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

frameworks/Java/curacao/setup.sh

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+# load java environment variables
+source $IROOT/java7.installed
+
 ${IROOT}/sbt/bin/sbt assembly
 
 java -jar dist/curacao-standalone.jar &

frameworks/Java/dropwizard-mongodb/install.sh

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

frameworks/Java/dropwizard-mongodb/setup.sh

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+# load java environment variables
+source $IROOT/java7.installed
+
 mvn clean package
 
 java -jar target/dropwizard-mongodb-0.0.1-SNAPSHOT.jar server hello-world.yml &

frameworks/Java/dropwizard/install.sh

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

frameworks/Java/dropwizard/setup.sh

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+# load java environment variables
+source $IROOT/java7.installed
+
 sed -i 's|url: jdbc:mysql://.*/hello_world|url: jdbc:mysql://'"${DBHOST}"':3306/hello_world|g' hello-world.yml
 
 mvn clean package

frameworks/Java/gemini/install.sh

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

frameworks/Java/gemini/start.sh

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+# load java environment variables
+source $IROOT/java7.installed
+
 sed -i 's|db.ConnectString = .*/|db.ConnectString = '"$DBHOST"':3306/|g' Docroot/WEB-INF/GeminiHello.conf
 sed -i 's|root-directory=".*/FrameworkBenchmarks/frameworks/Java/gemini|root-directory="'"$TROOT"'|g' Docroot/WEB-INF/resin.xml
 sed -i 's|db.Driver.Class = .*|db.Driver.Class = com.mysql.jdbc.Driver|g' Docroot/WEB-INF/GeminiHello.conf

frameworks/Java/gemini/start_postgres.sh

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+# load java environment variables
+source $IROOT/java7.installed
+
 sed -i 's|db.ConnectString = .*/|db.ConnectString = '"$DBHOST"':5432/|g' Docroot/WEB-INF/GeminiHello.conf
 sed -i 's|root-directory=".*/FrameworkBenchmarks/frameworks/Java/gemini|root-directory="'"$TROOT"'|g' Docroot/WEB-INF/resin.xml
 sed -i 's|db.Driver.Class = .*|db.Driver.Class = org.postgresql.Driver|g' Docroot/WEB-INF/GeminiHello.conf

frameworks/Java/grizzly-bm/install.sh

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

frameworks/Java/grizzly-bm/setup.sh

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+# load java environment variables
+source $IROOT/java7.installed
+
 mvn clean compile assembly:single
 
 cd target

frameworks/Java/grizzly-jersey/install.sh

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

frameworks/Java/grizzly-jersey/setup.sh

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+# load java environment variables
+source $IROOT/java7.installed
+
 mvn clean package
 
 java -jar target/grizzly-jersey-example.jar -dbhost ${DBHOST} &

frameworks/Java/jetty-servlet/install.sh

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

frameworks/Java/jetty-servlet/setup.sh

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+# load java environment variables
+source $IROOT/java7.installed
+
 mvn clean compile assembly:single
 
 cd target

frameworks/Java/netty/install.sh

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

frameworks/Java/netty/setup.sh

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+# load java environment variables
+source $IROOT/java7.installed
+
 mvn clean compile assembly:single
 
 cd target

frameworks/Java/ninja-standalone/install.sh

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

frameworks/Java/ninja-standalone/setup.sh

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+# load java environment variables
+source $IROOT/java7.installed
+
 sed -i 's|mysql://.*:3306|mysql://'"${DBHOST}"':3306|g' src/main/java/conf/application.conf
 
 mvn clean compile assembly:single

frameworks/Java/play1/install.sh

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

frameworks/Java/play1/setup.sh

@@ -1,6 +1,9 @@
 #!/bin/bash
 export PLAY1_HOME=${IROOT}/play-1.2.5
 
+# load java environment variables
+source $IROOT/java7.installed
+
 sed -i 's|jdbc:mysql://.*:3306|jdbc:mysql://'"${DBHOST}"':3306|g' conf/application.conf
 
 $PLAY1_HOME/play start --%prod

frameworks/Java/play1siena/install.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-fw_depends play1 siena java resin
+fw_depends java7 play1 siena resin

frameworks/Java/play1siena/setup.sh

@@ -1,4 +1,8 @@
 #!/bin/bash
+
+# load java environment variables
+source $IROOT/java7.installed
+
 export PLAY1_HOME=${IROOT}/play-1.2.5
 export RESIN_HOME=${IROOT}/resin-4.0.41
 

frameworks/Java/play2-java/install.sh

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

frameworks/Java/play2-java/setup_java.sh

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+# load java environment variables
+source $IROOT/java7.installed
+
 cd play2-java
 
 # If application is running, clear old running app.

frameworks/Java/play2-java/setup_java_ebean_bonecp.sh

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+# load java environment variables
+source $IROOT/java7.installed
+
 cd play2-java-ebean-bonecp
 
 # If application is running, clear old running app.

frameworks/Java/play2-java/setup_java_ebean_hikaricp.sh

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+# load java environment variables
+source $IROOT/java7.installed
+
 cd play2-java-ebean-hikaricp
 
 # If application is running, clear old running app.

frameworks/Java/play2-java/setup_java_jpa_bonecp.sh

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+# load java environment variables
+source $IROOT/java7.installed
+
 cd play2-java-jpa-bonecp
 
 # If application is running, clear old running app.

frameworks/Java/play2-java/setup_java_jpa_hikaricp.sh

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+# load java environment variables
+source $IROOT/java7.installed
+
 cd play2-java-jpa-hikaricp
 
 # If application is running, clear old running app.

frameworks/Java/restexpress/install.sh

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

frameworks/Java/restexpress/setup.sh

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+# load java environment variables
+source $IROOT/java7.installed
+
 sed -i 's|mongodb://.*/hello_world|mongodb://'"${DBHOST}"'/hello_world|g' config/dev/environment.properties
 sed -i 's|mysql://.*:3306|mysql://'"${DBHOST}"':3306|g' config/dev/environment.properties
 

frameworks/Java/sabina/setup.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
-export JAVA_HOME=/opt/java8
+# load java environment variables
+source $IROOT/java8.installed
+
 mvn clean package -DskipTests -Ddb.host=${DBHOST}
 ${JAVA_HOME}/bin/java -jar target/sabina-1.0.0.jar &

frameworks/Java/servlet/install.sh

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

frameworks/Java/servlet/setup.sh

@@ -1,4 +1,8 @@
 #!/bin/bash
+
+# load java environment variables
+source $IROOT/java7.installed
+
 export RESIN_HOME=${IROOT}/resin-4.0.41
 
 sed -i 's|localhost|'"${DBHOST}"'|g' src/main/webapp/WEB-INF/resin-web.xml

frameworks/Java/servlet3-cass/setup.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
-export JAVA_HOME=/usr/lib/jvm/java-1.7.0-openjdk-amd64
+
+# load java environment variables
+source $IROOT/java8.installed
 export RESIN_HOME=${IROOT}/resin-4.0.41
 
 sed -i 's|localhost|'"${DBHOST}"'|g' src/main/resources/application.properties

frameworks/Java/spark/install.sh

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

frameworks/Java/spark/setup.sh

@@ -1,5 +1,8 @@
 #!/bin/bash
-export JAVA_HOME=/usr/lib/jvm/java-1.7.0-openjdk-amd64
+
+# load java environment variables
+source $IROOT/java7.installed
+
 export RESIN_HOME=${IROOT}/resin-4.0.41
 
 sed -i 's|mysql://.*:3306|mysql://'"${DBHOST}"':3306|g' src/main/webapp/WEB-INF/resin-web.xml

frameworks/Java/spring/install.sh

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

frameworks/Java/spring/setup.sh

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+# load java environment variables
+source $IROOT/java7.installed
+
 mvn clean package
 cd target
 java -Ddatabase.host=${DBHOST} -jar spring.war &

frameworks/Java/tapestry/install.sh

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

frameworks/Java/tapestry/setup.sh

@@ -1,5 +1,6 @@
 #!/bin/bash
-export JAVA_HOME=/usr/lib/jvm/java-1.7.0-openjdk-amd64
+# load java environment variables
+source $IROOT/java7.installed
 export RESIN_HOME=${IROOT}/resin-4.0.41
 
 sed -i 's|mysql://.*:3306|mysql://'"${DBHOST}"':3306|g' hello/src/main/webapp/WEB-INF/resin-web.xml

frameworks/Java/undertow-edge/install.sh

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

frameworks/Java/undertow-edge/setup.sh

@@ -1,4 +1,6 @@
 #!/bin/bash
+# load java environment variables
+source $IROOT/java7.installed
 
 sed -i 's|mysql://.*:3306|mysql://'"${DBHOST}"':3306|g' src/main/resources/hello/server.properties
 sed -i 's|postgresql://.*:5432|postgresql://'"${DBHOST}"':5432|g' src/main/resources/hello/server.properties

frameworks/Java/undertow/install.sh

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

frameworks/Java/undertow/setup.sh

@@ -1,4 +1,6 @@
 #!/bin/bash
+# load java environment variables
+source $IROOT/java7.installed
 
 sed -i 's|DATABASE_HOST|'"${DBHOST}"'|g' src/main/resources/hello/server.properties
 

frameworks/Java/vertx/install.sh

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

frameworks/Java/vertx/setup.sh

@@ -1,4 +1,6 @@
 #!/bin/bash
+# load java environment variables
+source $IROOT/java7.installed
 
 sed -i 's|host: \x27.*\x27|host: \x27'"${DBHOST}"'\x27|g' app.js
 

frameworks/Java/wicket/install.sh

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

frameworks/Java/wicket/setup.sh

@@ -1,4 +1,6 @@
 #!/bin/bash
+# load java environment variables
+source $IROOT/java7.installed
 export RESIN_HOME=${IROOT}/resin-4.0.41
 
 sed -i 's|mysql://.*:3306|mysql://'"${DBHOST}"':3306|g' src/main/webapp/WEB-INF/resin-web.xml

frameworks/Java/wildfly-ee7/install.sh

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

frameworks/Java/wildfly-ee7/setup.sh

@@ -1,4 +1,6 @@
 #!/bin/bash
+# load java environment variables
+source $IROOT/java7.installed
 
 export JAVA_OPTS="-Xms2g -Xmx2g -XX:MaxPermSize=256m -XX:+UseG1GC -XX:MaxGCPauseMillis=25 -verbosegc -Xloggc:/tmp/wildfly_gc.log"
 

frameworks/Ruby/grape/install.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-fw_depends rvm nginx java
+fw_depends rvm nginx java7
 
 if [ "$TRAVIS" = "true" ]
 then

frameworks/Ruby/grape/run_jruby_puma.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+source $IROOT/java7.installed
+
 # We assume single-user installation as 
 # done in our rvm.sh script and 
 # in Travis-CI

frameworks/Ruby/grape/run_mri_puma.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+source $IROOT/java7.installed
+
 # We assume single-user installation as 
 # done in our rvm.sh script and 
 # in Travis-CI

frameworks/Ruby/grape/run_rbx_puma.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+source $IROOT/java7.installed
+
 # We assume single-user installation as 
 # done in our rvm.sh script and 
 # in Travis-CI

frameworks/Ruby/grape/run_thin.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+source $IROOT/java7.installed
+
 # We assume single-user installation as 
 # done in our rvm.sh script and 
 # in Travis-CI

frameworks/Ruby/grape/run_torqbox.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+source $IROOT/java7.installed
+
 # We assume single-user installation as 
 # done in our rvm.sh script and 
 # in Travis-CI

frameworks/Ruby/grape/run_trinidad.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+source $IROOT/java7.installed
+
 # We assume single-user installation as 
 # done in our rvm.sh script and 
 # in Travis-CI

frameworks/Ruby/grape/run_unicorn.sh

@@ -1,6 +1,8 @@
 #!/bin/bash
 export NGINX_HOME=${IROOT}/nginx
 
+source $IROOT/java7.installed
+
 # We assume single-user installation as 
 # done in our rvm.sh script and 
 # in Travis-CI

frameworks/Ruby/padrino/install.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-fw_depends rvm nginx java
+fw_depends rvm nginx java7
 
 if [ "$TRAVIS" = "true" ]
 then

frameworks/Ruby/padrino/run_jruby_puma.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+source $IROOT/java7.installed
+
 # We assume single-user installation as 
 # done in our rvm.sh script and 
 # in Travis-CI