Pulled the gateway.cgi until we can make it work properly out the gates

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

3 files changed, 6 insertions, 8 deletions

diff --git a/railties/CHANGELOG b/railties/CHANGELOG
index 3b7471a577..9f7253ce40 100644
--- a/railties/CHANGELOG
+++ b/railties/CHANGELOG
@@ -2,8 +2,6 @@
 
 * Changed the default logging level in config/environment.rb to INFO for production (so SQL statements won't be logged)
 
-* Added an EXPERIMENTAL gateway.cgi for getting high-speed performance through vanilla CGI using a long-running, DRb-backed server in the background (using script/listener and script/tracker) #1603 [Nicholas Seckar]
-
 * Added migration generator: ./script/generate migration add_system_settings
 
 * Added "migrate" as rake task to execute all the pending migrations from db/migrate
diff --git a/railties/Rakefile b/railties/Rakefile
index ffe2cee774..5ded004a4b 100644
--- a/railties/Rakefile
+++ b/railties/Rakefile
@@ -26,7 +26,7 @@ TEST_DIRS   = %w( fixtures unit functional mocks mocks/development mocks/test )
 
 LOG_FILES    = %w( server.log development.log test.log production.log )
 HTML_FILES   = %w( 404.html 500.html index.html favicon.ico javascripts/prototype.js javascripts/effects.js javascripts/dragdrop.js javascripts/controls.js )
-BIN_FILES    = %w( generate destroy breakpointer console server update runner profiler benchmarker listener tracker )
+BIN_FILES    = %w( generate destroy breakpointer console server update runner profiler benchmarker ) # listener tracker
 
 VENDOR_LIBS = %w( actionpack activerecord actionmailer activesupport actionwebservice railties )
 
@@ -136,8 +136,8 @@ task :copy_dispatches do
   copy_with_rewritten_ruby_path("dispatches/dispatch.fcgi", "#{PKG_DESTINATION}/public/dispatch.fcgi")
   chmod 0755, "#{PKG_DESTINATION}/public/dispatch.fcgi"
 
-  copy_with_rewritten_ruby_path("dispatches/gateway.cgi", "#{PKG_DESTINATION}/public/gateway.cgi")
-  chmod 0755, "#{PKG_DESTINATION}/public/gateway.cgi"
+  # copy_with_rewritten_ruby_path("dispatches/gateway.cgi", "#{PKG_DESTINATION}/public/gateway.cgi")
+  # chmod 0755, "#{PKG_DESTINATION}/public/gateway.cgi"
 end
 
 task :copy_html_files do
diff --git a/railties/lib/rails_generator/generators/applications/app/app_generator.rb b/railties/lib/rails_generator/generators/applications/app/app_generator.rb
index 88089f5d16..3ad3c30784 100644
--- a/railties/lib/rails_generator/generators/applications/app/app_generator.rb
+++ b/railties/lib/rails_generator/generators/applications/app/app_generator.rb
@@ -42,8 +42,8 @@ class AppGenerator < Rails::Generator::Base
       m.file "environments/development.rb", "config/environments/development.rb"
       m.file "environments/test.rb",        "config/environments/test.rb"
 
-      # Scripts
-      %w(console destroy generate server runner benchmarker profiler tracker listener).each do |file|
+      # Scripts (tracker listener)
+      %w(console destroy generate server runner benchmarker profiler ).each do |file|
         m.file "bin/#{file}", "script/#{file}", script_options
       end
       if options[:gem]
@@ -56,7 +56,7 @@ class AppGenerator < Rails::Generator::Base
       m.file "dispatches/dispatch.rb",   "public/dispatch.rb", script_options
       m.file "dispatches/dispatch.rb",   "public/dispatch.cgi", script_options
       m.file "dispatches/dispatch.fcgi", "public/dispatch.fcgi", script_options
-      m.file "dispatches/gateway.cgi",   "public/gateway.cgi", script_options
+      # m.file "dispatches/gateway.cgi",   "public/gateway.cgi", script_options
 
       # HTML files
       %w(404 500 index).each do |file|