Removed app/apis as a default empty dir since its automatically created when using script/generate web_service [DHH]

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

railties/CHANGELOG

@@ -1,6 +1,6 @@
 *SVN*
 
-* Trim down the default mimetypes in config/lighttpd.conf [sam]
+* Removed app/apis as a default empty dir since its automatically created when using script/generate web_service [DHH]
 
 * Added script/plugin to manage plugins (install, remove, list, etc) [Ryan Tomayko]
 
@@ -10,8 +10,6 @@
 
 * Added plugin generator to create a stub structure for a new plugin in vendor/plugins (see "script/generate plugin" for help) [DHH]
 
-* Added app/services as a default dir in the Rails skeleton and to the load path. Use it to keep classes like MaintenanceService and PaymentGateway [DHH]
-
 * Fixed scaffold generator when started with only 1 parameter #2609 [self@mattmower.com]
 
 * rake should run functional tests even if the unit tests have failures [Jim Weirich]

railties/README

@@ -25,21 +25,10 @@ Rails.  You can read more about Action Pack in
 link:files/vendor/rails/actionpack/README.html.
 
 
-== Requirements
-
-* Database and driver (MySQL, PostgreSQL, or SQLite)
-* Rake[http://rake.rubyforge.org] for running tests and the generating documentation
-
-== Optionals
-
-* Apache 1.3.x or 2.x or lighttpd 1.3.11+ (or any FastCGI-capable webserver with a
-  mod_rewrite-like module)
-* FastCGI (or mod_ruby) for better performance on Apache
-
 == Getting started
 
-1. Run the WEBrick servlet: <tt>ruby script/server</tt>
-   (run with --help for options)
+1. Run the WEBrick servlet: <tt>ruby script/server</tt> (run with --help for options)
+   ...or if you have lighttpd installed: <tt>ruby script/lighttpd</tt> (it's faster)
 2. Go to http://localhost:3000/ and get "Congratulations, you've put Ruby on Rails!"
 3. Follow the guidelines on the "Congratulations, you've put Ruby on Rails!" screen
 
@@ -65,33 +54,6 @@ through CGI, so no Apache restart is necessary for changes. All other requests
 goes through FCGI (or mod_ruby) that requires restart to show changes.
 
 
-== Example for lighttpd conf (with FastCGI)
-
-  server.port = 8080
-  server.bind = "127.0.0.1"
-  # server.event-handler = "freebsd-kqueue" # needed on OS X
-  
-  server.modules = ( "mod_rewrite", "mod_fastcgi" )
-  
-  url.rewrite = ( "^/$" => "index.html", "^([^.]+)$" => "$1.html" )
-  server.error-handler-404 = "/dispatch.fcgi"
-  
-  server.document-root = "/path/application/public"
-  server.errorlog      = "/path/application/log/server.log"
-  
-  fastcgi.server = ( ".fcgi" =>
-    ( "localhost" =>
-        (
-          "min-procs" => 1, 
-          "max-procs" => 5,
-          "socket"   => "/tmp/application.fcgi.socket",
-          "bin-path" => "/path/application/public/dispatch.fcgi",
-          "bin-environment" => ( "RAILS_ENV" => "development" )
-        )
-    )
-  )
-  
-
 == Debugging Rails
 
 Have "tail -f" commands running on both the server.log, production.log, and

railties/Rakefile

@@ -29,7 +29,7 @@ RUBY_FORGE_USER    = "webster132"
 
 
 BASE_DIRS   = %w( app config/environments components db doc log lib lib/tasks public script script/performance script/process test vendor vendor/plugins )
-APP_DIRS    = %w( apis models controllers helpers services views views/layouts )
+APP_DIRS    = %w( models controllers helpers views views/layouts )
 PUBLIC_DIRS = %w( images javascripts stylesheets )
 TEST_DIRS   = %w( fixtures unit functional mocks mocks/development mocks/test )
 

railties/lib/initializer.rb

@@ -393,9 +393,9 @@ module Rails
         paths.concat %w(
           app 
           app/models 
-          app/controllers 
-          app/helpers 
-          app/services 
+          app/controllers
+          app/helpers
+          app/services
           app/apis 
           components 
           config 

railties/lib/rails_generator/generators/applications/app/app_generator.rb

@@ -103,11 +103,9 @@ class AppGenerator < Rails::Generator::Base
   # Installation skeleton.  Intermediate directories are automatically
   # created so don't sweat their absence here.
   BASEDIRS = %w(
-    app/apis
     app/controllers
     app/helpers
     app/models
-    app/services
     app/views/layouts
     config/environments
     components