Setup Java environment variables in central location

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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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"
 

toolset/setup/linux/languages/java.sh

@@ -3,7 +3,17 @@
 # TODO include a check before we do all this, because it's 
 # annoyingly slow to run apt-get if we don't need to
 
+RETCODE=$(fw_exists java7.installed)
+[ ! "$RETCODE" == 0 ] || { \
+  # Load environment variables
+  . $IROOT/java7.installed
+  return 0; }
+
 # First remove java6
 sudo apt-get remove -y --purge openjdk-6-jre openjdk-6-jre-headless
 # Then install java7
-sudo apt-get install -y openjdk-7-jdk
+sudo apt-get install -y openjdk-7-jdk
+
+# Setup environment variables
+echo "export JAVA_HOME=/usr/lib/jvm/java-1.7.0-openjdk-`dpkg --print-architecture`" > $IROOT/java7.installed
+echo "export PATH=$JAVA_HOME/bin:$PATH" >> $IROOT/java7.installed

toolset/setup/linux/languages/java8.sh

@@ -1,21 +1,23 @@
 #!/bin/bash
 
 RETCODE=$(fw_exists java8.installed)
-[ ! "$RETCODE" == 0 ] || { return 0; }
+[ ! "$RETCODE" == 0 ] || { \
+  # Load environment variables
+  . $IROOT/java8.installed
+  return 0; }
 
 sudo add-apt-repository -y ppa:webupd8team/java
 sudo apt-get update
 echo oracle-java8-installer shared/accepted-oracle-license-v1-1 select true | sudo /usr/bin/debconf-set-selections
 sudo apt-get install -y oracle-java8-installer
 
-sudo ln -sf /usr/lib/jvm/java-8-oracle /opt/java8
-
 # set Java 7 (OpenJDK) as the default, as before.
-sudo update-alternatives --set java /usr/lib/jvm/java-7-openjdk-amd64/jre/bin/java
-sudo update-alternatives --set javac /usr/lib/jvm/java-7-openjdk-amd64/bin/javac
+J7_HOME=/usr/lib/jvm/java-7-openjdk-`dpkg --print-architecture`
+sudo update-alternatives --set java $J7_HOME/jre/bin/java
+sudo update-alternatives --set javac $J7_HOME/bin/javac
 
-# try to make sure all JDK binaries default to OpenJDK 7, not Java 8.
-update-alternatives --get-selections | grep java-8 | sed -e 's/java-8-oracle/java-7-openjdk-amd64/' | while read line
+# try to make sure all JDK binaries default to OpenJDK 7, not Java 8
+update-alternatives --get-selections | grep java-8 | sed -e "s/java-8-oracle/$J7_HOME/" | while read line
 do
   l=(${line// / })
   n=${l[0]}
@@ -25,4 +27,6 @@ do
   fi
 done
 
-touch $IROOT/java8.installed
+# Setup environment variables
+echo "export JAVA_HOME=/usr/lib/jvm/java-8-oracle" > $IROOT/java8.installed
+echo "export PATH=$JAVA_HOME/bin:$PATH" >> $IROOT/java8.installed