Merge branch 'loose_java'

paulczar · paulczar · commit 8431663a4999 · 2014-03-02T11:00:14.000-06:00
diff --git a/Berksfile b/Berksfile
@@ -3,6 +3,7 @@
 metadata
 
 cookbook 'rabbitmq', git: 'git://github.com/opscode-cookbooks/rabbitmq.git'
+cookbook 'java'
 
 group :test do
   cookbook 'minitest-handler', git: 'git://github.com/btm/minitest-handler-cookbook.git'
diff --git a/Vagrantfile b/Vagrantfile
@@ -5,6 +5,7 @@
 log_level = :info
 
 chef_run_list = %w[
+        java::default
         logstash::server
         logstash::agent
 ]
diff --git a/recipes/agent.rb b/recipes/agent.rb
@@ -4,7 +4,6 @@
 # Recipe:: agent
 #
 #
-include_recipe 'java::default'
 include_recipe 'logstash::default'
 include_recipe 'yum::default'
 
diff --git a/recipes/server.rb b/recipes/server.rb
@@ -10,7 +10,6 @@
 #
 #
 
-include_recipe 'java'
 include_recipe 'logstash::default'
 include_recipe 'logrotate'
 
diff --git a/recipes/source.rb b/recipes/source.rb
@@ -1,6 +1,5 @@
 # Encoding: utf-8
 include_recipe 'build-essential'
-include_recipe 'java'
 include_recipe 'ant'
 include_recipe 'git'
 include_recipe 'logstash::default'
diff --git a/recipes/zero_mq_repo.rb b/recipes/zero_mq_repo.rb
@@ -4,7 +4,6 @@
 # Recipe:: zero_mq_repo
 #
 #
-include_recipe 'java::default'
 include_recipe 'yum::default'
 
 major_version = node['platform_version'].split('.').first.to_i

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@`
`4`	`4`	`# Recipe:: agent`
`5`	`5`	`#`
`6`	`6`	`#`
`7`		`-include_recipe 'java::default'`
`8`	`7`	`include_recipe 'logstash::default'`
`9`	`8`	`include_recipe 'yum::default'`
`10`	`9`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,6 @@`
`10`	`10`	`#`
`11`	`11`	`#`
`12`	`12`
`13`		`-include_recipe 'java'`
`14`	`13`	`include_recipe 'logstash::default'`
`15`	`14`	`include_recipe 'logrotate'`
`16`	`15`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@`
`4`	`4`	`# Recipe:: zero_mq_repo`
`5`	`5`	`#`
`6`	`6`	`#`
`7`		`-include_recipe 'java::default'`
`8`	`7`	`include_recipe 'yum::default'`
`9`	`8`
`10`	`9`	`major_version = node['platform_version'].split('.').first.to_i`