Merge branch 'bug/master/class_ordering'

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

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}",
   }
 
 }

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',
-  }
-
-}