Include Active Resource instead of Action Web Service [DHH]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6550 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

4 files changed, 15 insertions, 10 deletions

diff --git a/railties/CHANGELOG b/railties/CHANGELOG
index 73378b9c4e..e607c0a2fc 100644
--- a/railties/CHANGELOG
+++ b/railties/CHANGELOG
@@ -1,5 +1,11 @@
 *SVN*
 
+* Include Active Resource instead of Action Web Service [DHH] You can add AWS back with this in config/environment.rb:
+
+    config.load_paths += %W( #{RAILS_ROOT}/vendor/rails/actionwebservice/lib )
+  
+  ...or just gem 'actionwebservice'
+
 * Give generate scaffold a more descriptive database message.  Closes #7316 [jeremymcanally]
 
 * Canonicalize RAILS_ROOT by using File.expand_path on Windows, which doesn't have to worry about symlinks, and Pathname#realpath elsewhere, which respects symlinks in relative paths but is incompatible with Windows.  #6755 [Jeremy Kemper, trevor]
diff --git a/railties/Rakefile b/railties/Rakefile
index da79ea9963..598eabb396 100644
--- a/railties/Rakefile
+++ b/railties/Rakefile
@@ -313,7 +313,7 @@ spec = Gem::Specification.new do |s|
   s.add_dependency('activerecord',     '= 1.15.3' + PKG_BUILD)
   s.add_dependency('actionpack',       '= 1.13.3' + PKG_BUILD)
   s.add_dependency('actionmailer',     '= 1.3.3' + PKG_BUILD)
-  s.add_dependency('actionwebservice', '= 1.2.3' + PKG_BUILD)
+  s.add_dependency('actionresource',   '= 0.9.0' + PKG_BUILD)
 
   s.rdoc_options << '--exclude' << '.'
   s.has_rdoc = false
diff --git a/railties/environments/environment.rb b/railties/environments/environment.rb
index 05403ad88a..2e485a5738 100644
--- a/railties/environments/environment.rb
+++ b/railties/environments/environment.rb
@@ -14,7 +14,7 @@ Rails::Initializer.run do |config|
   # Settings in config/environments/* take precedence over those specified here
   
   # Skip frameworks you're not going to use (only works if using vendor/rails)
-  # config.frameworks -= [ :action_web_service, :action_mailer ]
+  # config.frameworks -= [ :active_resource, :action_mailer ]
 
   # Only load the plugins named here, by default all plugins in vendor/plugins are loaded
   # config.plugins = %W( exception_notification ssl_requirement )
diff --git a/railties/lib/initializer.rb b/railties/lib/initializer.rb
index b391be6acc..577a3c88f1 100644
--- a/railties/lib/initializer.rb
+++ b/railties/lib/initializer.rb
@@ -23,7 +23,7 @@ module Rails
   # through the block running:
   #
   #   Rails::Initializer.run do |config|
-  #     config.frameworks -= [ :action_web_service ]
+  #     config.frameworks -= [ :action_mailer ]
   #   end
   #
   # This will use the default configuration options from Rails::Configuration,
@@ -379,12 +379,12 @@ module Rails
     # A stub for setting options on ActionView::Base
     attr_accessor :action_view
 
-    # A stub for setting options on ActionWebService::Base
-    attr_accessor :action_web_service
-
     # A stub for setting options on ActiveRecord::Base
     attr_accessor :active_record
 
+    # A stub for setting options on ActiveRecord::Base
+    attr_accessor :active_resource
+
     # Whether or not to use the breakpoint server (boolean)
     attr_accessor :breakpoint_server
 
@@ -560,8 +560,8 @@ module Rails
         actionpack/lib
         activesupport/lib
         activerecord/lib
+        activeresource/lib
         actionmailer/lib
-        actionwebservice/lib
       ).map { |dir| "#{framework_root_path}/#{dir}" }.select { |dir| File.directory?(dir) }
     end
 
@@ -571,7 +571,7 @@ module Rails
       end
 
       def default_frameworks
-        [ :active_record, :action_controller, :action_view, :action_mailer, :action_web_service ]
+        [ :active_record, :action_controller, :action_view, :action_mailer, :active_resource ]
       end
 
       def default_load_paths
@@ -590,7 +590,6 @@ module Rails
           app/controllers
           app/helpers
           app/services
-          app/apis
           components
           config
           lib
@@ -694,4 +693,4 @@ class Rails::OrderedOptions < Array #:nodoc:
       self.each { |i| return i if i.first == key }
       return false
     end
-end
+end
\ No newline at end of file