From 3d264a2e2b02011626254165c9c59adf66bd760b Mon Sep 17 00:00:00 2001
From: Frank Kloeker <f.kloeker@telekom.de>
Date: Sun, 9 Oct 2016 21:47:40 +0200
Subject: [PATCH] Change package install from openjdk-7-jre-headless to
 default-jre-headless.

This will install as depedency the right
Java package:
openjdk-6-jre-headless on Ubuntu 12.04
openjdk-7-jre-headless on Ubuntu 14.04
openjdk-8-jre-headless on Ubuntu 16.04

Java home is already set to /usr/lib/jvm/default-java

Change-Id: I834a3f3eb2f7d509be05aae9011748687f786745
---
 manifests/client.pp  | 2 +-
 manifests/wildfly.pp | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/manifests/client.pp b/manifests/client.pp
index 4b09519..3d16023 100644
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -104,7 +104,7 @@ class zanata::client(
     require => File["/opt/zanata/zanata-cli-${version}/bin/zanata-cli"],
   }
 
-  package { 'openjdk-7-jre-headless':
+  package { 'default-jre-headless':
     ensure => present,
   }
 
diff --git a/manifests/wildfly.pp b/manifests/wildfly.pp
index a7550a8..89896a9 100644
--- a/manifests/wildfly.pp
+++ b/manifests/wildfly.pp
@@ -19,7 +19,9 @@ class zanata::wildfly(
   $wildfly_install_source = 'https://repo1.maven.org/maven2/org/wildfly/wildfly-dist/9.0.1.Final/wildfly-dist-9.0.1.Final.tar.gz',
 ) {
 
-  package { 'openjdk-7-jre-headless':
+  $javahome = '/usr/lib/jvm/default-java/jre/'
+
+  package { 'default-jre-headless':
     ensure => present,
   }
 
@@ -27,8 +29,8 @@ class zanata::wildfly(
     version        => $wildfly_version,
     install_source => $wildfly_install_source,
     config         => 'standalone.xml',
-    java_home      => '/usr/lib/jvm/java-7-openjdk-amd64/jre/',
+    java_home      => $javahome,
     java_xmx       => '4096m',
-    require        => Package['openjdk-7-jre-headless'],
+    require        => Package['default-jre-headless'],
   }
 }