sscotts2004
diff --git a/‎manifests/init.pp‎
Lines changed: 1 addition & 2 deletions b/‎manifests/init.pp‎
Lines changed: 1 addition & 2 deletions
diff --git a/‎manifests/install.pp‎
Lines changed: 0 additions & 23 deletions b/‎manifests/install.pp‎
Lines changed: 0 additions & 23 deletions
diff --git a/‎manifests/config.pp‎ ‎manifests/install_config.pp‎manifests/config.pp renamed to manifests/install_config.pp
Lines changed: 11 additions & 2 deletions b/‎manifests/config.pp‎ ‎manifests/install_config.pp‎manifests/config.pp renamed to manifests/install_config.pp
Lines changed: 11 additions & 2 deletions
diff --git a/‎metadata.json‎
Lines changed: 7 additions & 1 deletion b/‎metadata.json‎
Lines changed: 7 additions & 1 deletion
diff --git a/‎spec/fixtures/modules/java/manifests‎
Lines changed: 0 additions & 1 deletion b/‎spec/fixtures/modules/java/manifests‎
Lines changed: 0 additions & 1 deletion
diff --git a/‎spec/spec.opts‎
Lines changed: 0 additions & 6 deletions b/‎spec/spec.opts‎
Lines changed: 0 additions & 6 deletions
diff --git a/‎spec/spec_helper.rb‎
Lines changed: 0 additions & 8 deletions b/‎spec/spec_helper.rb‎
Lines changed: 0 additions & 8 deletions
diff --git a/‎tests/init.pp‎
Lines changed: 0 additions & 1 deletion b/‎tests/init.pp‎
Lines changed: 0 additions & 1 deletion
@@ -30,8 +30,7 @@
 define java (
   $java_version         = $title,
   $java_default_version = hiera('java::java_default_version', undef)) {
-  java::install { $java_version:
-  } -> java::config { $java_version:
+  java::install_config { $java_version:
     java_default_version => $java_default_version,
   }
 }
@@ -1,4 +1,4 @@
-# = Define: java::config
+# = Define: java::install_config
 #
 # Configures Java.
 # It is intended to be called by java::java.
@@ -11,15 +11,17 @@
 # == Requires:
 # none
 #
-define java::config ($java_default_version, $java_version = $title,) {
+define java::install_config ($java_default_version, $java_version = $title,) {
   if $java_default_version != undef and $java_version == $java_default_version {
     case $::operatingsystem {
       'Ubuntu' : {
         case $::operatingsystemrelease {
           '10.04' : {
+            $javapkg = "openjdk-${java_version}-jdk"
             $javadir = "/usr/lib/jvm/java-${java_version}-openjdk/jre/bin/java"
           }
           '12.04' : {
+            $javapkg = "openjdk-${java_version}-jdk"
             $javadir = "/usr/lib/jvm/java-${java_version}-openjdk-${::architecture}/jre/bin/java"
           }
           default : {
@@ -28,12 +30,19 @@
           }
         }
       }
+      'CentOS', 'RedHat' : {
+            $javapkg = "java-1.${java_version}.0-openjdk"
+            $javadir = "/usr/lib/jvm/jre-1.${java_version}.0-openjdk.${::architecture}/bin/java"
+      }
       default  : {
         fail("The ${module_name} module is not supported on an ${::operatingsystem} distribution."
         )
       }
     }
 
+    package { $javapkg:
+      ensure => installed,
+    } ->
     exec { 'set_java':
       command => "/usr/sbin/update-alternatives --set java ${javadir}",
       unless  => "ls -l /etc/alternatives/java | grep ${javadir}",
 
@@ -12,8 +12,14 @@
       {
           "operatingsystem": "Ubuntu",
           "operatingsystemrelease": ["10.04", "12.04"]
+      },
+      {
+          "operatingsystem": "RedHat"
+      },
+      {
+          "operatingsystem": "CentOS"
       }
   ],
   "tags": ["java", "jee", "jvm", "middleware"],
-  "version": "1.0.3"
+  "version": "1.1.0"
 }
Original file line number	Diff line number	Diff line change
`@@ -30,8 +30,7 @@`
`30`	`30`	`define java (`
`31`	`31`	`$java_version = $title,`
`32`	`32`	`$java_default_version = hiera('java::java_default_version', undef)) {`
`33`		`- java::install { $java_version:`
`34`		`- } -> java::config { $java_version:`
	`33`	`+ java::install_config { $java_version:`
`35`	`34`	`java_default_version => $java_default_version,`
`36`	`35`	`}`
`37`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# = Define: java::config`
	`1`	`+# = Define: java::install_config`
`2`	`2`	`#`
`3`	`3`	`# Configures Java.`
`4`	`4`	`# It is intended to be called by java::java.`
`@@ -11,15 +11,17 @@`
`11`	`11`	`# == Requires:`
`12`	`12`	`# none`
`13`	`13`	`#`
`14`		`-define java::config ($java_default_version, $java_version = $title,) {`
	`14`	`+define java::install_config ($java_default_version, $java_version = $title,) {`
`15`	`15`	`if $java_default_version != undef and $java_version == $java_default_version {`
`16`	`16`	`case $::operatingsystem {`
`17`	`17`	`'Ubuntu' : {`
`18`	`18`	`case $::operatingsystemrelease {`
`19`	`19`	`'10.04' : {`
	`20`	`+ $javapkg = "openjdk-${java_version}-jdk"`
`20`	`21`	`$javadir = "/usr/lib/jvm/java-${java_version}-openjdk/jre/bin/java"`
`21`	`22`	`}`
`22`	`23`	`'12.04' : {`
	`24`	`+ $javapkg = "openjdk-${java_version}-jdk"`
`23`	`25`	`$javadir = "/usr/lib/jvm/java-${java_version}-openjdk-${::architecture}/jre/bin/java"`
`24`	`26`	`}`
`25`	`27`	`default : {`
`@@ -28,12 +30,19 @@`
`28`	`30`	`}`
`29`	`31`	`}`
`30`	`32`	`}`
	`33`	`+ 'CentOS', 'RedHat' : {`
	`34`	`+ $javapkg = "java-1.${java_version}.0-openjdk"`
	`35`	`+ $javadir = "/usr/lib/jvm/jre-1.${java_version}.0-openjdk.${::architecture}/bin/java"`
	`36`	`+ }`
`31`	`37`	`default : {`
`32`	`38`	`fail("The ${module_name} module is not supported on an ${::operatingsystem} distribution."`
`33`	`39`	`)`
`34`	`40`	`}`
`35`	`41`	`}`
`36`	`42`
	`43`	`+ package { $javapkg:`
	`44`	`+ ensure => installed,`
	`45`	`+ } ->`
`37`	`46`	`exec { 'set_java':`
`38`	`47`	`command => "/usr/sbin/update-alternatives --set java ${javadir}",`
`39`	`48`	`unless => "ls -l /etc/alternatives/java \| grep ${javadir}",`
Original file line number	Diff line number	Diff line change
`@@ -12,8 +12,14 @@`
`12`	`12`	`{`
`13`	`13`	`"operatingsystem": "Ubuntu",`
`14`	`14`	`"operatingsystemrelease": ["10.04", "12.04"]`
	`15`	`+ },`
	`16`	`+ {`
	`17`	`+ "operatingsystem": "RedHat"`
	`18`	`+ },`
	`19`	`+ {`
	`20`	`+ "operatingsystem": "CentOS"`
`15`	`21`	`}`
`16`	`22`	`],`
`17`	`23`	`"tags": ["java", "jee", "jvm", "middleware"],`
`18`		`- "version": "1.0.3"`
	`24`	`+ "version": "1.1.0"`
`19`	`25`	`}`