v1.1.0

* Add support for Java SE 6 series

Author: antoineco

CHANGELOG.md

@@ -1,4 +1,4 @@
-###1.0.2
+###1.1.0
 
 Support release
 

Modulefile

@@ -1,5 +1,5 @@
 name    'aco-oracle_java'
-version '1.0.2'
+version '1.1.0'
 source 'git://github.com/tOnI0/aco-oracle_java.git'
 author 'Antoine Cotten'
 license 'Apache License, Version 2.0'

README.md

@@ -77,7 +77,7 @@ What envionment type to install. Valid values are 'jre' and 'jdk'. Defaults to '
 
 ##Limitations
 
-* 2 different versions of Oracle Java can not cohabit on the same system when installed from RPM. Each new version will override the previous one.
+* 2 different releases of the same Java series can not cohabit on the same system when installed from RPM. Each new version will override the previous one.
 * Works only on [RPM-based distributions](http://en.wikipedia.org/wiki/List_of_Linux_distributions#RPM-based)
 
 ##Credits

manifests/init.pp

@@ -138,9 +138,17 @@
   $version_final = delete($version_real, 'u0')
 
   # define installer filename and download URL
-  $filename = "${type}-${version_final}-linux-${arch}.rpm"
+  $filename = $maj_version ? {
+    '6'     => "${type}-${version_final}-linux-${arch}-rpm.bin",
+    default => "${type}-${version_final}-linux-${arch}.rpm"
+  }
   $downloadurl = "http://download.oracle.com/otn-pub/java/jdk/${version_final}${build}/${filename}"
 
+  # required packages
+  if !defined(Package['wget']) {
+    package { 'wget': ensure => present }
+  }
+
   # make sure install/download directory exists
   file { '/usr/java':
     ensure => directory,
@@ -154,12 +162,52 @@
     cwd     => '/usr/java',
     creates => "/usr/java/${filename}",
     command => "wget --no-cookies --no-check-certificate --header \"Cookie: gpw_e24=http%3A%2F%2Fwww.oracle.com%2F; oraclelicense=accept-securebackup-cookie\" \"${downloadurl}\"",
-    timeout => 0
-  } ->
+    timeout => 0,
+    require => Package['wget']
+  }
+
   # install package
-  package { $type:
-    ensure   => latest,
-    source   => "/usr/java/${filename}",
-    provider => rpm
+  if $maj_version >= 7 {
+    package { $type:
+      ensure   => latest,
+      source   => "/usr/java/${filename}",
+      provider => rpm,
+      require  => Exec['downloadRPM']
+    }
+  }
+  # the procedure is a bit more complicated for older versions...
+  # RPM files are packaged into a BIN archive which needs to be extracted
+   else {
+    # sed is required
+    if !defined(Package['sed']) {
+      package { 'sed': ensure => present }
+    }
+
+    # translate system architecture one more time
+    $arch_final = $::architecture ? {
+      'x86_64' => 'amd64',
+      default  => $arch
+    }
+    # the extracted file includes the 'new' arch string
+    $filename_extract = "${type}-${version_final}-linux-${arch_final}.rpm"
+
+    exec { 'unpackRPM':
+      path    => '/bin',
+      cwd     => '/usr/java',
+      creates => "/usr/java/${filename_extract}",
+      command => "sed -ni '/exit 0/,\${//!p}' ${filename}; chmod +x ${filename}; ./${filename}",
+      require => [Package['sed'], Exec['downloadRPM']]
+    } ->
+    package { $type:
+      ensure   => latest,
+      source   => "/usr/java/${filename_extract}",
+      provider => rpm
+    } ~>
+    exec { 'cleanupRPM':
+      path        => '/bin',
+      cwd         => '/usr/java',
+      refreshonly => true,
+      command     => 'rm -f sun-javadb-*.rpm'
+    }
   }
-}
+}