Switch debian/ubuntu Java package to openjdk, preseed unnecessary, and don't install ant by default

jtimberman · jtimberman · commit 9bd8032d7a2a · 2010-05-04T17:57:12.000-06:00
diff --git a/metadata.rb b/metadata.rb
@@ -3,8 +3,8 @@
 license           "Apache 2.0"
 description       "Installs java"
 long_description  IO.read(File.join(File.dirname(__FILE__), 'README.rdoc'))
-version           "0.9"
+version           "0.10.0"
 
-%w{ debian ubuntu }.each do |os|
+%w{ debian ubuntu redhat centos fedora }.each do |os|
   supports os
 end
diff --git a/recipes/default.rb b/recipes/default.rb
@@ -19,28 +19,14 @@
 
 java_pkg = value_for_platform(
   [ "ubuntu", "debian" ] => {
-    "default" => "sun-java6-jdk"
+    "default" => "openjdk-6-jre-headless"
   },
   [ "redhat", "centos", "fedora" ] => {
     "default" => "java-1.6.0-openjdk"
   },
-  "default" => "sun-java6-jdk"
+  "default" => "openjdk-6-jre-headless"
 )
 
-execute "update-java-alternatives" do
-  command "update-java-alternatives --jre-headless -s java-6-sun"
-  only_if do platform?("ubuntu", "debian") end
-  ignore_failure true
-  returns 0
-  action :nothing
-end
-
 package java_pkg do
   action :install
-  if platform?("ubuntu", "debian")
-    response_file "java.seed"
-    notifies :run, resources(:execute => "update-java-alternatives"), :immediately
-  end
 end
-
-package "ant"
