Add JDK 1.6.0_25 as the default package
This adds a new java::jdk_package class and makes the wrapper class default to this Java runtime.
This commit is contained in:
@@ -12,14 +12,27 @@
|
||||
#
|
||||
# [Remember: No empty lines between comments and class definition]
|
||||
class java(
|
||||
$jre = false,
|
||||
$jdk = true,
|
||||
$version='1.6.0_25-fcs'
|
||||
) {
|
||||
|
||||
$jre_real = $jre
|
||||
$jdk_real = $jdk
|
||||
$version_real = $version
|
||||
|
||||
class { 'java::jre_package':
|
||||
version => $version_real,
|
||||
stage => 'runtime',
|
||||
if $jre_real {
|
||||
class { 'java::jre_package':
|
||||
version => $version_real,
|
||||
stage => 'runtime',
|
||||
}
|
||||
}
|
||||
|
||||
if $jdk_real {
|
||||
class { 'java::jdk_package':
|
||||
version => $version_real,
|
||||
stage => 'runtime',
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
28
manifests/jdk_package.pp
Normal file
28
manifests/jdk_package.pp
Normal file
@@ -0,0 +1,28 @@
|
||||
# Class: java:jdk_package
|
||||
#
|
||||
# This class installs the Java JDK package
|
||||
# produced from ./jdk-6u25-linux-x64-rpm.bin -x
|
||||
#
|
||||
# This is the "Official" RPM distributed by Oracle
|
||||
#
|
||||
# Parameters:
|
||||
#
|
||||
# Actions:
|
||||
#
|
||||
# Requires:
|
||||
#
|
||||
# Sample Usage:
|
||||
#
|
||||
class java::jdk_package (
|
||||
$version
|
||||
) {
|
||||
|
||||
# JJM FIXME Validation!
|
||||
$version_real = $version
|
||||
|
||||
package { 'jdk':
|
||||
ensure => $version_real,
|
||||
alias => 'java',
|
||||
}
|
||||
|
||||
}
|
||||
@@ -11,11 +11,15 @@
|
||||
# Sample Usage:
|
||||
#
|
||||
class java::jre_package (
|
||||
$version='1.6.0_25-fcs'
|
||||
$version
|
||||
) {
|
||||
# statements
|
||||
|
||||
# JJM FIXME Validation!
|
||||
$version_real = $version
|
||||
|
||||
package { 'jre':
|
||||
ensure => $version_real,
|
||||
alias => 'java',
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user