Prepare a 1.1.0 release.

plus signs are valid in debian/ubuntu package versions

.fixtures.yml

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

.gitignore

@@ -1,3 +1,7 @@
 pkg/
 .DS_Store
 metadata.json
+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,53 @@
+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
 

Gemfile

@@ -0,0 +1,15 @@
+source "http://rubygems.org"
+
+if ENV.key?('PUPPET_VERSION')
+  puppetversion = "= #{ENV['PUPPET_VERSION']}"
+elsif ENV.key?('PUPPET_GEM_VERSION')
+  puppetversion = ENV['PUPPET_GEM_VERSION']
+else
+  puppetversion = ['~> 2.7']
+end
+
+gem "rake"
+gem "puppet", puppetversion
+gem "puppet-lint"
+gem "rspec-puppet"
+gem "puppetlabs_spec_helper"

Gemfile.lock

@@ -0,0 +1,43 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    diff-lcs (1.2.2)
+    facter (1.7.2)
+    hiera (1.2.1)
+      json_pure
+    json_pure (1.8.0)
+    metaclass (0.0.1)
+    mocha (0.13.3)
+      metaclass (~> 0.0.1)
+    puppet (3.2.3)
+      facter (~> 1.6)
+      hiera (~> 1.0)
+      rgen (~> 0.6.5)
+    puppet-lint (0.3.2)
+    puppetlabs_spec_helper (0.4.1)
+      mocha (>= 0.10.5)
+      rake
+      rspec (>= 2.9.0)
+      rspec-puppet (>= 0.1.1)
+    rake (10.0.4)
+    rgen (0.6.5)
+    rspec (2.13.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    rspec-core (2.13.1)
+    rspec-expectations (2.13.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.13.0)
+    rspec-puppet (0.1.6)
+      rspec
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  puppet (~> 3.2.0)
+  puppet-lint
+  puppetlabs_spec_helper
+  rake
+  rspec-puppet

Modulefile

@@ -1,5 +1,5 @@
 name         'puppetlabs-java'
-version '0.3.0'
+version      '1.1.0'
 source       'git://github.com/puppetlabs/puppetlabs-java'
 author       'puppetlabs'
 license      'Apache'
@@ -7,5 +7,4 @@ 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.6'

README.markdown

@@ -1,4 +1,4 @@
-# Java #
+#Java
 
 Manage the Java runtime for use with other application software.
 

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

@@ -5,7 +5,10 @@
 # Parameters:
 #
 #  [*distribution*]
-#    The java distribution to install. Can be one of "jdk" or "jre".
+#    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
@@ -15,6 +18,19 @@
 #    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:
@@ -25,19 +41,20 @@ class java(
   $distribution          = 'jdk',
   $version               = 'present',
   $package               = undef,
+  $java_alternative      = undef,
+  $java_alternative_path = undef
 ) {
   include java::params
 
-  validate_re($version, 'present|installed|latest|^[._0-9a-zA-Z:-]+$')
+  validate_re($version, 'present|installed|latest|^[.+_0-9a-zA-Z:-]+$')
 
-  case $distribution {
+  if has_key($java::params::java, $distribution) {
-    default: { fail('distribution must be one of jdk, jre') }
+    $default_package_name     = $java::params::java[$distribution]['package']
-    'jdk': {
+    $default_alternative      = $java::params::java[$distribution]['alternative']
-      $default_package_name = $java::params::jdk_package
+    $default_alternative_path = $java::params::java[$distribution]['alternative_path']
-    }
+    $java_home                = $java::params::java[$distribution]['java_home']
-    'jre': {
+  } else {
-      $default_package_name = $java::params::jre_package
+    fail("Java distribution ${distribution} is not supported.")
-    }
   }
 
   $use_java_package_name = $package ? {
@@ -45,9 +62,34 @@ class java(
     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

@@ -1,8 +1,15 @@
 # Class: java::params
 #
-# This class sets the value of two variables, jdk_package and jre_package,
+# This class builds a hash of JDK/JRE packages and (for Debian)
-# appropriate for the client system in question.
+# 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 {
@@ -10,37 +17,117 @@ class java::params {
     'RedHat': {
       case $::operatingsystem {
         default: { fail("unsupported os ${::operatingsystem}") }
-        'RedHat', 'CentOS': {
+        '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'
-          $jre_package = 'java'
         }
+        '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}") }
-        'squeeze', 'lucid': {
+        'lenny', 'squeeze', 'lucid', 'natty': {
-          $jdk_package = 'openjdk-6-jdk'
+          $java  = {
-          $jre_package = 'openjdk-6-jre-headless'
+            'jdk' => {
+              'package'          => 'openjdk-6-jdk',
+              'alternative'      => 'java-6-openjdk',
+              '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',
+              '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', 'precise','quantal','raring','saucy': {
+          $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/',
+            },
           }
-        'wheezy', 'precise': {
-          $jdk_package = 'openjdk-7-jdk'
-          $jre_package = 'openjdk-7-jre-headless'
         }
       }
     }
     'Solaris': {
-      $jdk_package = 'developer/java/jdk-7'
+      $java = {
-      $jre_package = 'runtime/java/jre-7'
+        '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, },
+      }
+    }
+  }
 }

spec/classes/java_spec.rb

@@ -0,0 +1,115 @@
+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'} }
+    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 --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
+
+end

spec/spec_helper.rb

@@ -0,0 +1 @@
+require 'puppetlabs_spec_helper/module_spec_helper'