[Catalyst-commits] r13940 - in Catalyst-Runtime/5.80/branches/psgi: . lib/Catalyst lib/Catalyst/Engine

[t0m at dev.catalyst.perl.org]

Author: t0m
Date: 2011-01-31 09:29:25 +0000 (Mon, 31 Jan 2011)
New Revision: 13940

Modified:
   Catalyst-Runtime/5.80/branches/psgi/TODO
   Catalyst-Runtime/5.80/branches/psgi/lib/Catalyst/Engine/Loader.pm
   Catalyst-Runtime/5.80/branches/psgi/lib/Catalyst/Upgrading.pod
Log:
Tweaks

Modified: Catalyst-Runtime/5.80/branches/psgi/TODO
===================================================================
--- Catalyst-Runtime/5.80/branches/psgi/TODO	2011-01-31 09:16:11 UTC (rev 13939)
+++ Catalyst-Runtime/5.80/branches/psgi/TODO	2011-01-31 09:29:25 UTC (rev 13940)
@@ -33,14 +33,12 @@
   * 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
 

Modified: Catalyst-Runtime/5.80/branches/psgi/lib/Catalyst/Engine/Loader.pm
===================================================================
--- Catalyst-Runtime/5.80/branches/psgi/lib/Catalyst/Engine/Loader.pm	2011-01-31 09:16:11 UTC (rev 13939)
+++ Catalyst-Runtime/5.80/branches/psgi/lib/Catalyst/Engine/Loader.pm	2011-01-31 09:29:25 UTC (rev 13940)
@@ -28,8 +28,8 @@
     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;
     }
 }
 

Modified: Catalyst-Runtime/5.80/branches/psgi/lib/Catalyst/Upgrading.pod
===================================================================
--- Catalyst-Runtime/5.80/branches/psgi/lib/Catalyst/Upgrading.pod	2011-01-31 09:16:11 UTC (rev 13939)
+++ Catalyst-Runtime/5.80/branches/psgi/lib/Catalyst/Upgrading.pod	2011-01-31 09:29:25 UTC (rev 13940)
@@ -59,8 +59,10 @@
 =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
 
 If you were using L<Catalyst::Engine::PSGI> this new release supercedes this
@@ -98,14 +100,14 @@
 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)