Merge branch 'CHEF-984' of git://github.com/tfheen/chef into tfheen/CHEF-984

adamhjk · adamhjk · commit d7fe6a060a38 · 2010-02-26T15:43:49.000-08:00
diff --git a/chef-solr/lib/chef/solr/application/solr.rb b/chef-solr/lib/chef/solr/application/solr.rb
@@ -150,7 +150,7 @@ def run_application
 end
 Dir.chdir(Chef::Config[:solr_jetty_path]) do
 command = "java -Xmx#{Chef::Config[:solr_heap_size]} -Xms#{Chef::Config[:solr_heap_size]}"
- command << " -Dsolr.solr.data=#{Chef::Config[:solr_data_path]}"
+ command << " -Dsolr.data.dir=#{Chef::Config[:solr_data_path]}"
 command << " -Dsolr.solr.home=#{Chef::Config[:solr_home_path]}"
 command << " #{Chef::Config[:solr_java_opts]}" if Chef::Config[:solr_java_opts]
 command << " -jar #{File.join(Chef::Config[:solr_jetty_path], 'start.jar')}"

-Original file line number
+Diff line change
 end
 Dir.chdir(Chef::Config[:solr_jetty_path])do
 command="java -Xmx#{Chef::Config[:solr_heap_size]} -Xms#{Chef::Config[:solr_heap_size]}"
 -command << " -Dsolr.solr.data=#{Chef::Config[:solr_data_path]}"
 +command << " -Dsolr.data.dir=#{Chef::Config[:solr_data_path]}"
 command << " -Dsolr.solr.home=#{Chef::Config[:solr_home_path]}"
 command << " #{Chef::Config[:solr_java_opts]}"ifChef::Config[:solr_java_opts]
 command << " -jar #{File.join(Chef::Config[:solr_jetty_path],'start.jar')}"