Update CHANGELOG for version 0.1.4

Merge branch 'bug/master/class_ordering'
* bug/master/class_ordering: Fix ordering issues with composed classes
2011-06-02 17:40:29 -07:00 · 2011-06-02 17:39:53 -07:00 · 2011-06-02 17:37:19 -07:00 · 2011-05-28 14:14:02 -07:00 · 2011-05-28 14:13:15 -07:00 · 2011-05-28 14:00:39 -07:00
5 changed files with 19 additions and 77 deletions
--- a/9
+++ b/9
@@ -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

--- a/2
+++ b/2
@@ -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'
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -12,34 +12,22 @@
 #
 # [Remember: No empty lines between comments and class definition]
 class java(
-  $jre = false,
-  $jdk = true,
-  $version='1.6.0_25-fcs'
+  $distribution = 'jdk',
+  $version      = 'installed'
 ) {

  # 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 {
-    class { 'java::jre_package':
-      version => $version_real,
-      stage   => 'runtime',
-    }
-  }
-
-  if $jdk_real {
-    class { 'java::jdk_package':
-      version => $version_real,
-      stage   => 'runtime',
-    }
+  package { 'java':
+    ensure => $version_real,
+    name   => "${distribution_real}",
  }

 }
--- a/manifests/jdk_package.pp
+++ b/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',
-  }
-
-}
--- a/manifests/jre_package.pp
+++ b/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',
-  }
-
-}
Author	SHA1	Message	Date
Jeff McCune	3b00510615	Update CHANGELOG for version 0.1.4	2011-06-02 17:40:29 -07:00
Jeff McCune	07ea32a90c	Merge branch 'bug/master/class_ordering' * bug/master/class_ordering: Fix ordering issues with composed classes	2011-06-02 17:39:53 -07:00
Jeff McCune	c503afd73e	Fix ordering issues with composed classes The top level java module was declaring classes depending on what Java distribution is required. Similar to the issues encountered with service and configuration class ordering, the composed classes did not have an established relationship with other things that require the module. This change brings all resources into a single top level java class and eliminates class composition within the module entirely.	2011-06-02 17:37:19 -07:00
Jeff McCune	cc1dd231e3	Update CHANGELOG for version 0.1.3	2011-05-28 14:14:02 -07:00
Jeff McCune	221a6d3dab	Merge branch 'bug/master/get_rid_of_stages' * bug/master/get_rid_of_stages: Remove stages from java module	2011-05-28 14:13:15 -07:00
Jeff McCune	7efde2db1e	Remove stages from java module The stages feature of stdlib is turning out to be more trouble than it's worth. Integrating the changes from Cody and Gary results in the entire mcollective class being in the main stage. We've already found is preferable to have stages after main rather than before to avoid dependency cycles. This only works if all modules use stages. The first module to not use stages will create a cycle if it requires and modules who do use stages and the stages come after main.	2011-05-28 14:00:39 -07:00
Jeff McCune	d93930d6e3	Update CHANGELOG to 0.1.2	2011-05-26 11:31:33 -07:00
Jeff McCune	b3eb1642ae	Merge branch 'comment/master/jre_vs_jdk' * comment/master/jre_vs_jdk: Change jre and jdk booleans to a single string	2011-05-26 11:31:23 -07:00
Jeff McCune	867f8c524a	Change jre and jdk booleans to a single string Dan raised the comment in the previous patch set that it doesn't make sense to provide two options and four states when there are really only two possibilities; install the jre or the jdk. This change removes the jdk and jre class parameters and replaces them with a single distribution parameters.	2011-05-26 11:29:17 -07:00