From d2413ae322b740e46c6aa2dd133208bd9f2c0ad0 Mon Sep 17 00:00:00 2001
From: Marianne Myers <marianne.gibson+gh@gmail.com>
Date: Mon, 30 Mar 2015 14:49:30 -0600
Subject: [PATCH 1/2] #28 Add JDK to CentOS VM
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Update mulch to install the JDK rather than the JRE.  Add JAVA_HOME to
the vagrant user’s environment.
---
 opt/vagrant/bootstrap-centos-extra.sh  | 1 +
 opt/vagrant/bootstrap-centos-master.sh | 1 +
 opt/vagrant/install-mlcp.sh            | 4 ++--
 opt/vagrant/set-env-vars.sh            | 6 ++++++
 4 files changed, 10 insertions(+), 2 deletions(-)
 create mode 100755 opt/vagrant/set-env-vars.sh

diff --git a/opt/vagrant/bootstrap-centos-extra.sh b/opt/vagrant/bootstrap-centos-extra.sh
index 692adca..9cad0d8 100755
--- a/opt/vagrant/bootstrap-centos-extra.sh
+++ b/opt/vagrant/bootstrap-centos-extra.sh
@@ -4,3 +4,4 @@ sudo /opt/vagrant/restore-yum-cache.sh
 sudo /opt/vagrant/install-ml-centos.sh $2
 sudo /opt/vagrant/setup-ml-extra.sh $@
 sudo /opt/vagrant/backup-yum-cache.sh
+sudo /opt/vagrant/set-env-vars.sh
diff --git a/opt/vagrant/bootstrap-centos-master.sh b/opt/vagrant/bootstrap-centos-master.sh
index e724a8d..cdc81c7 100755
--- a/opt/vagrant/bootstrap-centos-master.sh
+++ b/opt/vagrant/bootstrap-centos-master.sh
@@ -9,3 +9,4 @@ sudo /opt/vagrant/install-user.sh $4
 sudo /opt/vagrant/setup-git.sh $4
 sudo /opt/vagrant/setup-tomcat.sh
 sudo /opt/vagrant/backup-yum-cache.sh
+sudo /opt/vagrant/set-env-vars.sh
diff --git a/opt/vagrant/install-mlcp.sh b/opt/vagrant/install-mlcp.sh
index 6a4b336..061c517 100755
--- a/opt/vagrant/install-mlcp.sh
+++ b/opt/vagrant/install-mlcp.sh
@@ -2,7 +2,7 @@
 echo "running $0 $@"
 
 yum -y install zip unzip
-yum -y install java
+yum -y install java-1.7.0-openjdk-devel
 
 if [ "$1" -eq "8" ]; then
     echo "Installing MLCP 1.3-1..."
@@ -20,4 +20,4 @@ else
 	if [ ! -h /usr/local/mlcp ]; then
 	    cd /usr/local && ln -s /opt/mlcp-Hadoop2-1.2-3 mlcp
 	fi
-fi
\ No newline at end of file
+fi
diff --git a/opt/vagrant/set-env-vars.sh b/opt/vagrant/set-env-vars.sh
new file mode 100755
index 0000000..8a9a78b
--- /dev/null
+++ b/opt/vagrant/set-env-vars.sh
@@ -0,0 +1,6 @@
+#! /bin/sh
+echo "running $0 $@"
+
+# Vagrant Environment Variables
+echo "Setting environment variables..."
+echo "export JAVA_HOME=/usr/lib/jvm/java-1.7.0-openjdk-1.7.0.75.x86_64"  >> /home/vagrant/.bashrc

From a3766e7dcf06de5c124e1bfd9957f66404aff42e Mon Sep 17 00:00:00 2001
From: Marianne Myers <marianne.gibson+gh@gmail.com>
Date: Tue, 31 Mar 2015 21:07:10 -0600
Subject: [PATCH 2/2] #28 Use JDK 1.8

Use the more recent 1.8 JDK, by request of PR #29.
---
 opt/vagrant/install-mlcp.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/opt/vagrant/install-mlcp.sh b/opt/vagrant/install-mlcp.sh
index 061c517..ca918ac 100755
--- a/opt/vagrant/install-mlcp.sh
+++ b/opt/vagrant/install-mlcp.sh
@@ -2,7 +2,7 @@
 echo "running $0 $@"
 
 yum -y install zip unzip
-yum -y install java-1.7.0-openjdk-devel
+yum -y install java-1.8.0-openjdk-devel
 
 if [ "$1" -eq "8" ]; then
     echo "Installing MLCP 1.3-1..."