diff --git a/manifests/init.pp b/manifests/init.pp index 8ea22c4..b009bf8 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -25,17 +25,9 @@ class java( $version_real = $version $distribution_real = $distribution - case $distribution_real { - jre: { - class { 'java::jre_package': - version => $version_real, - } - } - jdk: { - class { 'java::jdk_package': - version => $version_real, - } - } + package { 'java': + ensure => $version_real, + name => "${distribution_real}", } } diff --git a/manifests/jdk_package.pp b/manifests/jdk_package.pp deleted file mode 100644 index 2ff72a2..0000000 --- a/manifests/jdk_package.pp +++ /dev/null @@ -1,29 +0,0 @@ -# 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 -) { - - validate_re($version, '^[._0-9a-zA-Z:-]+$') - - $version_real = $version - - package { 'jdk': - ensure => $version_real, - alias => 'java', - } - -} diff --git a/manifests/jre_package.pp b/manifests/jre_package.pp deleted file mode 100644 index 0405a8c..0000000 --- a/manifests/jre_package.pp +++ /dev/null @@ -1,26 +0,0 @@ -# Class: java:jre_package -# -# class description goes here. -# -# Parameters: -# -# Actions: -# -# Requires: -# -# Sample Usage: -# -class java::jre_package ( - $version -) { - - validate_re($version, '^[._0-9a-zA-Z:-]+$') - - $version_real = $version - - package { 'jre': - ensure => $version_real, - alias => 'java', - } - -}