Merge pull request #78 from hunner/remove_oel_5

OEL 5 is trying to use up2date which doesn't work

.fixtures.yml

@@ -0,0 +1,5 @@
+fixtures:
+  repositories:
+    stdlib: http://github.com/puppetlabs/puppetlabs-stdlib.git
+  symlinks:
+    java: "#{source_dir}"

.gitignore

@@ -1,2 +1,6 @@
 pkg/
 .DS_Store
+spec/fixtures
+*.idea
+*.swp
+*.tmp

.travis.yml

@@ -0,0 +1,40 @@
+---
+branches:
+  only:
+  - master
+language: ruby
+bundler_args: --without development
+script: "bundle exec rake spec SPEC_OPTS='--format documentation'"
+after_success:
+  - git clone -q git://github.com/puppetlabs/ghpublisher.git .forge-releng
+  - .forge-release/publish
+rvm:
+- 1.8.7
+- 1.9.3
+- 2.0.0
+env:
+  matrix:
+    - PUPPET_GEM_VERSION="~> 2.7.0"
+    - PUPPET_GEM_VERSION="~> 3.0.0"
+    - PUPPET_GEM_VERSION="~> 3.1.0"
+    - PUPPET_GEM_VERSION="~> 3.2.0"
+  global:
+    - PUBLISHER_LOGIN=puppetlabs
+    - secure: |-
+        InMPZJVSGFC/AfcTbM6eKpYjPU3L1m1/P8BiXwcwreeyz0elsX2qmXk80A1h
+        \nakUY6VxLtzcFGBHV1V8NvpRHovUBSzRGuhSFUm72XL62OB6TMl+Wg30coJ
+        /N\nXjEfy7N5TQ3ThTKf1gfph0x/3iJBPgqIuIIELJCQJusTRDPKWYQ=
+matrix:
+  exclude:
+    - rvm: 1.9.3
+      env: PUPPET_GEM_VERSION="~> 2.7.0"
+    - rvm: 2.0.0
+      env: PUPPET_GEM_VERSION="~> 2.7.0"
+    - rvm: 2.0.0
+      env: PUPPET_GEM_VERSION="~> 3.0.0"
+    - rvm: 2.0.0
+      env: PUPPET_GEM_VERSION="~> 3.1.0"
+    - rvm: 1.8.7
+      env: PUPPET_GEM_VERSION="~> 3.2.0"
+notifications:
+  email: false

CHANGELOG

@@ -1,3 +1,82 @@
+2014-08-25 - Supported Version 1.1.2
+
+Summary: This release begins the support coverage of the puppetlabs-java
+module.
+
+Bugfixes:
+- Update java alternative values from deprecated names
+- Readme updated
+- Testing updated
+
+2014-05-02 - Version 1.1.1
+
+Summary:
+
+Add support for new versions of Debian and Ubuntu!
+
+Features:
+- Add support for Ubuntu Trusty (14.04)
+- Add support for Debian Jessie (8.x)
+
+2014-01-06 - Version 1.1.0
+
+Summary:
+
+Primarily a release for Ubuntu users!
+
+Features:
+- Add support for Ubuntu Saucy (13.10)
+- Add `java_home` parameter for centralized setting of JAVA_HOME.
+
+Bugfixes:
+- Plus signs are valid in debian/ubuntu package names.
+
+
+
+1.0.2 ()
+
+Brett Porter <brett@apache.org>
+* Support Scientific Linux
+
+1.0.1 (2013-08-01)
+
+Matthaus Owens <matthaus@puppetlabs.com>
+* Update java packages for Fedora systems
+
+1.0.0 (2013-07-29)
+
+Krzysztof Suszyński <krzysztof.suszynski@coi.gov.pl>
+* Adding support for Oracle Enterprise Linux
+
+Peter Drake <pdrake@allplayers.com>
+* Add support for natty
+
+Robert Munteanu <rmuntean@adobe.com>
+* Add support for OpenSUSE
+
+Martin Jackson <martin@uncommonsense-uk.com>
+* Added support Amazon Linux using facter >= 1.7.x
+
+Gareth Rushgrove <gareth@morethanseven.net>
+Brett Porter <brett@apache.org>
+* Fixes for older versions of CentOS
+* Improvements to module build and tests
+
+Nathan R Valentine <nrvale0@gmail.com>
+* Add support for Ubuntu quantal and raring
+
+Sharif Nassar <sharif@mediatemple.net>
+* Add support for Debian alternatives, and more than one JDK/JRE per platform.
+
+2013-04-04 Reid Vandewiele <reid@puppetlabs.com> - 0.3.0
+* Refactor, introduce params pattern
+
+2012-11-15 Scott Schneider <sschneider@puppetlabs.com> - 0.2.0
+* Add Solaris support
+
+2011-06-16 Jeff McCune <jeff@puppetlabs.com> - 0.1.5
+* Add Debian based distro (Lucid) support
+
 2011-06-02 Jeff McCune <jeff@puppetlabs.com> - 0.1.4
 * Fix class composition ordering problems
 

Gemfile

@@ -0,0 +1,27 @@
+source ENV['GEM_SOURCE'] || "https://rubygems.org"
+
+group :development, :test do
+  gem 'rake',                    :require => false
+  gem 'rspec-puppet',            :require => false
+  gem 'puppetlabs_spec_helper',  :require => false
+  gem 'serverspec',              :require => false
+  gem 'puppet-lint',             :require => false
+  gem 'beaker',                  :require => false
+  gem 'beaker-rspec',            :require => false
+  gem 'pry',                     :require => false
+  gem 'simplecov',               :require => false
+end
+
+if facterversion = ENV['FACTER_GEM_VERSION']
+  gem 'facter', facterversion, :require => false
+else
+  gem 'facter', :require => false
+end
+
+if puppetversion = ENV['PUPPET_GEM_VERSION']
+  gem 'puppet', puppetversion, :require => false
+else
+  gem 'puppet', :require => false
+end
+
+# vim:ft=ruby

LICENSE

@@ -0,0 +1,17 @@
+Puppet Java Module - Puppet module for managing Java
+
+Copyright (C) 2011 Puppet Labs Inc
+
+Puppet Labs can be contacted at: info@puppetlabs.com
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.

Modulefile

@@ -1,11 +0,0 @@
-name    'puppetlabs-java'
-version '0.1.4'
-source 'git://github.com/puppetlabs/puppetlabs-java'
-author 'puppetlabs'
-license 'Apache'
-summary 'Manage the official Java runtime'
-description 'Manage the official Java runtime'
-project_page 'https://github.com/puppetlabs/puppetlabs-java'
-
-## Add dependencies, if any:
-dependency 'puppetlabs/stdlib', '>= 0.1.3'

README.markdown

@@ -1,16 +1,96 @@
-# Java #
+#java
 
-Manage the Java runtime for use with other application software.
+####Table of Contents
 
-Currently this simply deploys the package on Enterprise Linux based systems.
+1. [Overview](#overview)
+2. [Module Description - What the module does and why it is useful](#module-description)
+3. [Setup - The basics of getting started with the java module](#setup)
+    * [Beginning with the java module](#beginning-with-the-java-module)
+4. [Usage - Configuration options and additional functionality](#usage)
+5. [Reference - An under-the-hood peek at what the module is doing and how](#reference)
+5. [Limitations - OS compatibility, etc.](#limitations)
+6. [Development - Guide for contributing to the module](#development)
 
-The Java runtime this module is designed to configure are the RPM's provided by Oracle and obtained by extracting them from the "bin" installers.
+##Overview
 
-For example:
+Installs the correct Java package on various platforms. 
 
-    ./jdk-6u25-linux-x64-rpm.bin -x
+##Module Description
 
-Please download the installer from:
+The java module can automatically install Java jdk or jre on a wide variety of systems. Java is a base component for many software platforms, but Java system packages don't always follow packaging conventions. The java module simplifies the Java installation process.
 
- * [Java Downloads](http://www.oracle.com/technetwork/java/javase/downloads/jdk-6u25-download-346242.html)
+##Setup
 
+###Beginning with the java module
+To install the correct Java package on your system, include the `java` class: `include java`.
+
+##Usage
+
+The java module installs the correct jdk or jre package on a wide variety of systems. By default, the module will install the jdk package, but you can set different installation parameters as needed. For example, to install jre instead of jdk, you would set the distribution parameter:
+
+```
+class { 'java':
+  distribution => 'jre',
+}
+```
+
+##Reference
+
+###Classes
+
+####Public classes
+
+* `java`: This is the module's main class, which installs and manages the Java package.
+
+####Private classes
+
+* `java::params`: Builds a hash of jdk/jre packages for all compatible operating systems. 
+
+* `java::config`: Configures the Java alternatives on Debian systems.
+
+###Parameters:
+
+The following parameters are available in the java module:
+
+* `distribution`: The Java distribution to install. Can be 'jdk','jre', or, where the platform supports alternative packages, 'sun-jdk', 'sun-jre', 'oracle-jdk', 'oracle-jre'. Defaults to 'jdk'.
+
+*`version`: The version of Java to install, if you want to ensure a particular version. By default, the module ensures that Java is present but does not require a specific version.
+
+* `package`: The name of the Java package. This is configurable in case you want to install a non-standard Java package. If not set, the module will install the appropriate package for the `distribution` parameter and target platform. If you set `package`, the `distribution` parameter will do nothing. 
+
+* `java_alternative`: The name of the Java alternative to use on Debian systems. The command 'update-java-alternatives -l' will show which choices are available. If you specify a particular package, you will usually want to specify which Java alternative to use. If you set this parameter, you also need to set the `java_alternative_path`.
+
+* `java_alternative_path`: The path to the 'java' command on Debian systems. Since the alternatives system makes it difficult to verify which alternative is actually enabled, this is required to ensure the correct JVM is enabled.
+
+##Limitations
+
+This module cannot guarantee installation of Java versions that are not available on  platform repositories. 
+
+Oracle Java packages are not included in Debian 7 and Ubuntu 12.04/14.04 repositories. To install Java on those systems, you'll need to package Oracle JDK/JRE, and then the module will be able to install the package. For more information on how to package Oracle JDK/JRE, see the [Debian wiki](http://wiki.debian.org/JavaPackage).
+
+This module is officially [supported](https://forge.puppetlabs.com/supported) for the following Java versions and platforms:
+
+OpenJDK is supported on:
+* Red Hat Enterprise Linux (RHEL) 5, 6, 7
+* CentOS 5, 6, 7
+* Oracle Linux 6, 7
+* Scientific Linux 5, 6
+* Debian 6, 7
+* Ubuntu 10.04, 12.04, 14.04
+* Solaris 11
+* SLES 11 SP1 
+
+Sun Java is supported on:
+* Debian 6
+
+##Development
+
+Puppet Labs modules on the Puppet Forge are open projects, and community contributions are essential for keeping them great. We can’t access the huge number of platforms and myriad of hardware, software, and deployment configurations that Puppet is intended to serve.
+
+We want to keep it as easy as possible to contribute changes so that our modules work in your environment. There are a few guidelines that we need contributors to follow so that we can have a chance of keeping on top of things.
+
+You can read the complete module contribution guide on the [Puppet Labs wiki](http://projects.puppetlabs.com/projects/module-site/wiki/Module_contributing).
+
+##Contributors
+
+The list of contributors can be found at: [https://github.com/puppetlabs/puppetlabs-java/graphs/contributors](https://github.com/puppetlabs/puppetlabs-java/graphs/contributors).

Rakefile

@@ -0,0 +1,5 @@
+require 'puppetlabs_spec_helper/rake_tasks'
+require 'puppet-lint/tasks/puppet-lint'
+
+PuppetLint.configuration.send("disable_80chars")
+PuppetLint.configuration.log_format = "%{path}:%{linenumber}:%{check}:%{KIND}:%{message}"

manifests/config.pp

@@ -0,0 +1,17 @@
+# On Debian systems, if alternatives are set, manually assign them.
+class java::config ( ) {
+  case $::osfamily {
+    Debian: {
+      if $java::use_java_alternative != undef and $java::use_java_alternative_path != undef {
+        exec { 'update-java-alternatives':
+          path    => '/usr/bin:/usr/sbin:/bin:/sbin',
+          command => "update-java-alternatives --set ${java::use_java_alternative} --jre",
+          unless  => "test /etc/alternatives/java -ef '${java::use_java_alternative_path}'",
+        }
+      }
+    }
+    default: {
+      # Do nothing.
+    }
+  }
+}

manifests/init.pp

@@ -4,30 +4,92 @@
 #
 # Parameters:
 #
+#  [*distribution*]
+#    The java distribution to install. Can be one of "jdk" or "jre",
+#    or other platform-specific options where there are multiple
+#    implementations available (eg: OpenJDK vs Oracle JDK).
+#
+#
+#  [*version*]
+#    The version of java to install. By default, this module simply ensures
+#    that java is present, and does not require a specific version.
+#
+#  [*package*]
+#    The name of the java package. This is configurable in case a non-standard
+#    java package is desired.
+#
+#  [*java_alternative*]
+#    The name of the java alternative to use on Debian systems.
+#    "update-java-alternatives -l" will show which choices are available.
+#    If you specify a particular package, you will almost always also
+#    want to specify which java_alternative to choose. If you set
+#    this, you also need to set the path below.
+#
+#  [*java_alternative_path*]
+#    The path to the "java" command on Debian systems. Since the
+#    alternatives system makes it difficult to verify which
+#    alternative is actually enabled, this is required to ensure the
+#    correct JVM is enabled.
+#
 # Actions:
 #
 # Requires:
 #
 # Sample Usage:
 #
-# [Remember: No empty lines between comments and class definition]
 class java(
-  $distribution = 'jdk',
+  $distribution          = 'jdk',
-  $version      = 'installed'
+  $version               = 'present',
+  $package               = undef,
+  $java_alternative      = undef,
+  $java_alternative_path = undef
 ) {
+  include java::params
 
-  # Cannot pass anonymous arrays to functions in 2.6.8
+  validate_re($version, 'present|installed|latest|^[.+_0-9a-zA-Z:-]+$')
-  $v_distribution = [ '^jre$', '^jdk$' ]
-  # Must compare string values, not booleans.
-  validate_re($version, '^[._0-9a-zA-Z:-]+$')
-  validate_re($distribution, $v_distribution)
 
-  $version_real      = $version
+  if has_key($java::params::java, $distribution) {
-  $distribution_real = $distribution
+    $default_package_name     = $java::params::java[$distribution]['package']
-
+    $default_alternative      = $java::params::java[$distribution]['alternative']
-  package { 'java':
+    $default_alternative_path = $java::params::java[$distribution]['alternative_path']
-    ensure => $version_real,
+    $java_home                = $java::params::java[$distribution]['java_home']
-    name   => "${distribution_real}",
+  } else {
+    fail("Java distribution ${distribution} is not supported.")
   }
 
+  $use_java_package_name = $package ? {
+    default => $package,
+    undef   => $default_package_name,
+  }
+
+  ## If $java_alternative is set, use that.
+  ## Elsif the DEFAULT package is being used, then use $default_alternative.
+  ## Else undef
+  $use_java_alternative = $java_alternative ? {
+    default => $java_alternative,
+    undef   => $use_java_package_name ? {
+      $default_package_name => $default_alternative,
+      default               => undef,
+    }
+  }
+
+  ## Same logic as $java_alternative above.
+  $use_java_alternative_path = $java_alternative_path ? {
+    default => $java_alternative_path,
+    undef   => $use_java_package_name ? {
+      $default_package_name => $default_alternative_path,
+      default               => undef,
+    }
+  }
+
+  anchor { 'java::begin:': }
+  ->
+  package { 'java':
+    ensure => $version,
+    name   => $use_java_package_name,
+  }
+  ->
+  class { 'java::config': }
+  -> anchor { 'java::end': }
+
 }

manifests/params.pp

@@ -0,0 +1,133 @@
+# Class: java::params
+#
+# This class builds a hash of JDK/JRE packages and (for Debian)
+# alternatives.  For wheezy/precise, we provide Oracle JDK/JRE
+# options, even though those are not in the package repositories.
+#
+# For more info on how to package Oracle JDK/JRE, see the Debian wiki:
+# http://wiki.debian.org/JavaPackage
+#
+# Because the alternatives system makes it very difficult to tell
+# which Java alternative is enabled, we hard code the path to bin/java
+# for the config class to test if it is enabled.
+class java::params {
+
+  case $::osfamily {
+    default: { fail("unsupported platform ${::osfamily}") }
+    'RedHat': {
+      case $::operatingsystem {
+        default: { fail("unsupported os ${::operatingsystem}") }
+        'RedHat', 'CentOS', 'OracleLinux', 'Scientific': {
+          if (versioncmp($::operatingsystemrelease, '5.0') < 0) {
+            $jdk_package = 'java-1.6.0-sun-devel'
+            $jre_package = 'java-1.6.0-sun'
+          }
+          elsif (versioncmp($::operatingsystemrelease, '6.3') < 0) {
+            $jdk_package = 'java-1.6.0-openjdk-devel'
+            $jre_package = 'java-1.6.0-openjdk'
+          }
+          else {
+            $jdk_package = 'java-1.7.0-openjdk-devel'
+            $jre_package = 'java-1.7.0-openjdk'
+          }
+        }
+        'Fedora': {
+          $jdk_package = 'java-1.7.0-openjdk-devel'
+          $jre_package = 'java-1.7.0-openjdk'
+        }
+        'Amazon': {
+          $jdk_package = 'java-1.7.0-openjdk-devel'
+          $jre_package = 'java-1.7.0-openjdk'
+        }
+      }
+      $java = {
+        'jdk' => { 'package' => $jdk_package, },
+        'jre' => { 'package' => $jre_package, },
+      }
+    }
+    'Debian': {
+      case $::lsbdistcodename {
+        default: { fail("unsupported release ${::lsbdistcodename}") }
+        'lenny', 'squeeze', 'lucid', 'natty': {
+          $java  = {
+            'jdk' => {
+              'package'          => 'openjdk-6-jdk',
+              'alternative'      => "java-6-openjdk-${architecture}",
+              'alternative_path' => '/usr/lib/jvm/java-6-openjdk/jre/bin/java',
+              'java_home'        => '/usr/lib/jvm/java-6-openjdk/jre/',
+            },
+            'jre' => {
+              'package'          => 'openjdk-6-jre-headless',
+              'alternative'      => "java-6-openjdk-${architecture}",
+              'alternative_path' => '/usr/lib/jvm/java-6-openjdk/jre/bin/java',
+              'java_home'        => '/usr/lib/jvm/java-6-openjdk/jre/',
+            },
+            'sun-jre' => {
+              'package'          => 'sun-java6-jre',
+              'alternative'      => 'java-6-sun',
+              'alternative_path' => '/usr/lib/jvm/java-6-sun/jre/bin/java',
+              'java_home'        => '/usr/lib/jvm/java-6-sun/jre/',
+            },
+            'sun-jdk' => {
+              'package'          => 'sun-java6-jdk',
+              'alternative'      => 'java-6-sun',
+              'alternative_path' => '/usr/lib/jvm/java-6-sun/jre/bin/java',
+              'java_home'        => '/usr/lib/jvm/java-6-sun/jre/',
+            },
+          }
+        }
+        'wheezy', 'jessie', 'precise','quantal','raring','saucy', 'trusty': {
+          $java =  {
+            'jdk' => {
+              'package'          => 'openjdk-7-jdk',
+              'alternative'      => "java-1.7.0-openjdk-${::architecture}",
+              'alternative_path' => "/usr/lib/jvm/java-1.7.0-openjdk-${::architecture}/bin/java",
+              'java_home'        => "/usr/lib/jvm/java-1.7.0-openjdk-${::architecture}/",
+            },
+            'jre' => {
+              'package'          => 'openjdk-7-jre-headless',
+              'alternative'      => "java-1.7.0-openjdk-${::architecture}",
+              'alternative_path' => "/usr/lib/jvm/java-1.7.0-openjdk-${::architecture}/bin/java",
+              'java_home'        => "/usr/lib/jvm/java-1.7.0-openjdk-${::architecture}/",
+            },
+            'oracle-jre' => {
+              'package'          => 'oracle-j2re1.7',
+              'alternative'      => 'j2re1.7-oracle',
+              'alternative_path' => '/usr/lib/jvm/j2re1.7-oracle/bin/java',
+              'java_home'        => '/usr/lib/jvm/j2re1.7-oracle/',
+            },
+            'oracle-jdk' => {
+              'package'          => 'oracle-j2sdk1.7',
+              'alternative'      => 'j2sdk1.7-oracle',
+              'alternative_path' => '/usr/lib/jvm/j2sdk1.7-oracle/jre/bin/java',
+              'java_home'        => '/usr/lib/jvm/j2sdk1.7-oracle/jre/',
+            },
+          }
+        }
+      }
+    }
+    'Solaris': {
+      $java = {
+        'jdk' => { 'package' => 'developer/java/jdk-7', },
+        'jre' => { 'package' => 'runtime/java/jre-7', },
+      }
+    }
+    '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' => $jdk_package, },
+        'jre' => { 'package' => $jre_package, },
+      }
+    }
+  }
+}

metadata.json

@@ -1,12 +1,85 @@
-/*
+{
-+-----------------------------------------------------------------------+
+  "name": "puppetlabs-java",
-|                                                                       |
+  "version": "1.1.2",
-|                    ==> DO NOT EDIT THIS FILE! <==                     |
+  "author": "puppetlabs",
-|                                                                       |
+  "summary": "Manage the official Java runtime",
-|   You should edit the `Modulefile` and run `puppet-module build`      |
+  "license": "Apache",
-|   to generate the `metadata.json` file for your releases.             |
+  "source": "git://github.com/puppetlabs/puppetlabs-java",
-|                                                                       |
+  "project_page": "https://github.com/puppetlabs/puppetlabs-java",
-+-----------------------------------------------------------------------+
+  "issues_url": "https://tickets.puppetlabs.com/browse/MODULES",
-*/
+  "operatingsystem_support": [
-
+    {
-{}
+      "operatingsystem": "RedHat",
+      "operatingsystemrelease": [
+        "5",
+        "6",
+        "7"
+      ]
+    },
+    {
+      "operatingsystem": "CentOS",
+      "operatingsystemrelease": [
+        "5",
+        "6",
+        "7"
+      ]
+    },
+    {
+      "operatingsystem": "OracleLinux",
+      "operatingsystemrelease": [
+        "6",
+        "7"
+      ]
+    },
+    {
+      "operatingsystem": "Scientific",
+      "operatingsystemrelease": [
+        "5",
+        "6"
+      ]
+    },
+    {
+      "operatingsystem": "Debian",
+      "operatingsystemrelease": [
+        "6",
+        "7"
+      ]
+    },
+    {
+      "operatingsystem": "Ubuntu",
+      "operatingsystemrelease": [
+        "10.04",
+        "12.04",
+        "14.04"
+      ]
+    },
+    {
+      "operatingsystem": "SLES",
+      "operatingsystemrelease": [
+        "11 SP1"
+      ]
+    },
+    {
+      "operatingsystem": "Solaris",
+      "operatingsystemrelease": [
+        "11"
+      ]
+    }
+  ],
+  "requirements": [
+    {
+      "name": "pe",
+      "version_requirement": "3.x"
+    },
+    {
+      "name": "puppet",
+      "version_requirement": "3.x"
+    }
+  ],
+  "dependencies": [
+    {
+      "name": "puppetlabs/stdlib",
+      "version_requirement": ">= 2.4.0"
+    }
+  ]
+}

spec/acceptance/install_spec.rb

@@ -0,0 +1,212 @@
+require 'spec_helper_acceptance'
+
+#RedHat, CentOS, Scientific, Oracle prior to 5.0  : Sun Java JDK/JRE 1.6
+#RedHat, CentOS, Scientific, Oracle 5.0 < x < 6.3 : OpenJDK Java JDK/JRE 1.6
+#RedHat, CentOS, Scientific, Oracle after 6.3     : OpenJDK Java JDK/JRE 1.7
+#Debian 5/6 & Ubuntu 10.04/11.04                  : OpenJDK Java JDK/JRE 1.6 or Sun Java JDK/JRE 1.6
+#Debian 7/Jesse & Ubuntu 12.04 - 14.04            : OpenJDK Java JDK/JRE 1.7 or Oracle Java JDK/JRE 1.6
+#Solaris (what versions?)                         : Java JDK/JRE 1.7
+#OpenSuSE                                         : OpenJDK Java JDK/JRE 1.7
+#SLES                                             : IBM Java JDK/JRE 1.6
+
+# C14677
+# C14678
+# C14679
+# C14680
+# C14681
+# C14682
+# C14684
+# C14687
+# C14692
+# C14696
+# C14697
+# C14700 check on solaris 11
+# C14701 check on sles 11
+# C14703
+# C14723 Where is oracle linux 5?
+# C14724 Where is oracle linux 5?
+# C14771 Where is redhat 7? Centos 7?
+describe "installing java", :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
+  describe "jre" do
+    it 'should install jre' do
+      pp = <<-EOS
+        class { 'java':
+          distribution => 'jre',
+        }
+      EOS
+
+      apply_manifest(pp, :catch_failures => true)
+      apply_manifest(pp, :catch_changes => true)
+    end
+  end
+  describe "jdk" do
+    it 'should install jdk' do
+      pp = <<-EOS
+        class { 'java': }
+      EOS
+
+      apply_manifest(pp, :catch_failures => true)
+      apply_manifest(pp, :catch_changes => true)
+    end
+  end
+end
+# C14686
+describe 'sun', :if => (fact('operatingsystem') == 'Debian' and fact('operatingsystemrelease').match(/(5|6)/)) do
+  before :all do
+    pp = <<-EOS
+      file_line { 'non-free source':
+        path  => '/etc/apt/sources.list',
+        match => "deb http://osmirror.delivery.puppetlabs.net/debian/ ${::lsbdistcodename} main",
+        line  => "deb http://osmirror.delivery.puppetlabs.net/debian/ ${::lsbdistcodename} main non-free",
+      }
+    EOS
+    apply_manifest(pp)
+    shell('apt-get update')
+    shell('echo "sun-java6-jdk shared/accepted-sun-dlj-v1-1 select true" | debconf-set-selections')
+    shell('echo "sun-java6-jre shared/accepted-sun-dlj-v1-1 select true" | debconf-set-selections')
+  end
+  describe 'jre' do
+    it 'should install sun-jre' do
+      pp = <<-EOS
+        class { 'java':
+          distribution => 'sun-jre',
+        }
+      EOS
+
+      apply_manifest(pp, :catch_failures => true)
+      apply_manifest(pp, :catch_changes => true)
+    end
+  end
+  describe 'jdk' do
+    it 'should install sun-jdk' do
+      pp = <<-EOS
+        class { 'java':
+          distribution => 'sun-jdk',
+        }
+      EOS
+
+      apply_manifest(pp, :catch_failures => true)
+      apply_manifest(pp, :catch_changes => true)
+    end
+  end
+end
+
+# C14704
+# C14705
+# C15006
+describe 'oracle', :if => (
+  (fact('operatingsystem') == 'Debian') and (fact('operatingsystemrelease').match(/^7/)) or
+  (fact('operatingsystem') == 'Ubuntu') and (fact('operatingsystemrelease').match(/^12\.04/)) or
+  (fact('operatingsystem') == 'Ubuntu') and (fact('operatingsystemrelease').match(/^14\.04/))
+) do
+  # not supported
+  # The package is not available from any sources, but if a customer
+  # custom-builds the package using java-package and adds it to a local
+  # repository, that is the intention of this version ability
+  describe 'jre' do
+    it 'should install oracle-jre' do
+      pp = <<-EOS
+        class { 'java':
+          distribution => 'oracle-jre',
+        }
+      EOS
+
+      apply_manifest(pp, :expect_failures => true)
+    end
+  end
+  describe 'jdk' do
+    it 'should install oracle-jdk' do
+      pp = <<-EOS
+        class { 'java':
+          distribution => 'oracle-jdk',
+        }
+      EOS
+
+      apply_manifest(pp, :expect_failures => true)
+    end
+  end
+end
+
+describe 'failure cases' do
+  # C14711
+  it 'should fail to install java with an incorrect version' do
+    pp = <<-EOS
+      class { 'java':
+        version => '14.5',
+      }
+    EOS
+
+    apply_manifest(pp, :expect_failures => true)
+  end
+
+  # C14712
+  it 'should fail to install java with a blank version' do
+    pp = <<-EOS
+      class { 'java':
+        version => '',
+      }
+    EOS
+
+    apply_manifest(pp, :expect_failures => true)
+  end
+
+  # C14713
+  it 'should fail to install java with an incorrect distribution' do
+    pp = <<-EOS
+      class { 'java':
+        distribution => 'xyz',
+      }
+    EOS
+
+    apply_manifest(pp, :expect_failures => true)
+  end
+
+  # C14714
+  it 'should fail to install java with a blank distribution' do
+    pp = <<-EOS
+      class { 'java':
+        distribution => '',
+      }
+    EOS
+
+    apply_manifest(pp, :expect_failures => true)
+  end
+
+  # C14715
+  it 'should fail to install java with an incorrect package' do
+    pp = <<-EOS
+      class { 'java':
+        package => 'xyz',
+      }
+    EOS
+
+    apply_manifest(pp, :expect_failures => true)
+  end
+  # C14715
+  it 'should fail to install java with an incorrect package' do
+    pp = <<-EOS
+      class { 'java':
+        package => 'xyz',
+      }
+    EOS
+
+    apply_manifest(pp, :expect_failures => true)
+  end
+  # C14717
+  # C14719
+  # C14725
+  it 'should fail on debian when passed fake java_alternative and path' do
+    pp = <<-EOS
+      class { 'java':
+        java_alternative      => 'whatever',
+        java_alternative_path => '/whatever',
+      }
+    EOS
+
+    if fact('osfamily') == 'Debian'
+      apply_manifest(pp, :expect_failures => true)
+    else
+      apply_manifest(pp, :catch_failures => true)
+    end
+  end
+end

spec/acceptance/nodesets/centos-5-vcloud.yml

@@ -0,0 +1,15 @@
+HOSTS:
+  'centos-5-vcloud':
+    roles:
+      - master
+    platform: el-5-x86_64
+    hypervisor: vcloud
+    template: centos-5-x86_64
+CONFIG:
+  type: foss
+  ssh:
+    keys: "~/.ssh/id_rsa-acceptance"
+  datastore: instance0
+  folder: Delivery/Quality Assurance/Enterprise/Dynamic
+  resourcepool: delivery/Quality Assurance/Enterprise/Dynamic
+  pooling_api: http://vcloud.delivery.puppetlabs.net/

spec/acceptance/nodesets/centos-59-x64-pe.yml

@@ -0,0 +1,12 @@
+HOSTS:
+  centos-59-x64:
+    roles:
+      - master
+      - database
+      - console
+    platform: el-5-x86_64
+    box : centos-59-x64-vbox4210-nocm
+    box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-59-x64-vbox4210-nocm.box
+    hypervisor : vagrant
+CONFIG:
+  type: pe

spec/acceptance/nodesets/centos-59-x64.yml

@@ -0,0 +1,10 @@
+HOSTS:
+  centos-59-x64:
+    roles:
+      - master
+    platform: el-5-x86_64
+    box : centos-59-x64-vbox4210-nocm
+    box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-59-x64-vbox4210-nocm.box
+    hypervisor : vagrant
+CONFIG:
+  type: git

spec/acceptance/nodesets/centos-6-vcloud.yml

@@ -0,0 +1,15 @@
+HOSTS:
+  'centos-6-vcloud':
+    roles:
+      - master
+    platform: el-6-x86_64
+    hypervisor: vcloud
+    template: centos-6-x86_64
+CONFIG:
+  type: foss
+  ssh:
+    keys: "~/.ssh/id_rsa-acceptance"
+  datastore: instance0
+  folder: Delivery/Quality Assurance/Enterprise/Dynamic
+  resourcepool: delivery/Quality Assurance/Enterprise/Dynamic
+  pooling_api: http://vcloud.delivery.puppetlabs.net/

spec/acceptance/nodesets/centos-64-x64-fusion.yml

@@ -0,0 +1,10 @@
+HOSTS:
+  centos-64-x64:
+    roles:
+      - master
+    platform: el-6-x86_64
+    box : centos-64-x64-fusion503-nocm
+    box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-64-x64-fusion503-nocm.box
+    hypervisor : fusion
+CONFIG:
+  type: foss

spec/acceptance/nodesets/centos-64-x64-pe.yml

@@ -0,0 +1,12 @@
+HOSTS:
+  centos-64-x64:
+    roles:
+      - master
+      - database
+      - dashboard
+    platform: el-6-x86_64
+    box : centos-64-x64-vbox4210-nocm
+    box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-64-x64-vbox4210-nocm.box
+    hypervisor : vagrant
+CONFIG:
+  type: pe

spec/acceptance/nodesets/centos-64-x64.yml

@@ -0,0 +1,10 @@
+HOSTS:
+  centos-64-x64:
+    roles:
+      - master
+    platform: el-6-x86_64
+    box : centos-64-x64-vbox4210-nocm
+    box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-64-x64-vbox4210-nocm.box
+    hypervisor : vagrant
+CONFIG:
+  type: foss

spec/acceptance/nodesets/centos-65-x64.yml

@@ -0,0 +1,10 @@
+HOSTS:
+  centos-65-x64:
+    roles:
+      - master
+    platform: el-6-x86_64
+    box : centos-65-x64-vbox436-nocm
+    box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-65-x64-virtualbox-nocm.box
+    hypervisor : vagrant
+CONFIG:
+  type: foss

spec/acceptance/nodesets/centos-7-vcloud.yml

@@ -0,0 +1,15 @@
+HOSTS:
+  'centos-7-vcloud':
+    roles:
+      - master
+    platform: el-7-x86_64
+    hypervisor: vcloud
+    template: centos-7-x86_64
+CONFIG:
+  type: foss
+  ssh:
+    keys: "~/.ssh/id_rsa-acceptance"
+  datastore: instance0
+  folder: Delivery/Quality Assurance/Enterprise/Dynamic
+  resourcepool: delivery/Quality Assurance/Enterprise/Dynamic
+  pooling_api: http://vcloud.delivery.puppetlabs.net/

spec/acceptance/nodesets/debian-6-vcloud.yml

@@ -0,0 +1,15 @@
+HOSTS:
+  'debian-6-amd64':
+    roles:
+      - master
+    platform: debian-6-amd64
+    hypervisor: vcloud
+    template: debian-6-x86_64
+CONFIG:
+  type: foss
+  ssh:
+    keys: "~/.ssh/id_rsa-acceptance"
+  datastore: instance0
+  folder: Delivery/Quality Assurance/Enterprise/Dynamic
+  resourcepool: delivery/Quality Assurance/Enterprise/Dynamic
+  pooling_api: http://vcloud.delivery.puppetlabs.net/

spec/acceptance/nodesets/debian-607-x64.yml

@@ -0,0 +1,10 @@
+HOSTS:
+  debian-607-x64:
+    roles:
+      - master
+    platform: debian-6-amd64
+    box : debian-607-x64-vbox4210-nocm
+    box_url : http://puppet-vagrant-boxes.puppetlabs.com/debian-607-x64-vbox4210-nocm.box
+    hypervisor : vagrant
+CONFIG:
+  type: git

spec/acceptance/nodesets/debian-7-vcloud.yml

@@ -0,0 +1,15 @@
+HOSTS:
+  'debian-7-amd64':
+    roles:
+      - master
+    platform: debian-7-amd64
+    hypervisor: vcloud
+    template: debian-7-x86_64
+CONFIG:
+  type: foss
+  ssh:
+    keys: "~/.ssh/id_rsa-acceptance"
+  datastore: instance0
+  folder: Delivery/Quality Assurance/Enterprise/Dynamic
+  resourcepool: delivery/Quality Assurance/Enterprise/Dynamic
+  pooling_api: http://vcloud.delivery.puppetlabs.net/

spec/acceptance/nodesets/debian-70rc1-x64.yml

@@ -0,0 +1,10 @@
+HOSTS:
+  debian-70rc1-x64:
+    roles:
+      - master
+    platform: debian-7-amd64
+    box : debian-70rc1-x64-vbox4210-nocm
+    box_url : http://puppet-vagrant-boxes.puppetlabs.com/debian-70rc1-x64-vbox4210-nocm.box
+    hypervisor : vagrant
+CONFIG:
+  type: git

spec/acceptance/nodesets/default.yml

@@ -0,0 +1,10 @@
+HOSTS:
+  centos-64-x64:
+    roles:
+      - master
+    platform: el-6-x86_64
+    box : centos-64-x64-vbox4210-nocm
+    box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-64-x64-vbox4210-nocm.box
+    hypervisor : vagrant
+CONFIG:
+  type: foss

spec/acceptance/nodesets/fedora-18-x64.yml

@@ -0,0 +1,10 @@
+HOSTS:
+  fedora-18-x64:
+    roles:
+      - master
+    platform: fedora-18-x86_64
+    box : fedora-18-x64-vbox4210-nocm
+    box_url : http://puppet-vagrant-boxes.puppetlabs.com/fedora-18-x64-vbox4210-nocm.box
+    hypervisor : vagrant
+CONFIG:
+  type: git

spec/acceptance/nodesets/redhat-7-vcloud.yml

@@ -0,0 +1,15 @@
+HOSTS:
+  'redhat-7-vcloud':
+    roles:
+      - master
+    platform: el-7-x86_64
+    hypervisor: vcloud
+    template: redhat-7-x86_64
+CONFIG:
+  type: foss
+  ssh:
+    keys: "~/.ssh/id_rsa-acceptance"
+  datastore: instance0
+  folder: Delivery/Quality Assurance/Enterprise/Dynamic
+  resourcepool: delivery/Quality Assurance/Enterprise/Dynamic
+  pooling_api: http://vcloud.delivery.puppetlabs.net/

spec/acceptance/nodesets/sles-11-vcloud.yml

@@ -0,0 +1,16 @@
+HOSTS:
+  'sles-11-vcloud':
+    roles:
+      - master
+    platform: sles-11-x86_64
+    hypervisor: vcloud
+    template: sles-11-x86_64
+
+CONFIG:
+  type: foss
+  ssh:
+    keys: "~/.ssh/id_rsa-acceptance"
+  datastore: instance0
+  folder: Delivery/Quality Assurance/Enterprise/Dynamic
+  resourcepool: delivery/Quality Assurance/Enterprise/Dynamic
+  pooling_api: http://vcloud.delivery.puppetlabs.net/

spec/acceptance/nodesets/sles-11sp1-x64.yml

@@ -0,0 +1,10 @@
+HOSTS:
+  sles-11sp1-x64:
+    roles:
+      - master
+    platform: sles-11-x86_64
+    box : sles-11sp1-x64-vbox4210-nocm
+    box_url : http://puppet-vagrant-boxes.puppetlabs.com/sles-11sp1-x64-vbox4210-nocm.box
+    hypervisor : vagrant
+CONFIG:
+  type: git

spec/acceptance/nodesets/solaris-11-vcloud.yml

@@ -0,0 +1,15 @@
+HOSTS:
+  'solaris-11-vcloud':
+    roles:
+      - master
+    platform: solaris-11-i386
+    hypervisor: vcloud
+    template: solaris-11-x86_64
+CONFIG:
+  type: foss
+  ssh:
+    keys: "~/.ssh/id_rsa-acceptance"
+  datastore: instance0
+  folder: Delivery/Quality Assurance/Enterprise/Dynamic
+  resourcepool: delivery/Quality Assurance/Enterprise/Dynamic
+  pooling_api: http://vcloud.delivery.puppetlabs.net/

spec/acceptance/nodesets/ubuntu-1004-vcloud.yml

@@ -0,0 +1,15 @@
+HOSTS:
+  'ubuntu-1004-amd64':
+    roles:
+      - master
+    platform: ubuntu-10.04-amd64
+    hypervisor: vcloud
+    template: ubuntu-1004-x86_64
+CONFIG:
+  type: foss
+  ssh:
+    keys: "~/.ssh/id_rsa-acceptance"
+  datastore: instance0
+  folder: Delivery/Quality Assurance/Enterprise/Dynamic
+  resourcepool: delivery/Quality Assurance/Enterprise/Dynamic
+  pooling_api: http://vcloud.delivery.puppetlabs.net/

spec/acceptance/nodesets/ubuntu-1404-vcloud.yml

@@ -0,0 +1,15 @@
+HOSTS:
+  'ubuntu-1404-amd64':
+    roles:
+      - master
+    platform: ubuntu-14.04-amd64
+    hypervisor: vcloud
+    template: ubuntu-1404-x86_64
+CONFIG:
+  type: foss
+  ssh:
+    keys: "~/.ssh/id_rsa-acceptance"
+  datastore: instance0
+  folder: Delivery/Quality Assurance/Enterprise/Dynamic
+  resourcepool: delivery/Quality Assurance/Enterprise/Dynamic
+  pooling_api: http://vcloud.delivery.puppetlabs.net/

spec/acceptance/nodesets/ubuntu-server-10044-x64.yml

@@ -0,0 +1,10 @@
+HOSTS:
+  ubuntu-server-10044-x64:
+    roles:
+      - master
+    platform: ubuntu-10.04-amd64
+    box : ubuntu-server-10044-x64-vbox4210-nocm
+    box_url : http://puppet-vagrant-boxes.puppetlabs.com/ubuntu-server-10044-x64-vbox4210-nocm.box
+    hypervisor : vagrant
+CONFIG:
+  type: foss

spec/acceptance/nodesets/ubuntu-server-12042-x64.yml

@@ -0,0 +1,10 @@
+HOSTS:
+  ubuntu-server-12042-x64:
+    roles:
+      - master
+    platform: ubuntu-12.04-amd64
+    box : ubuntu-server-12042-x64-vbox4210-nocm
+    box_url : http://puppet-vagrant-boxes.puppetlabs.com/ubuntu-server-12042-x64-vbox4210-nocm.box
+    hypervisor : vagrant
+CONFIG:
+  type: foss

spec/acceptance/nodesets/ubuntu-server-1404-x64.yml

@@ -0,0 +1,11 @@
+HOSTS:
+  ubuntu-server-1404-x64:
+    roles:
+      - master
+    platform: ubuntu-14.04-amd64
+    box : puppetlabs/ubuntu-14.04-64-nocm
+    box_url : https://vagrantcloud.com/puppetlabs/ubuntu-14.04-64-nocm
+    hypervisor : vagrant
+CONFIG:
+  log_level   : debug
+  type: git

spec/classes/java_spec.rb

@@ -0,0 +1,154 @@
+require 'spec_helper'
+
+describe 'java', :type => :class do
+
+  context 'select openjdk for Centos 5.8' do
+    let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Centos', :operatingsystemrelease => '5.8'} }
+    it { should contain_package('java').with_name('java-1.6.0-openjdk-devel') }
+  end
+
+  context 'select openjdk for Centos 6.3' do
+    let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Centos', :operatingsystemrelease => '6.3'} }
+    it { should contain_package('java').with_name('java-1.7.0-openjdk-devel') }
+  end
+
+  context 'select openjdk for Centos 6.2' do
+    let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Centos', :operatingsystemrelease => '6.2'} }
+    it { should contain_package('java').with_name('java-1.6.0-openjdk-devel') }
+  end
+
+  context 'select openjdk for Fedora' do
+    let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Fedora'} }
+    it { should contain_package('java').with_name('java-1.7.0-openjdk-devel') }
+  end
+
+  context 'select passed value for Fedora' do
+    let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Fedora'} }
+    let(:params) { { 'distribution' => 'jre' } }
+    it { should contain_package('java').with_name('java-1.7.0-openjdk') }
+  end
+
+  context 'select passed value for Centos 5.3' do
+    let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Centos', :operatingsystemrelease => '5.3'} }
+    let(:params) { { 'package' => 'jdk' } }
+    it { should contain_package('java').with_name('jdk') }
+    it { should_not contain_exec('update-java-alternatives') }
+  end
+
+  context 'select default for Centos 5.3' do
+    let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Centos', :operatingsystemrelease => '5.3'} }
+    it { should contain_package('java').with_name('java-1.6.0-openjdk-devel') }
+    it { should_not contain_exec('update-java-alternatives') }
+  end
+
+  context 'select default for Debian Wheezy' do
+    let(:facts) { {:osfamily => 'Debian', :operatingsystem => 'Debian', :lsbdistcodename => 'wheezy', :operatingsystemrelease => '7.1', :architecture => 'amd64',} }
+    it { should contain_package('java').with_name('openjdk-7-jdk') }
+    it { should contain_exec('update-java-alternatives').with_command('update-java-alternatives --set java-1.7.0-openjdk-amd64 --jre') }
+  end
+
+  context 'select Oracle JRE for Debian Wheezy' do
+    let(:facts) { {:osfamily => 'Debian', :operatingsystem => 'Debian', :lsbdistcodename => 'wheezy', :operatingsystemrelease => '7.1', } }
+    let(:params) { { 'distribution' => 'oracle-jre' } }
+    it { should contain_package('java').with_name('oracle-j2re1.7') }
+    it { should contain_exec('update-java-alternatives').with_command('update-java-alternatives --set j2re1.7-oracle --jre') }
+  end
+
+  context 'select default for Debian Squeeze' do
+    let(:facts) { {:osfamily => 'Debian', :operatingsystem => 'Debian', :lsbdistcodename => 'squeeze', :operatingsystemrelease => '6.0.5', :architecture => 'amd64',} }
+    it { should contain_package('java').with_name('openjdk-6-jdk') }
+    it { should contain_exec('update-java-alternatives').with_command('update-java-alternatives --set java-6-openjdk-amd64 --jre') }
+  end
+
+  context 'select Oracle JRE for Debian Squeeze' do
+    let(:facts) { {:osfamily => 'Debian', :operatingsystem => 'Debian', :lsbdistcodename => 'squeeze', :operatingsystemrelease => '6.0.5'} }
+    let(:params) { { 'distribution' => 'sun-jre', } }
+    it { should contain_package('java').with_name('sun-java6-jre') }
+    it { should contain_exec('update-java-alternatives').with_command('update-java-alternatives --set java-6-sun --jre') }
+  end
+
+  context 'select random alternative for Debian Wheezy' do
+    let(:facts) { {:osfamily => 'Debian', :operatingsystem => 'Debian', :lsbdistcodename => 'wheezy', :operatingsystemrelease => '7.1'} }
+    let(:params) { { 'java_alternative' => 'bananafish' } }
+    it { should contain_package('java').with_name('openjdk-7-jdk') }
+    it { should contain_exec('update-java-alternatives').with_command('update-java-alternatives --set bananafish --jre') }
+  end
+
+  context 'select openjdk for Amazon Linux' do
+    let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Amazon', :operatingsystemrelease => '3.4.43-43.43.amzn1.x86_64'} }
+    it { should contain_package('java').with_name('java-1.7.0-openjdk-devel') }
+  end
+
+  context 'select passed value for Amazon Linux' do
+    let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Amazon', :operatingsystemrelease => '5.3.4.43-43.43.amzn1.x86_64'} }
+    let(:params) { { 'distribution' => 'jre' } }
+    it { should contain_package('java').with_name('java-1.7.0-openjdk') }
+  end
+
+  context 'select openjdk for Oracle Linux' do
+    let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'OracleLinux', :operatingsystemrelease => '6.4'} }
+    it { should contain_package('java').with_name('java-1.7.0-openjdk-devel') }
+  end
+
+  context 'select openjdk for Oracle Linux 6.2' do
+    let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'OracleLinux', :operatingsystemrelease => '6.2'} }
+    it { should contain_package('java').with_name('java-1.6.0-openjdk-devel') }
+  end
+
+  context 'select passed value for Oracle Linux' do
+    let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'OracleLinux', :operatingsystemrelease => '6.3'} }
+    let(:params) { { 'distribution' => 'jre' } }
+    it { should contain_package('java').with_name('java-1.7.0-openjdk') }
+  end
+
+  context 'select passed value for Scientific Linux' do
+    let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Scientific', :operatingsystemrelease => '6.4'} }
+    let(:params) { { 'distribution' => 'jre' } }
+    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
+
+  describe 'incompatible OSs' do
+    [
+      {
+        # C14706
+        :osfamily               => 'windows',
+        :operatingsystem        => 'windows',
+        :operatingsystemrelease => '8.1',
+      },
+      {
+        # C14707
+        :osfamily               => 'Darwin',
+        :operatingsystem        => 'Darwin',
+        :operatingsystemrelease => '13.3.0',
+      },
+      {
+        # C14708
+        :osfamily               => 'AIX',
+        :operatingsystem        => 'AIX',
+        :operatingsystemrelease => '7100-02-00-000',
+      },
+      {
+        # C14708
+        :osfamily               => 'AIX',
+        :operatingsystem        => 'AIX',
+        :operatingsystemrelease => '6100-07-04-1216',
+      },
+      {
+        # C14708
+        :osfamily               => 'AIX',
+        :operatingsystem        => 'AIX',
+        :operatingsystemrelease => '5300-12-01-1016',
+      },
+    ].each do |facts|
+      let(:facts) { facts }
+      it "should fail on #{facts[:operatingsystem]} #{facts[:operatingsystemrelease]}" do
+        expect { subject }.to raise_error Puppet::Error, /unsupported platform/
+      end
+    end
+  end
+end

spec/spec.opts

@@ -1,6 +0,0 @@
---format
-s
---colour
---loadby
-mtime
---backtrace

spec/spec_helper.rb

@@ -1,18 +1 @@
-require 'pathname'
+require 'puppetlabs_spec_helper/module_spec_helper'
-dir = Pathname.new(__FILE__).parent
-$LOAD_PATH.unshift(dir, dir + 'lib', dir + '../lib')
-
-require 'mocha'
-require 'puppet'
-gem 'rspec', '=1.2.9'
-require 'spec/autorun'
-
-Spec::Runner.configure do |config|
-    config.mock_with :mocha
-end
-
-# We need this because the RAL uses 'should' as a method.  This
-# allows us the same behaviour but with a different method name.
-class Object
-    alias :must :should
-end

spec/spec_helper_acceptance.rb

@@ -0,0 +1,39 @@
+require 'beaker-rspec'
+
+UNSUPPORTED_PLATFORMS = [ "Darwin", "windows" ]
+
+unless ENV["RS_PROVISION"] == "no" or ENV["BEAKER_provision"] == "no"
+  # This will install the latest available package on el and deb based
+  # systems fail on windows and osx, and install via gem on other *nixes
+  foss_opts = { :default_action => 'gem_install' }
+
+  if default.is_pe?; then install_pe; else install_puppet( foss_opts ); end
+
+  hosts.each do |host|
+    if host["platform"] =~ /solaris/
+      on host, "echo 'export PATH=/opt/puppet/bin:/var/ruby/1.8/gem_home/bin:${PATH}' >> ~/.bashrc"
+    end
+    unless host.is_pe?
+      on host, "/bin/mkdir -p #{host["puppetpath"]}"
+      on host, "/bin/echo '' > #{host["hieraconf"]}"
+    end
+    on host, "mkdir -p #{host["distmoduledir"]}"
+    on host, "puppet module install puppetlabs-stdlib", :acceptable_exit_codes => [0,1]
+    # For test support
+    on host, "puppet module install puppetlabs-apt", :acceptable_exit_codes => [0,1]
+  end
+end
+
+RSpec.configure do |c|
+  # Project root
+  proj_root = File.expand_path(File.join(File.dirname(__FILE__), ".."))
+
+  # Readable test descriptions
+  c.formatter = :documentation
+
+  # Configure all nodes in nodeset
+  c.before :suite do
+    # Install module
+    puppet_module_install(:source => proj_root, :module_name => "java")
+  end
+end

tests/init.pp

@@ -1 +1,4 @@
-include java
+class { 'java':
+  distribution => 'jdk',
+  version      => 'latest',
+}