lib/active_support.rb in activesupport-1.4.4 vs lib/active_support.rb in activesupport-2.0.0

@@ -20,25 +20,30 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
 
 $:.unshift(File.dirname(__FILE__))
-$:.unshift(File.dirname(__FILE__) + "/active_support/vendor")
 
-require 'builder'
-
+require 'active_support/vendor'
+require 'active_support/basic_object'
 require 'active_support/inflector'
 
 require 'active_support/core_ext'
+
 require 'active_support/clean_logger'
+require 'active_support/buffered_logger'
+
 require 'active_support/dependencies'
-require 'active_support/reloadable'
 require 'active_support/deprecation'
 
 require 'active_support/ordered_options'
 require 'active_support/option_merger'
 
 require 'active_support/values/time_zone'
+require 'active_support/duration'
 
 require 'active_support/json'
 
 require 'active_support/multibyte'
+
+require 'active_support/testing'
+