Re-version from 1.0.1 to 0.1.1 for semver

* feature/master/XXXX_validation:
  Fixup validation for Puppet 2.6.8
  Add basic validation to class parameters

.gitignore

@@ -1 +1,2 @@
 pkg/
+.DS_Store

CHANGELOG

@@ -1,2 +1,11 @@
+2011-05-25 Jeff McCune <jeff@puppetlabs.com> - 0.1.1
+* Re-did versioning to follow semantic versioning
+
+2011-05-25 Jeff McCune <jeff@puppetlabs.com> - 1.0.1
+* Add validation of class parameters
+
+2011-05-24 Jeff McCune <jeff@puppetlabs.com> - 1.0.0
+* Default to JDK version 6u25
+
 2011-05-24 Jeff McCune <jeff@puppetlabs.com> - 0.0.1
 * Initial release

Modulefile

@@ -1,5 +1,5 @@
 name    'puppetlabs-java'
-version '0.0.1'
+version '0.1.1'
 source 'git://github.com/puppetlabs/puppetlabs-java'
 author 'puppetlabs'
 license 'Apache'
@@ -8,4 +8,4 @@ description 'Manage the official Java runtime'
 project_page 'https://github.com/puppetlabs/puppetlabs-java'
 
 ## Add dependencies, if any:
-dependency 'puppetlabs/stdlib', '>= 0.1.2'
+dependency 'puppetlabs/stdlib', '>= 0.1.3'

README.markdown

@@ -4,3 +4,13 @@ Manage the Java runtime for use with other application software.
 
 Currently this simply deploys the package on Enterprise Linux based systems.
 
+The Java runtime this module is designed to configure are the RPM's provided by Oracle and obtained by extracting them from the "bin" installers.
+
+For example:
+
+    ./jdk-6u25-linux-x64-rpm.bin -x
+
+Please download the installer from:
+
+ * [Java Downloads](http://www.oracle.com/technetwork/java/javase/downloads/jdk-6u25-download-346242.html)
+

manifests/init.pp

@@ -12,14 +12,34 @@
 #
 # [Remember: No empty lines between comments and class definition]
 class java(
+  $jre = false,
+  $jdk = true,
   $version='1.6.0_25-fcs'
 ) {
 
+  # Cannot pass anonymous arrays to functions in 2.6.8
+  $v_true_false = [ '^true$', '^false$' ]
+  # 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:-]+$')
+
+  $jre_real     = $jre
+  $jdk_real     = $jdk
   $version_real = $version
 
-  class { 'java::jre_package':
+  if $jre_real {
-    version => $version_real,
+    class { 'java::jre_package':
-    stage   => 'runtime',
+      version => $version_real,
+      stage   => 'runtime',
+    }
+  }
+
+  if $jdk_real {
+    class { 'java::jdk_package':
+      version => $version_real,
+      stage   => 'runtime',
+    }
   }
 
 }

manifests/jdk_package.pp

@@ -0,0 +1,29 @@
+# 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

@@ -11,11 +11,16 @@
 # Sample Usage:
 #
 class java::jre_package (
-  $version='1.6.0_25-fcs'
+  $version
 ) {
-  # statements
+
+  validate_re($version, '^[._0-9a-zA-Z:-]+$')
+
+  $version_real = $version
+
   package { 'jre':
     ensure => $version_real,
     alias  => 'java',
   }
+
 }