Auto detect java 8 or java 7

Author: Jeremy Carnus

java/sync/debian/obm-imap-archive.init

@@ -43,7 +43,14 @@ if [ -z "$APP_PORT" ]; then
 	APP_PORT=8085
 fi
 if [ -z "$JAVA_HOME" ]; then
-	JAVA_HOME="/usr"
+	test -d "/usr/lib/jvm/java-8-openjdk-"`dpkg --print-architecture` && {
+        JAVA_HOME="/usr/lib/jvm/java-8-openjdk-"`dpkg --print-architecture`
+    }
+fi
+if [ -z "$JAVA_HOME" ]; then
+	test -d "/usr/lib/jvm/java-7-openjdk-"`dpkg --print-architecture` && {
+        JAVA_HOME="/usr/lib/jvm/java-7-openjdk-"`dpkg --print-architecture`
+    }
 fi
 
 if [ ! -d "$TMP_DIR" ]; then

java/sync/debian/obm-provisioning.init

@@ -55,7 +55,14 @@ if [ -z "$JAVA_HOME" ]; then
     }
 fi
 if [ -z "$JAVA_HOME" ]; then
-    JAVA_HOME="/usr"
+	test -d "/usr/lib/jvm/java-8-openjdk-"`dpkg --print-architecture` && {
+        JAVA_HOME="/usr/lib/jvm/java-8-openjdk-"`dpkg --print-architecture`
+    }
+fi
+if [ -z "$JAVA_HOME" ]; then
+	test -d "/usr/lib/jvm/java-7-openjdk-"`dpkg --print-architecture` && {
+        JAVA_HOME="/usr/lib/jvm/java-7-openjdk-"`dpkg --print-architecture`
+    }
 fi
 
 # Timeout in seconds for the shutdown of all webapps

java/sync/obm-locator/obm-locator.debian.sh

@@ -56,7 +56,14 @@ if [ -z "$JAVA_HOME" ]; then
     }
 fi
 if [ -z "$JAVA_HOME" ]; then
-    JAVA_HOME="/usr"
+	test -d "/usr/lib/jvm/java-8-openjdk-"`dpkg --print-architecture` && {
+        JAVA_HOME="/usr/lib/jvm/java-8-openjdk-"`dpkg --print-architecture`
+    }
+fi
+if [ -z "$JAVA_HOME" ]; then
+	test -d "/usr/lib/jvm/java-7-openjdk-"`dpkg --print-architecture` && {
+        JAVA_HOME="/usr/lib/jvm/java-7-openjdk-"`dpkg --print-architecture`
+    }
 fi
 
 # Timeout in seconds for the shutdown of all webapps

java/tomcat/debian/obm-tomcat.init

@@ -34,9 +34,15 @@ fi
 if [ -r /etc/default/rcS ]; then
         . /etc/default/rcS
 fi
-
 if [ -z "$JAVA_HOME" ]; then
-	JAVA_HOME="/usr"
+	test -d "/usr/lib/jvm/java-8-openjdk-"`dpkg --print-architecture` && {
+        JAVA_HOME="/usr/lib/jvm/java-8-openjdk-"`dpkg --print-architecture`
+    }
+fi
+if [ -z "$JAVA_HOME" ]; then
+	test -d "/usr/lib/jvm/java-7-openjdk-"`dpkg --print-architecture` && {
+        JAVA_HOME="/usr/lib/jvm/java-7-openjdk-"`dpkg --print-architecture`
+    }
 fi
 if [ -z "$SHUTDOWN_TIMEOUT" ]; then
 	SHUTDOWN_TIMEOUT=10