Move java.sh to java7.sh

Fix install files
Also update all setup+install files using java that were missed before (e.g. Clojure, Scala, Ruby, 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

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/curacao/install.sh

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

frameworks/Java/dropwizard-mongodb/install.sh

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

frameworks/Java/dropwizard/install.sh

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

frameworks/Java/gemini/install.sh

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

frameworks/Java/grizzly-bm/install.sh

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

frameworks/Java/grizzly-jersey/install.sh

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

frameworks/Java/jetty-servlet/install.sh

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

frameworks/Java/netty/install.sh

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

frameworks/Java/ninja-standalone/install.sh

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

frameworks/Java/play1/install.sh

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

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/play2-java/install.sh

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

frameworks/Java/restexpress/install.sh

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

frameworks/Java/servlet/install.sh

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

frameworks/Java/spark/install.sh

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

frameworks/Java/spring/install.sh

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

frameworks/Java/tapestry/install.sh

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

frameworks/Java/undertow-edge/install.sh

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

frameworks/Java/undertow/install.sh

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

frameworks/Java/vertx/install.sh

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

frameworks/Java/wicket/install.sh

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

frameworks/Java/wildfly-ee7/install.sh

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

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
 

frameworks/Ruby/sinatra/install.sh

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

frameworks/Ruby/sinatra/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/sinatra/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/sinatra/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/sinatra/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/sinatra/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/sinatra/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/sinatra/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
 

frameworks/Scala/finagle/install.sh

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

frameworks/Scala/finagle/setup.sh

@@ -1,6 +1,7 @@
 #!/bin/bash
+
+source $IROOT/java7.installed
 export SBT_HOME=${IROOT}/sbt
-export JAVA_HOME=/usr/lib/jvm/java-1.7.0-openjdk-amd64
 
 ${SBT_HOME}/bin/sbt update compile
 

frameworks/Scala/lift-stateless/install.sh

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

frameworks/Scala/lift-stateless/setup.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
+source $IROOT/java7.installed
 export SBT_HOME=${IROOT}/sbt
-export JAVA_HOME=/usr/lib/jvm/java-1.7.0-openjdk-amd64
 
 sed -i 's|> ".*:3306|> "'"${DBHOST}"':3306|g' src/main/scala/Main.scala
 

frameworks/Scala/plain/install.sh

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

frameworks/Scala/plain/setup.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 export SBT_HOME=${IROOT}/sbt
-export JAVA_HOME=/usr/lib/jvm/java-1.7.0-openjdk-amd64
+source $IROOT/java7.installed
 
 sed -i 's|127.0.0.1|'"${DBHOST}"'|g' src/main/resources/application.conf
 

frameworks/Scala/play2-scala/install.sh

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

frameworks/Scala/play2-scala/setup_scala.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+source $IROOT/java7.installed
+
 cd play2-scala
 sed -i "s|jdbc:mysql:\/\/.*:3306|jdbc:mysql://${DBHOST}:3306|g" conf/application.conf
 

frameworks/Scala/play2-scala/setup_scala_activate.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+source $IROOT/java7.installed
+
 cd play2-scala-activate
 sed -i 's|jdbc:mysql://.*:3306|jdbc:mysql://'"${DBHOST}"':3306|g' conf/application.conf
 

frameworks/Scala/play2-scala/setup_scala_anorm.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-
+source $IROOT/java7.installed
 cd play2-scala-anorm
 sed -i "s|jdbc:mysql:\/\/.*:3306|jdbc:mysql://${DBHOST}:3306|g" conf/application.conf
 

frameworks/Scala/play2-scala/setup_scala_reactivemongo.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+source $IROOT/java7.installed
+
 cd play2-scala-reactivemongo
 sed -i 's|jdbc:mysql://.*:3306|jdbc:mysql://'"${DBHOST}"':3306|g' conf/application.conf
 

frameworks/Scala/play2-scala/setup_scala_slick.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+source $IROOT/java7.installed
 
 cd play2-scala-slick
 sed -i "s|jdbc:mysql:\/\/.*:3306|jdbc:mysql://${DBHOST}:3306|g" conf/application.conf

frameworks/Scala/scalatra/install.sh

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

frameworks/Scala/scalatra/setup.sh

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

frameworks/Scala/scruffy/install.sh

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

frameworks/Scala/scruffy/setup.sh

@@ -1,5 +1,6 @@
 #!/bin/bash
 export SBT_HOME=${IROOT}/sbt
+source $IROOT/java7.installed
 
 sed -i 's|database_host|'"${DBHOST}"'|g' src/main/scala/scruffy/examples/Test2Endpoint.scala
 

frameworks/Scala/spray-es/install.sh

@@ -2,8 +2,8 @@
 
 fw_depends java8 sbt
 
-export JAVA_HOME=/opt/java8
-export PATH=$JAVA_HOME/bin:$PATH:$IROOT/sbt/bin
+source $IROOT/java8.installed
+export PATH=$IROOT/sbt/bin:$PATH
 
 sbt_opts='-J-XX:+UseG1GC -J-Xmx2G -J-XX:MaxMetaspaceSize=512m'
 

frameworks/Scala/spray-es/setup.sh

@@ -1,3 +1,5 @@
 #!/bin/bash
 
-/opt/java8/bin/java -Dtfb.db_host=$DBHOST -jar target/scala-2.11/spray-es-assembly-0.1.jar &
+source $IROOT/java8.installed
+
+java -Dtfb.db_host=$DBHOST -jar target/scala-2.11/spray-es-assembly-0.1.jar &

frameworks/Scala/spray/install.sh

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

frameworks/Scala/spray/setup.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 export SBT_HOME=${IROOT}/sbt
-export JAVA_HOME=/usr/lib/jvm/java-1.7.0-openjdk-amd64
+source $IROOT/java7.installed
 
 ${SBT_HOME}/bin/sbt assembly
 

frameworks/Scala/unfiltered/install.sh

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

frameworks/Scala/unfiltered/setup_unfiltered.sh

@@ -1,6 +1,7 @@
 #!/bin/bash
+source $IROOT/java7.installed
+
 export SBT_HOME=${IROOT}/sbt
-export JAVA_HOME=/usr/lib/jvm/java-1.7.0-openjdk-amd64
 
 sed -i 's|jdbc:mysql://.*:3306|jdbc:mysql://'"${DBHOST}"':3306|g' src/main/resources/application.conf
 sed -i 's|maxThreads = .*|maxThreads = '"${MAX_THREADS}"'|g' src/main/resources/application.conf

toolset/setup/linux/webservers/resin.sh

@@ -5,8 +5,8 @@ RVER=4.0.41
 RETCODE=$(fw_exists ${IROOT}/resin-$RVER.installed)
 [ ! "$RETCODE" == 0 ] || { return 0; }
 
-fw_depends java
-sudo cp -r /usr/lib/jvm/java-1.7.0-openjdk-amd64/include /usr/lib/jvm/java-1.7.0-openjdk-amd64/jre/bin/
+fw_depends java7
+sudo cp -r $JAVA_HOME/include $JAVA_HOME/jre/bin/
 
 fw_get http://www.caucho.com/download/resin-$RVER.tar.gz
 fw_untar resin-$RVER.tar.gz