Merge branch 'master' of https://github.com/rombert/puppetlabs-java into rombert-master

Conflicts:
	manifests/params.pp

CHANGELOG

@@ -1,5 +1,8 @@
 0.4.0
 
+Robert Munteanu <rmuntean@adobe.com>
+* Add support for OpenSUSE
+
 Martin Jackson <martin@uncommonsense-uk.com>
 * Added support Amazon Linux using facter >= 1.7.x
 

manifests/params.pp

@@ -105,9 +105,20 @@ class java::params {
       }
     }
     'Suse': {
+      case $::operatingsystem {
+        default: {
+          $jdk_package = 'java-1_6_0-ibm-devel'
+          $jre_package = 'java-1_6_0-ibm'
+        }
+
+        'OpenSuSE': {
+          $jdk_package = 'java-1_7_0-openjdk-devel'
+          $jre_package = 'java-1_7_0-openjdk'
+        }
+      }
       $java = {
-        'jdk' => { 'package' => 'java-1_6_0-ibm-devel', },
-        'jre' => { 'package' => 'java-1_6_0-ibm', },
+        'jdk' => { 'package' => $jdk_package, },
+        'jre' => { 'package' => $jre_package, },
       }
     }
   }

spec/classes/java_spec.rb

@@ -74,4 +74,9 @@ describe 'java', :type => :class do
     it { should contain_package('java').with_name('java-1.7.0-openjdk') }
   end
 
+  context 'select default for OpenSUSE 12.3' do
+    let(:facts) { {:osfamily => 'Suse', :operatingsystem => 'OpenSUSE', :operatingsystemrelease => '12.3'}}
+    it { should contain_package('java').with_name('java-1_7_0-openjdk-devel')}
+  end
+
 end