Merge pull request #13 from ody/move_to_openjdk

Moves debain packages to openjdk.

manifests/init.pp

@@ -13,7 +13,7 @@
 # [Remember: No empty lines between comments and class definition]
 class java(
   $distribution = 'jdk',
-  $version      = 'installed'
+  $version      = 'present'
 ) {
 
   validate_re($distribution, '^jdk$|^jre$|^java.*$')
@@ -37,10 +37,24 @@ class java(
 
     debian, ubuntu: {
 
-      $distribution_debian = $distribution ? {
+      case $lsbdistcodename {
-        jdk => 'sun-java6-jdk',
+        squeeze, lucid: {
-        jre => 'sun-java6-jre',
+          $distribution_debian = $distribution ? {
+            jdk => 'openjdk-6-jdk',
+            jre => 'openjdk-6-jre-headless',
+          }
+        }
+        wheezy, precise: {
+          $distribution_debian = $distribution ? {
+            jdk => 'openjdk-7-jdk',
+            jre => 'openjdk-7-jre-headless',
+          }
+        }
+        default: {
+          fail("operatingsystem distribution ${lsbdistcodename} is not supported")
+        }
       }
+
       class { 'java::package_debian':
         version      => $version,
         distribution => $distribution_debian,
@@ -51,7 +65,7 @@ class java(
     }
 
     default: {
-      fail("operatingsystem $operatingsystem is not supported")
+      fail("operatingsystem ${operatingsystem} is not supported")
     }
 
   }

manifests/package_debian.pp

@@ -20,14 +20,8 @@ class java::package_debian(
   $distribution
 ) {
 
-  file { "/var/local/sun-java6.preseed":
-    content => template("${module_name}/sun-java6.preseed"),
-  }
   package { 'java':
     ensure => $version,
     name   => $distribution,
-    responsefile => "/var/local/sun-java6.preseed",
-    require => File["/var/local/sun-java6.preseed"],
   }
-
 }