Merge pull request #1512 from hamiltont/improve-java-setup

Java: Improve setup

.travis.yml

@@ -149,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/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

frameworks/Ruby/padrino/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/padrino/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/padrino/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/padrino/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/padrino/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/padrino/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/rack/install.sh

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

frameworks/Ruby/rack/run_jruby_puma.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+source $IROOT/java7.installed
+
 sed -i 's|  host:.*|  host:'"${DBHOST}"'|g' config/database.yml
 
 # We assume single-user installation as 

frameworks/Ruby/rack/run_mri_puma.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+source $IROOT/java7.installed
+
 sed -i 's|  host:.*|  host:'"${DBHOST}"'|g' config/database.yml
 
 # We assume single-user installation as 

frameworks/Ruby/rack/run_rbx_puma.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+source $IROOT/java7.installed
+
 sed -i 's|  host:.*|  host:'"${DBHOST}"'|g' config/database.yml
 
 # We assume single-user installation as 

frameworks/Ruby/rack/run_thin.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+source $IROOT/java7.installed
+
 sed -i 's|  host:.*|  host:'"${DBHOST}"'|g' config/database.yml
 
 # We assume single-user installation as 

frameworks/Ruby/rack/run_torqbox.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+source $IROOT/java7.installed
+
 sed -i 's|  host:.*|  host:'"${DBHOST}"'|g' config/database.yml
 
 # We assume single-user installation as 

frameworks/Ruby/rack/run_trinidad.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+source $IROOT/java7.installed
+
 sed -i 's|  host:.*|  host:'"${DBHOST}"'|g' config/database.yml
 
 # We assume single-user installation as 

frameworks/Ruby/rack/run_unicorn.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+source $IROOT/java7.installed
 export NGINX_HOME=${IROOT}/nginx
 
 sed -i 's|  host:.*|  host:'"${DBHOST}"'|g' config/database.yml

frameworks/Ruby/rails-stripped/install.sh

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

frameworks/Ruby/rails-stripped/setup_jruby.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-
+source $IROOT/java7.installed
 sed -i 's|host: .*|host: '"${DBHOST}"'|g' config/database.yml
 
 # We assume single-user installation as 

frameworks/Ruby/rails-stripped/setup_ruby.sh

@@ -1,5 +1,6 @@
 #!/bin/bash
 export NGINX_HOME=${IROOT}/nginx
+source $IROOT/java7.installed
 
 sed -i 's|host: .*|host: '"${DBHOST}"'|g' config/database.yml
 sed -i 's|/usr/local/nginx/|'"${IROOT}"'/nginx/|g' config/nginx.conf

frameworks/Ruby/rails/install.sh

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

frameworks/Ruby/rails/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/rails/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/rails/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/rails/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/rails/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/rails/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/rails/run_unicorn.sh

@@ -1,5 +1,6 @@
 #!/bin/bash
 export NGINX_HOME=${IROOT}/nginx
+source $IROOT/java7.installed
 
 sed -i 's|/usr/local/nginx/|'"${IROOT}"'/nginx/|g' config/nginx.conf