@@ -11,28 +11,14 @@ RAILS_GEM_VERSION = '2.3.0' unless defined? RAILS_GEM_VERSION require File.join(File.dirname(__FILE__), 'boot') Rails::Initializer.run do |config| - # Settings in config/environments/* take precedence over those specified here. - # Application configuration should go into files in config/initializers - # -- all .rb files in that directory are automatically loaded. - # See Rails::Configuration for more options. - - # Skip frameworks you're not going to use. To use Rails without a database - # you must remove the Active Record framework. - # config.frameworks -= [ :active_record, :active_resource, :action_mailer ] # Specify gems that this application depends on. # They can then be installed with "rake gems:install" on new installations. - # config.gem "bj" - # config.gem "hpricot", :version => '0.6', :source => "http://code.whytheluckystiff.net" - # config.gem "aws-s3", :lib => "aws/s3" - - # Only load the plugins named here, in the order given. By default, all plugins - # in vendor/plugins are loaded in alphabetical order. - # :all can be used as a placeholder for all plugins not explicitly named - # config.plugins = [ :exception_notification, :ssl_requirement, :all ] - - # Add additional load paths for your own custom dirs - # config.load_paths += %W( #{RAILS_ROOT}/extras ) + # + # Instead of using the git submodule with the declarative_authorization plugin + # in vendor/plugins/declarative_authorization, you may also use the plugin's + # gem: + #config.gem "stffn-declarative_authorization", :lib => "declarative_authorization" # Force all environments to use the same logger level # (by default production uses :info, the others :debug) config/environment.rb @@ -3,7 +3,7 @@ require File.expand_path(File.dirname(__FILE__) + "/../config/environment") require 'test_help' # For declarative_authorization test helpers require File.expand_path(File.dirname(__FILE__) + - "/../vendor/plugins/declarative_authorization/lib/maintenance") + "/../vendor/plugins/declarative_authorization/lib/declarative_authorization/maintenance") class ActiveSupport::TestCase # We need to include the declarative_authorization helpers test/test_helper.rb @@ -1 +1 @@ -Subproject commit 0f9ecaeaaa2b28840591587cc29cf155309480a6 +Subproject commit fd1276c0408fc44818ada0c45529bad313845470 vendor/plugins/declarative_authorization 080cf0c3340e86d9838197d7aa40a893f07f2521 Steffen Bartsch sbartsch@tzi.org http://github.com/stffn/decl_auth_demo_app/commit/c8b15151f4f74951b14571219673956375dfdf3a c8b15151f4f74951b14571219673956375dfdf3a 2009-03-05T12:42:00-08:00 2009-03-05T12:42:00-08:00 Necessary modifications for decl_auth lib tree restructuring b91c393ec9bbd7bb7c60e9056bfb8c84d30fb4df Steffen Bartsch sbartsch@tzi.org