[COOK-2903] - move java_home resources to their own recipe

Author: jtimberman

recipes/openjdk.rb

@@ -35,21 +35,7 @@
   "default" => ["openjdk-#{jdk_version}-jdk"]
   )
 
-# done by special request for rberger
-ruby_block  "set-env-java-home" do
-  block do
-    ENV["JAVA_HOME"] = java_home
-  end
-  not_if { ENV["JAVA_HOME"] == java_home }
-end
-
-file "/etc/profile.d/jdk.sh" do
-  content <<-EOS
-    export JAVA_HOME=#{node['java']['java_home']}
-  EOS
-  mode 0755
-end
-
+include_recipe "java::set_java_home"
 
 if platform?("ubuntu","debian","redhat","centos","fedora","scientific","amazon","oracle")
   ruby_block "update-java-alternatives" do

recipes/oracle.rb

@@ -42,20 +42,7 @@
   Chef::Application.fatal!("You must change the download link to your private repository. You can no longer download java directly from http://download.oracle.com without a web broswer")
 end
 
-ruby_block  "set-env-java-home" do
-  block do
-    ENV["JAVA_HOME"] = java_home
-  end
-  not_if { ENV["JAVA_HOME"] == java_home }
-end
-
-file "/etc/profile.d/jdk.sh" do
-  content <<-EOS
-    export JAVA_HOME=#{node['java']['java_home']}
-  EOS
-  mode 0755
-end
-
+include_recipe "java::set_java_home"
 
 java_ark "jdk" do
   url tarball_url

recipes/oracle_i386.rb

@@ -30,12 +30,7 @@
   bin_cmds = node['java']['jdk']['7']['bin_cmds']
 end
 
-ruby_block  "set-env-java-home" do
-  block do
-    ENV["JAVA_HOME"] = java_home
-  end
-  not_if { ENV["JAVA_HOME"] == java_home }
-end
+include_recipe "java::set_java_home"
 
 yum_package "glibc" do
   arch "i686"
@@ -45,7 +40,7 @@
 java_ark "jdk-alt" do
   url tarball_url
   checksum tarball_checksum
-  app_home java_home 
+  app_home java_home
   bin_cmds bin_cmds
   action :install
   default false

recipes/set_java_home.rb

@@ -0,0 +1,35 @@
+# Author:: Joshua Timberman (<[email protected]>)
+# Cookbook Name:: java
+# Recipe:: set_java_home
+#
+# Copyright 2013, Opscode, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+ruby_block  "set-env-java-home" do
+  block do
+    ENV["JAVA_HOME"] = node['java']['java_home']
+  end
+  not_if { ENV["JAVA_HOME"] == node['java']['java_home'] }
+end
+
+directory "/etc/profile.d" do
+  mode 00755
+end
+
+file "/etc/profile.d/jdk.sh" do
+  content <<-EOS.gsub(/^\s+/, '')
+    export JAVA_HOME=#{node['java']['java_home']}
+  EOS
+  mode 00755
+end