Ruby on Rails | Screencasts | Download | Documentation | Weblog | Community | Source

Changeset 625

Show
Ignore:
Timestamp:
02/15/05 16:15:02 (4 years ago)
Author:
david
Message:

All libraries should link against the independent active support

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/actionpack/lib/action_controller

    • Property svn:externals deleted

  • trunk/actionpack/lib/action_controller.rb

    r624 r625  
    2525 
    2626begin 
    27   require 'active_support/core_ext' 
    28   require 'active_support/clean_logger' 
    29   require 'active_support/misc' 
    30   require 'active_support/dependencies' 
     27  require 'active_support' 
    3128rescue LoadError 
    3229  require 'rubygems' 
    3330  require_gem 'activesupport' 
    34    
    35   require 'active_support/core_ext' 
    36   require 'active_support/clean_logger' 
    37   require 'active_support/misc' 
    38   require 'active_support/dependencies' 
    3931end 
    4032 

  • trunk/activerecord/lib/active_record

    • Property svn:externals deleted

  • trunk/activerecord/lib/active_record.rb

    r624 r625  
    2626 
    2727begin 
    28   require 'active_support/core_ext' 
    29   require 'active_support/clean_logger' 
    30   require 'active_support/misc' 
    31   require 'active_support/dependencies' 
     28  require 'active_support' 
    3229rescue LoadError 
    3330  require 'rubygems' 
    3431  require_gem 'activesupport' 
    35    
    36   require 'active_support/core_ext' 
    37   require 'active_support/clean_logger' 
    38   require 'active_support/misc' 
    39   require 'active_support/dependencies' 
    4032end 
    4133 

  • trunk/railties/environments/shared_for_gem.rb

    r617 r625  
    2626# Require Rails gems. 
    2727require 'rubygems' 
     28require_gem 'activesupport' 
    2829require_gem 'activerecord' 
    2930require_gem 'actionpack' 

  • trunk/railties/environments/shared.rb

    r624 r625  
    3131 
    3232# Require Rails libraries. 
     33require 'active_support' 
    3334require 'active_record' 
    3435require 'action_controller' 

  • trunk/railties/lib/dispatcher.rb

    r617 r625  
    2525 
    2626class Dispatcher 
    27   class <<self 
     27  class << self 
    2828    def dispatch(cgi = CGI.new, session_options = ActionController::CgiRequest::DEFAULT_SESSION_OPTIONS) 
    2929      begin 

  • trunk/railties/lib/rails_generator.rb

    r624 r625  
    2424$:.unshift(File.dirname(__FILE__)) 
    2525 
    26 require 'active_support/core_ext' 
    27  
     26require 'active_support' 
    2827 
    2928require 'rails_generator/base' 

  • trunk/railties/lib/rails_generator/base.rb

    r624 r625  
    1 require 'active_support/class_attribute_accessors' 
    2 require 'active_support/inflector' 
    31require File.dirname(__FILE__) + '/options' 
    42require File.dirname(__FILE__) + '/manifest' 

  • trunk/railties/lib/rails_generator/options.rb

    r624 r625  
    11require 'optparse' 
    2 require 'active_support/class_inheritable_attributes' 
    32 
    43module Rails