You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by as...@apache.org on 2008/11/19 00:33:19 UTC
svn commit: r718788 - in /ode/sandbox/singleshot: config/environment.rb
config/environments/development.rb config/environments/production.rb
lib/tasks/setup.rake
Author: assaf
Date: Tue Nov 18 15:33:19 2008
New Revision: 718788
URL: http://svn.apache.org/viewvc?rev=718788&view=rev
Log:
Upgraded to Rails 2.2 RC1
Modified:
ode/sandbox/singleshot/config/environment.rb
ode/sandbox/singleshot/config/environments/development.rb
ode/sandbox/singleshot/config/environments/production.rb
ode/sandbox/singleshot/lib/tasks/setup.rake
Modified: ode/sandbox/singleshot/config/environment.rb
URL: http://svn.apache.org/viewvc/ode/sandbox/singleshot/config/environment.rb?rev=718788&r1=718787&r2=718788&view=diff
==============================================================================
--- ode/sandbox/singleshot/config/environment.rb (original)
+++ ode/sandbox/singleshot/config/environment.rb Tue Nov 18 15:33:19 2008
@@ -36,6 +36,8 @@
# config.load_paths += %W( #{RAILS_ROOT}/extras )
config.time_zone = 'UTC'
+
+ config.action_controller.use_accept_header = true
config.action_controller.session = {
:session_key => '_singleshot_session',
:secret => File.read("#{Rails.root}/secret.key")
@@ -45,7 +47,6 @@
config.active_record.partial_updates = true
# config.active_record.observers = :cacher, :garbage_collector
-
# These settings change the behavior of Rails 2 apps and will be defaults
# for Rails 3. You can remove this initializer when Rails 3 is released.
config.active_record.include_root_in_json = true
Modified: ode/sandbox/singleshot/config/environments/development.rb
URL: http://svn.apache.org/viewvc/ode/sandbox/singleshot/config/environments/development.rb?rev=718788&r1=718787&r2=718788&view=diff
==============================================================================
--- ode/sandbox/singleshot/config/environments/development.rb (original)
+++ ode/sandbox/singleshot/config/environments/development.rb Tue Nov 18 15:33:19 2008
@@ -20,7 +20,6 @@
config.action_view.debug_rjs = true
config.action_controller.perform_caching = false
config.action_mailer.raise_delivery_errors = false
-config.action_controller.allow_concurrency = true
# These Gems are used exclusively during development/testing, they're listed here
@@ -30,4 +29,4 @@
config.gem 'rspec-rails', :lib=>false, :version=>'1.1.8'
config.gem 'faker', :lib=>false, :version=>'~>0.3' # Faker: Used to populate development database with fake data.
config.gem 'thin', :lib=>false, :version=>'~>1.0' # Thin: Not essential, but development scripts (e.g. rake run) are hard wired to use Thin.
-config.gem 'sqlite3-ruby', :lib=>'sqlite3', :version=>'~>1.2' # SQLite3: Development and test databases use SQLite3 by default.
\ No newline at end of file
+config.gem 'sqlite3-ruby', :lib=>'sqlite3', :version=>'~>1.2' # SQLite3: Development and test databases use SQLite3 by default.
Modified: ode/sandbox/singleshot/config/environments/production.rb
URL: http://svn.apache.org/viewvc/ode/sandbox/singleshot/config/environments/production.rb?rev=718788&r1=718787&r2=718788&view=diff
==============================================================================
--- ode/sandbox/singleshot/config/environments/production.rb (original)
+++ ode/sandbox/singleshot/config/environments/production.rb Tue Nov 18 15:33:19 2008
@@ -18,8 +18,17 @@
config.action_controller.consider_all_requests_local = false
config.action_controller.perform_caching = true
config.action_view.cache_template_loading = true
-
+
# config.cache_store = :mem_cache_store
# config.action_controller.asset_host = "http://assets.example.com"
# config.action_mailer.raise_delivery_errors = false
+
+
+# Setting this flag allows concurrent requests handling, useful for JRuby in
+# production, not so much anywhere else. We do support it, so pay attention.
+# Automatic loading doesn't work well since require is not atomic, so pay
+# attention and require everything during initialization, specifically everything
+# in lib (Rails takes care of app and plugins).
+config.threadsafe!
+config.eager_load_paths << "#{RAILS_ROOT}/lib"
Modified: ode/sandbox/singleshot/lib/tasks/setup.rake
URL: http://svn.apache.org/viewvc/ode/sandbox/singleshot/lib/tasks/setup.rake?rev=718788&r1=718787&r2=718788&view=diff
==============================================================================
--- ode/sandbox/singleshot/lib/tasks/setup.rake (original)
+++ ode/sandbox/singleshot/lib/tasks/setup.rake Tue Nov 18 15:33:19 2008
@@ -17,7 +17,7 @@
require 'rails_generator/secret_key_generator'
task 'secret.key' do |task|
- secret = Rails::SecretKeyGenerator.new(ENV['ID']).generate_secret
+ secret = ActiveSupport::SecureRandom.hex(64)
File.open task.name, 'w' do |file|
file.write secret
end