diff --git a/manifests/init.pp b/manifests/init.pp index 6579f49..7cebbfc 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -52,6 +52,7 @@ class java( $default_package_name = $java::params::java[$distribution]['package'] $default_alternative = $java::params::java[$distribution]['alternative'] $default_alternative_path = $java::params::java[$distribution]['alternative_path'] + $java_home = $java::params::java[$distribution]['java_home'] } else { fail("Java distribution ${distribution} is not supported.") } diff --git a/manifests/params.pp b/manifests/params.pp index 23e421e..3dfc9f1 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -54,21 +54,25 @@ class java::params { 'package' => 'openjdk-6-jdk', 'alternative' => 'java-6-openjdk', 'alternative_path' => '/usr/lib/jvm/java-6-openjdk/jre/bin/java', + 'java_home' => '/usr/lib/jvm/java-6-openjdk/jre/', }, 'jre' => { 'package' => 'openjdk-6-jre-headless', 'alternative' => 'java-6-openjdk', 'alternative_path' => '/usr/lib/jvm/java-6-openjdk/jre/bin/java', + 'java_home' => '/usr/lib/jvm/java-6-openjdk/jre/', }, 'sun-jre' => { 'package' => 'sun-java6-jre', 'alternative' => 'java-6-sun', 'alternative_path' => '/usr/lib/jvm/java-6-sun/jre/bin/java', + 'java_home' => '/usr/lib/jvm/java-6-sun/jre/', }, 'sun-jdk' => { 'package' => 'sun-java6-jdk', 'alternative' => 'java-6-sun', 'alternative_path' => '/usr/lib/jvm/java-6-sun/jre/bin/java', + 'java_home' => '/usr/lib/jvm/java-6-sun/jre/', }, } } @@ -78,21 +82,25 @@ class java::params { 'package' => 'openjdk-7-jdk', 'alternative' => "java-1.7.0-openjdk-${::architecture}", 'alternative_path' => "/usr/lib/jvm/java-1.7.0-openjdk-${::architecture}/bin/java", + 'java_home' => "/usr/lib/jvm/java-1.7.0-openjdk-${::architecture}/", }, 'jre' => { 'package' => 'openjdk-7-jre-headless', 'alternative' => "java-1.7.0-openjdk-${::architecture}", 'alternative_path' => "/usr/lib/jvm/java-1.7.0-openjdk-${::architecture}/bin/java", + 'java_home' => "/usr/lib/jvm/java-1.7.0-openjdk-${::architecture}/", }, 'oracle-jre' => { 'package' => 'oracle-j2re1.7', 'alternative' => 'j2re1.7-oracle', 'alternative_path' => '/usr/lib/jvm/j2re1.7-oracle/bin/java', + 'java_home' => '/usr/lib/jvm/j2re1.7-oracle/', }, 'oracle-jdk' => { 'package' => 'oracle-j2sdk1.7', 'alternative' => 'j2sdk1.7-oracle', 'alternative_path' => '/usr/lib/jvm/j2sdk1.7-oracle/jre/bin/java', + 'java_home' => '/usr/lib/jvm/j2sdk1.7-oracle/jre/', }, } }