RickRongen/puppetlabs-java
1
0
Fork 0
Code Releases Activity

Merge pull request #47 from liwo/feature/java-home

Browse Source 
Add $java_home variable
This commit is contained in:
Ashley Penney
2013-11-18 10:00:59 -08:00
parent 6f91a2f8ab dea01a7445
commit 9cf9bcb9da
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
manifests/init.pp
View File

@@ -52,6 +52,7 @@ class java(
$default_package_name = $java::params::java[$distribution]['package'] $default_package_name = $java::params::java[$distribution]['package']
$default_alternative = $java::params::java[$distribution]['alternative'] $default_alternative = $java::params::java[$distribution]['alternative']
$default_alternative_path = $java::params::java[$distribution]['alternative_path'] $default_alternative_path = $java::params::java[$distribution]['alternative_path']
$java_home = $java::params::java[$distribution]['java_home']
} else { } else {
fail("Java distribution ${distribution} is not supported.") fail("Java distribution ${distribution} is not supported.")
} }

8
manifests/params.pp
View File

@@ -54,21 +54,25 @@ class java::params {
'package' => 'openjdk-6-jdk', 'package' => 'openjdk-6-jdk',
'alternative' => 'java-6-openjdk', 'alternative' => 'java-6-openjdk',
'alternative_path' => '/usr/lib/jvm/java-6-openjdk/jre/bin/java', 'alternative_path' => '/usr/lib/jvm/java-6-openjdk/jre/bin/java',
'java_home' => '/usr/lib/jvm/java-6-openjdk/jre/',
}, },
'jre' => { 'jre' => {
'package' => 'openjdk-6-jre-headless', 'package' => 'openjdk-6-jre-headless',
'alternative' => 'java-6-openjdk', 'alternative' => 'java-6-openjdk',
'alternative_path' => '/usr/lib/jvm/java-6-openjdk/jre/bin/java', 'alternative_path' => '/usr/lib/jvm/java-6-openjdk/jre/bin/java',
'java_home' => '/usr/lib/jvm/java-6-openjdk/jre/',
}, },
'sun-jre' => { 'sun-jre' => {
'package' => 'sun-java6-jre', 'package' => 'sun-java6-jre',
'alternative' => 'java-6-sun', 'alternative' => 'java-6-sun',
'alternative_path' => '/usr/lib/jvm/java-6-sun/jre/bin/java', 'alternative_path' => '/usr/lib/jvm/java-6-sun/jre/bin/java',
'java_home' => '/usr/lib/jvm/java-6-sun/jre/',
}, },
'sun-jdk' => { 'sun-jdk' => {
'package' => 'sun-java6-jdk', 'package' => 'sun-java6-jdk',
'alternative' => 'java-6-sun', 'alternative' => 'java-6-sun',
'alternative_path' => '/usr/lib/jvm/java-6-sun/jre/bin/java', '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', 'package' => 'openjdk-7-jdk',
'alternative' => "java-1.7.0-openjdk-${::architecture}", 'alternative' => "java-1.7.0-openjdk-${::architecture}",
'alternative_path' => "/usr/lib/jvm/java-1.7.0-openjdk-${::architecture}/bin/java", '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' => { 'jre' => {
'package' => 'openjdk-7-jre-headless', 'package' => 'openjdk-7-jre-headless',
'alternative' => "java-1.7.0-openjdk-${::architecture}", 'alternative' => "java-1.7.0-openjdk-${::architecture}",
'alternative_path' => "/usr/lib/jvm/java-1.7.0-openjdk-${::architecture}/bin/java", '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' => { 'oracle-jre' => {
'package' => 'oracle-j2re1.7', 'package' => 'oracle-j2re1.7',
'alternative' => 'j2re1.7-oracle', 'alternative' => 'j2re1.7-oracle',
'alternative_path' => '/usr/lib/jvm/j2re1.7-oracle/bin/java', 'alternative_path' => '/usr/lib/jvm/j2re1.7-oracle/bin/java',
'java_home' => '/usr/lib/jvm/j2re1.7-oracle/',
}, },
'oracle-jdk' => { 'oracle-jdk' => {
'package' => 'oracle-j2sdk1.7', 'package' => 'oracle-j2sdk1.7',
'alternative' => 'j2sdk1.7-oracle', 'alternative' => 'j2sdk1.7-oracle',
'alternative_path' => '/usr/lib/jvm/j2sdk1.7-oracle/jre/bin/java', 'alternative_path' => '/usr/lib/jvm/j2sdk1.7-oracle/jre/bin/java',
'java_home' => '/usr/lib/jvm/j2sdk1.7-oracle/jre/',
}, },
} }
} }