update docs for thin vs. mongrel, general dependencies. Update actual…

… gem dependencies

chef-server-api/README.rdoc

@@ -19,13 +19,11 @@ chef:
 *  stomp  
 *  ohai  
 
-chef-server and the chefserverslice (merb slice), same requires as chef above, plus:
+chef-server and the chef-server-api (merb slice), same requires as chef above, plus:
 
-*  stompserver 
-*  ferret 
 *  merb-core 
 *  merb-haml 
-*  mongrel 
+*  thin
 *  haml
 *  ruby-openid 
 *  syntax

chef-server-api/Rakefile

@@ -30,7 +30,7 @@ spec = Gem::Specification.new do |s|
   "merb-core",
   "merb-assets",
   "merb-helpers",
-  "mongrel",
+  "thin",
   "haml",
   "ruby-openid",
   "json", 

chef-server-webui/Rakefile

@@ -32,7 +32,7 @@ spec = Gem::Specification.new do |s|
   "merb-haml",
   "merb-assets",
   "merb-helpers",
-  "mongrel",
+  "thin",
   "haml",
   "ruby-openid",
   "json",

chef-server/chef-server.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<ferret>, [">= 0"])
       s.add_runtime_dependency(%q<merb-core>, [">= 0"])
       s.add_runtime_dependency(%q<merb-haml>, [">= 0"])
-      s.add_runtime_dependency(%q<mongrel>, [">= 0"])
+      s.add_runtime_dependency(%q<thin>, [">= 0"])
       s.add_runtime_dependency(%q<haml>, [">= 0"])
       s.add_runtime_dependency(%q<ruby-openid>, [">= 0"])
       s.add_runtime_dependency(%q<json>, [">= 0"])
@@ -37,7 +37,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<ferret>, [">= 0"])
       s.add_dependency(%q<merb-core>, [">= 0"])
       s.add_dependency(%q<merb-haml>, [">= 0"])
-      s.add_dependency(%q<mongrel>, [">= 0"])
+      s.add_dependency(%q<thin>, [">= 0"])
       s.add_dependency(%q<haml>, [">= 0"])
       s.add_dependency(%q<ruby-openid>, [">= 0"])
       s.add_dependency(%q<json>, [">= 0"])
@@ -49,7 +49,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<ferret>, [">= 0"])
     s.add_dependency(%q<merb-core>, [">= 0"])
     s.add_dependency(%q<merb-haml>, [">= 0"])
-    s.add_dependency(%q<mongrel>, [">= 0"])
+    s.add_dependency(%q<thin>, [">= 0"])
     s.add_dependency(%q<haml>, [">= 0"])
     s.add_dependency(%q<ruby-openid>, [">= 0"])
     s.add_dependency(%q<json>, [">= 0"])

chef-server/lib/tasks/package.rake

@@ -13,9 +13,8 @@ spec = Gem::Specification.new do |s|
   s.email = EMAIL
   s.homepage = HOMEPAGE
 
-  %w{stomp stompserver ferret
-    merb-core merb-haml merb-assets
-    merb-helpers mongrel haml
+  %w{ merb-core merb-haml merb-assets
+    merb-helpers thin haml
     ruby-openid json coderay}.each { |gem| s.add_dependency gem }
 
   s.bindir       = "bin"

chef/README.rdoc

@@ -46,6 +46,7 @@ Install the following RubyGems.
 * webrat
 * merb-core
 * roman-merb_cucumber
+* thin
 
 Ohai is also by Opscode and available on GitHub, http://github.com/opscode/ohai/tree/master.
 
@@ -61,25 +62,25 @@ Once everything is installed, run the dev:features rake task. Since the features
 
 The dev:features task:
 
-* Installs chef, chef-server, chef-server-slice gems. It will fail if required gems above are missing.
-* Starts chef-server on ports 4000 and 4001.
-* Starts chef-indexer.
 * Starts CouchDB on port 5984.
-* Starts the stompserver on port 61613.
+* Starts rabbitmq
+* Starts solr
+* Starts chef-indexer.
+* Starts chef-server on port 4000
+
 
 You'll know its running when you see:
 
-   ~ Activating slice 'ChefServerSlice' ...
-  merb : worker (port 4000) ~ Starting Mongrel at port 4000
-  merb : worker (port 4000) ~ Successfully bound to port 4000
-  merb : worker (port 4001) ~ Starting Mongrel at port 4001
-  merb : worker (port 4001) ~ Successfully bound to port 4001
+~ Activating slice 'ChefServerApi' ...
+merb : worker (port 4000) ~ Starting Thin at port 4000
+merb : worker (port 4000) ~ Using Thin adapter on host 0.0.0.0 and port 4000.
+merb : worker (port 4000) ~ Successfully bound to port 4000
 
 You'll want to leave this terminal running the dev environment.
 
 == Web Interface:
 
-With the dev environment running, you can now access the web interface via http://localhost:4000/. Supply an OpenID to log in.
+With the dev environment running, you can now access the web interface via http://localhost:4000/.
 
 == Spec testing: