Update CHANGELOG for version 0.1.4

* bug/master/class_ordering:
  Fix ordering issues with composed classes

CHANGELOG

@@ -1,3 +1,12 @@
+2011-06-02 Jeff McCune <jeff@puppetlabs.com> - 0.1.4
+* Fix class composition ordering problems
+
+2011-05-28 Jeff McCune <jeff@puppetlabs.com> - 0.1.3
+* Remove stages
+
+2011-05-26 Jeff McCune <jeff@puppetlabs.com> - 0.1.2
+* Changes JRE/JDK selection class parameter to $distribution
+
 2011-05-25 Jeff McCune <jeff@puppetlabs.com> - 0.1.1
 * Re-did versioning to follow semantic versioning
 

Modulefile

@@ -1,5 +1,5 @@
 name    'puppetlabs-java'
-version '0.1.1'
+version '0.1.4'
 source 'git://github.com/puppetlabs/puppetlabs-java'
 author 'puppetlabs'
 license 'Apache'

manifests/init.pp

@@ -12,34 +12,22 @@
 #
 # [Remember: No empty lines between comments and class definition]
 class java(
-  $jre = false,
+  $distribution = 'jdk',
-  $jdk = true,
+  $version      = 'installed'
-  $version='1.6.0_25-fcs'
 ) {
 
   # Cannot pass anonymous arrays to functions in 2.6.8
-  $v_true_false = [ '^true$', '^false$' ]
+  $v_distribution = [ '^jre$', '^jdk$' ]
   # Must compare string values, not booleans.
-  validate_re("$jre", $v_true_false)
-  validate_re("$jdk", $v_true_false)
   validate_re($version, '^[._0-9a-zA-Z:-]+$')
+  validate_re($distribution, $v_distribution)
 
-  $jre_real     = $jre
-  $jdk_real     = $jdk
   $version_real      = $version
+  $distribution_real = $distribution
 
-  if $jre_real {
+  package { 'java':
-    class { 'java::jre_package':
+    ensure => $version_real,
-      version => $version_real,
+    name   => "${distribution_real}",
-      stage   => 'runtime',
-    }
-  }
-
-  if $jdk_real {
-    class { 'java::jdk_package':
-      version => $version_real,
-      stage   => 'runtime',
-    }
   }
 
 }

manifests/jdk_package.pp

@@ -1,29 +0,0 @@
-# Class: java:jdk_package
-#
-#   This class installs the Java JDK package
-#   produced from ./jdk-6u25-linux-x64-rpm.bin -x
-#
-#   This is the "Official" RPM distributed by Oracle
-#
-# Parameters:
-#
-# Actions:
-#
-# Requires:
-#
-# Sample Usage:
-#
-class java::jdk_package (
-  $version
-) {
-
-  validate_re($version, '^[._0-9a-zA-Z:-]+$')
-
-  $version_real = $version
-
-  package { 'jdk':
-    ensure => $version_real,
-    alias  => 'java',
-  }
-
-}

manifests/jre_package.pp

@@ -1,26 +0,0 @@
-# Class: java:jre_package
-#
-#   class description goes here.
-#
-# Parameters:
-#
-# Actions:
-#
-# Requires:
-#
-# Sample Usage:
-#
-class java::jre_package (
-  $version
-) {
-
-  validate_re($version, '^[._0-9a-zA-Z:-]+$')
-
-  $version_real = $version
-
-  package { 'jre':
-    ensure => $version_real,
-    alias  => 'java',
-  }
-
-}