From c503afd73eb9f7f77fa52eac08648fe65e94dc57 Mon Sep 17 00:00:00 2001
From: Jeff McCune <jeff@puppetlabs.com>
Date: Thu, 2 Jun 2011 17:37:19 -0700
Subject: [PATCH] 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.
---
 manifests/init.pp        | 14 +++-----------
 manifests/jdk_package.pp | 29 -----------------------------
 manifests/jre_package.pp | 26 --------------------------
 3 files changed, 3 insertions(+), 66 deletions(-)
 delete mode 100644 manifests/jdk_package.pp
 delete mode 100644 manifests/jre_package.pp

diff --git a/manifests/init.pp b/manifests/init.pp
index 8ea22c4..b009bf8 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -25,17 +25,9 @@ class java(
   $version_real      = $version
   $distribution_real = $distribution
 
-  case $distribution_real {
-    jre: {
-      class { 'java::jre_package':
-        version => $version_real,
-      }
-    }
-    jdk: {
-      class { 'java::jdk_package':
-        version => $version_real,
-      }
-    }
+  package { 'java':
+    ensure => $version_real,
+    name   => "${distribution_real}",
   }
 
 }
diff --git a/manifests/jdk_package.pp b/manifests/jdk_package.pp
deleted file mode 100644
index 2ff72a2..0000000
--- a/manifests/jdk_package.pp
+++ /dev/null
@@ -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',
-  }
-
-}
diff --git a/manifests/jre_package.pp b/manifests/jre_package.pp
deleted file mode 100644
index 0405a8c..0000000
--- a/manifests/jre_package.pp
+++ /dev/null
@@ -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',
-  }
-
-}