From: Tomas Doran <bobtfish@bobtfish.net>
Date: Mon, 31 Jan 2011 09:29:25 +0000 (+0000)
Subject: Tweaks
X-Git-Tag: 5.89001~11
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=commitdiff_plain;h=0ea8962d9383c610ebfcd8f3f3b0095a63398640

Tweaks
---

diff --git a/TODO b/TODO
index 218cbda..5e96e21 100644
--- a/TODO
+++ b/TODO
@@ -33,14 +33,12 @@ http://github.com/willert/catalyst-plugin-log4perl-simple/tree
   * lighttpd
   * iis6
   * Add some tests for Catalyst::Test::local_request
-  * Docs
   * Test all the options work on all of the scripts
   * Test (and fix if needed) ::Wx
   * Document how to use your own .psgi (and how you need to do ReverseProxy yourself if you do)
   * Document migration for setting engine in setup
   * Document migration for setting engine in $ENV
-  * Document what to do if you're a Prefork person
-  * Test Catalyst::Engine::PSGI still works?
+  * Fix Catalyst::Engine::PSGI .psgi script and in app root running tests.
 
 ###  Nice to have
 
diff --git a/lib/Catalyst/Engine/Loader.pm b/lib/Catalyst/Engine/Loader.pm
index 5ac028f..d2b54a4 100644
--- a/lib/Catalyst/Engine/Loader.pm
+++ b/lib/Catalyst/Engine/Loader.pm
@@ -28,8 +28,8 @@ sub _guess_catalyst_engine_class {
     elsif ($old_engine =~ /^(CGI|FCGI|HTTP|Apache.*)$/) {
         return 'Catalyst::Engine';
     }
-    elsif (my ($type) = $old_engine =~ /^(Stomp|Test::MessageDriven|Wx)$/) {
-        return 'Catalyst::Engine::' . $type;
+    else {
+        return 'Catalyst::Engine::' . $old_engine;
     }
 }
 
diff --git a/lib/Catalyst/Upgrading.pod b/lib/Catalyst/Upgrading.pod
index 8ce8eec..773e246 100644
--- a/lib/Catalyst/Upgrading.pod
+++ b/lib/Catalyst/Upgrading.pod
@@ -59,7 +59,9 @@ myapp_cgi.pl script is already upgraded enough to use L<Catalyst::Script::CGI>.
 =head2 Upgrading the Preforking Engine
 
 If you were using L<Catalyst::Engine::HTTP::Prefork> then L<Starman>
-is automatically loaded. 
+is automatically loaded.
+
+XXX FIXME - note how to run Starman with different options.
 
 =head2 Upgrading the PSGI Engine
 
@@ -98,14 +100,14 @@ Instead, you now just do
 The following engines have untested or unknown compatibility.  Reports are
 highly welcomed:
 
-    Catalyst::Engine::Embeddable
+    Catalyst::Engine::Embeddable - needs testing, should work?
     Catalyst::Engine::XMPP2
     Catalyst::Engine::SCGI
     Catalyst::Engine::Mojo
-    Catalyst::Engine::Zeus
-    Catalyst::Engine::JobQueue::POE
+    Catalyst::Engine::Zeus - broken for ages
+    Catalyst::Engine::JobQueue::POE - broken for ages
     Catalyst::Engine::Wx
-    Catalyst::Engine::Stomp
+    Catalyst::Engine::Stomp - fixed
     Catalyst::Engine::Server (Marked as Deprecated)
     Catalyst::Engine::HTTP::POE (Marked as Deprecated)