Merge pull request #12 from awoods/fcrepo-1546

Update for Java8

install_scripts/java.sh

@@ -3,7 +3,18 @@
 ###
 
 # Java
-apt-get -y install openjdk-7-jdk
+if which java >/dev/null; then
+  echo "skip java 8 installation"
+else
+  echo "java 8 installation"
+  apt-get install --yes python-software-properties
+  add-apt-repository ppa:webupd8team/java
+  apt-get update -qq
+  echo debconf shared/accepted-oracle-license-v1-1 select true | /usr/bin/debconf-set-selections
+  echo debconf shared/accepted-oracle-license-v1-1 seen true | /usr/bin/debconf-set-selections
+  apt-get install --yes oracle-java8-installer
+  apt-get install --yes oracle-java8-set-default
+fi
 
 # Maven
 apt-get -y install maven

install_scripts/tomcat7.sh

@@ -16,6 +16,10 @@ if ! grep -q "role rolename=\"fedoraAdmin\"" /etc/tomcat7/tomcat-users.xml ; the
   $i<user username="fedora4" password="fedora4" roles="manager-gui"/>' /etc/tomcat7/tomcat-users.xml
 fi
 
+if ! grep -q "/usr/lib/jvm/java-8-oracle" /etc/default/tomcat7 ; then
+  echo "JAVA_HOME=/usr/lib/jvm/java-8-oracle" >> /etc/default/tomcat7
+fi
+
 # Make the ingest directory
 mkdir /mnt/ingest
 chown -R tomcat7:tomcat7 /mnt/ingest