From d41b2bccb3e357ce4bbbed8dca4a9f50e90e8d92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Frering?= <loic.frering@gmail.com>
Date: Thu, 24 May 2012 00:27:51 +0200
Subject: [PATCH 1/2] Add basic recipes for openjdk6 and openjdk7.

---
 ci_environment/java/recipes/openjdk6.rb | 17 +++++++++++++++++
 ci_environment/java/recipes/openjdk7.rb | 17 +++++++++++++++++
 2 files changed, 34 insertions(+)
 create mode 100644 ci_environment/java/recipes/openjdk6.rb
 create mode 100644 ci_environment/java/recipes/openjdk7.rb

diff --git a/ci_environment/java/recipes/openjdk6.rb b/ci_environment/java/recipes/openjdk6.rb
new file mode 100644
index 000000000..19904aa2d
--- /dev/null
+++ b/ci_environment/java/recipes/openjdk6.rb
@@ -0,0 +1,17 @@
+version = 6
+
+pkgs = value_for_platform(
+  ["centos","redhat","fedora","scientific","amazon"] => {
+    "default" => ["java-1.#{version}.0-openjdk","java-1.#{version}.0-openjdk-devel"]
+  },
+  ["arch","freebsd"] => {
+    "default" => ["openjdk#{version}"]
+  },
+  "default" => ["openjdk-#{version}-jdk"]
+)
+
+pkgs.each do |pkg|
+  package pkg do
+    action :install
+  end
+end
diff --git a/ci_environment/java/recipes/openjdk7.rb b/ci_environment/java/recipes/openjdk7.rb
new file mode 100644
index 000000000..32dea967e
--- /dev/null
+++ b/ci_environment/java/recipes/openjdk7.rb
@@ -0,0 +1,17 @@
+version = 7
+
+pkgs = value_for_platform(
+  ["centos","redhat","fedora","scientific","amazon"] => {
+    "default" => ["java-1.#{version}.0-openjdk","java-1.#{version}.0-openjdk-devel"]
+  },
+  ["arch","freebsd"] => {
+    "default" => ["openjdk#{version}"]
+  },
+  "default" => ["openjdk-#{version}-jdk"]
+)
+
+pkgs.each do |pkg|
+  package pkg do
+    action :install
+  end
+end

From 4f979c350b339c2d8e9e917971791103c1a9462d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Frering?= <loic.frering@gmail.com>
Date: Thu, 24 May 2012 01:08:02 +0200
Subject: [PATCH 2/2] Add a basic java::multi recipe.

---
 ci_environment/java/attributes/default.rb | 2 ++
 ci_environment/java/recipes/multi.rb      | 4 ++++
 2 files changed, 6 insertions(+)
 create mode 100644 ci_environment/java/recipes/multi.rb

diff --git a/ci_environment/java/attributes/default.rb b/ci_environment/java/attributes/default.rb
index 420eebb19..e09326052 100644
--- a/ci_environment/java/attributes/default.rb
+++ b/ci_environment/java/attributes/default.rb
@@ -27,3 +27,5 @@
 else
   set['java']['java_home'] = "/usr/lib/jvm/default-java"
 end
+
+default[:java][:multi][:versions] = ["openjdk6", "openjdk7", "oraclejdk7"]
diff --git a/ci_environment/java/recipes/multi.rb b/ci_environment/java/recipes/multi.rb
new file mode 100644
index 000000000..4874b7bb6
--- /dev/null
+++ b/ci_environment/java/recipes/multi.rb
@@ -0,0 +1,4 @@
+node['java']['multi']['versions'].each do |java_version|
+  Chef::Log.info("Installing Java #{java_version}.")
+  include_recipe "java::#{java_version}"
+end