X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst.pm;h=5a9fe8a02560321c7e5a3166ecf5878dfa8f55d4;hb=937fcdd8a54e8ad8ba7aec296e85905a057cc497;hp=551f5dd1b7f4fd37b2f8a9bb55ab4274dfa55abc;hpb=e3dc9d7865fc12ef65fa82611c0e00c9e2038990;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index 551f5dd..5a9fe8a 100644
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -150,6 +150,7 @@ sub import {
       ? 'Catalyst::Engine::Apache'
       : 'Catalyst::Engine::CGI';
 
+    my @plugins;
     foreach (@options) {
         if (/^\-Debug$/) {
             next if $caller->debug;
@@ -168,24 +169,19 @@ sub import {
                 $caller->log->error(qq/Couldn't load plugin "$plugin", "$@"/);
             }
             else {
-                $caller->log->debug(qq/Loaded plugin "$plugin"/)
-                  if $caller->debug;
+                push @plugins, " $plugin";
                 no strict 'refs';
                 push @{"$caller\::ISA"}, $plugin;
             }
         }
     }
+    $caller->log->debug( 'Loaded plugins', @plugins )
+      if ( @plugins && $caller->debug );
 
     # Engine
     $engine = "Catalyst::Engine::$ENV{CATALYST_ENGINE}"
       if $ENV{CATALYST_ENGINE};
 
-    if ( $engine eq 'Catalyst::Engine::Server' ) {
-        $engine = 'Catalyst::Engine::HTTP::Daemon';
-        $caller->log->warn( "Catalyst::Engine::Server is deprecated, "
-              . "using Catalyst::Engine::HTTP::Daemon." );
-    }
-
     $engine->require;
     die qq/Couldn't load engine "$engine", "$@"/ if $@;
     {