From a81307c477ace33f6b69e14b5e544d86c96ce513 Mon Sep 17 00:00:00 2001
From: James Conroy-Finn <james@logi.cl>
Date: Wed, 12 Nov 2014 19:45:02 +0000
Subject: [PATCH] Move Java tasks into a new Java role

---
 dotfiles.yml                 |  1 +
 roles/clojure/tasks/main.yml | 15 --------------
 roles/java/tasks/main.yml    | 38 ++++++++++++++++++++++++++++++++++++
 3 files changed, 39 insertions(+), 15 deletions(-)
 create mode 100644 roles/java/tasks/main.yml

diff --git a/dotfiles.yml b/dotfiles.yml
index 6c2cf2ba..24e0acaf 100644
--- a/dotfiles.yml
+++ b/dotfiles.yml
@@ -10,6 +10,7 @@
     - { role: vim, tags: ['vim'] }
     - { role: ssh, tags: ['ssh'] }
     - { role: code, tags: ['code'] }
+    - { role: java, tags: ['java'] }
     - { role: clojure, tags: ['clojure'] }
     - { role: erlang, tags: ['erlang'] }
     - { role: haskell, tags: ['haskell'] }
diff --git a/roles/clojure/tasks/main.yml b/roles/clojure/tasks/main.yml
index dd2d5f88..c69f4161 100644
--- a/roles/clojure/tasks/main.yml
+++ b/roles/clojure/tasks/main.yml
@@ -1,19 +1,4 @@
 ---
-- name: Install jenv
-  git: >
-    repo=git://github.com/gcuisinier/jenv.git
-    dest=~/.jenv
-  tags: update
-
-- name: Register all JVMs
-  shell: 'jenv add {{ item }}/Contents/Home'
-  with_fileglob:
-    - /Library/Java/JavaVirtualMachines/*
-
-- name: Set current JVM
-  shell: 'jenv global {{ dotfiles.jvm.version }}'
-  ignore_errors: yes
-
 - name: Create ~/.bin
   file: dest=~/.bin state=directory
 
diff --git a/roles/java/tasks/main.yml b/roles/java/tasks/main.yml
new file mode 100644
index 00000000..b0d96a54
--- /dev/null
+++ b/roles/java/tasks/main.yml
@@ -0,0 +1,38 @@
+---
+- name: Install jenv
+  git: >
+    repo=git://github.com/gcuisinier/jenv.git
+    dest=~/.jenv
+  tags: update
+
+# From http://support.apple.com/kb/dl1572
+- name: Install Java 6
+  mac_pkg: >
+    pkg_name=com.apple.pkg.JavaForMacOSX107 pkg_version=1.0.0.0.1.1247562015
+    url=http://support.apple.com/downloads/DL1572/en_US/JavaForOSX2013-05.dmg
+    archive_type=dmg archive_path=JavaForOSX.pkg
+
+- name: Install Java 7
+  mac_pkg: >
+    pkg_name=com.oracle.jdk7u51 pkg_version=1.1
+    url=http://download.oracle.com/otn-pub/java/jdk/7u51-b13/jdk-7u51-macosx-x64.dmg
+    curl_opts="-L --cookie oraclelicense=accept-securebackup-cookie"
+    archive_type=dmg archive_path='JDK 7 Update 51.pkg'
+  sudo: yes
+
+- name: Install Java 8
+  mac_pkg: >
+    pkg_name=com.oracle.jdk8u25 pkg_version=1.1
+    url=http://download.oracle.com/otn-pub/java/jdk/8u25-b17/jdk-8u25-macosx-x64.dmg
+    curl_opts="-L --cookie oraclelicense=accept-securebackup-cookie"
+    archive_type=dmg archive_path='JDK 8 Update 25.pkg'
+  sudo: yes
+
+- name: Register all JVMs
+  shell: 'jenv add {{ item }}/Contents/Home'
+  with_fileglob:
+    - /Library/Java/JavaVirtualMachines/*
+
+- name: Set current JVM
+  shell: 'jenv global {{ dotfiles.jvm.version }}'
+  ignore_errors: yes