X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst.pm;h=708c005f82912d5a97e367916be55da0db177167;hb=0f7ecc537d7a258023b1a58311f197ad5dca24c7;hp=9dde5508295f0b0a845dc58c5662bfc520fe351a;hpb=ca61af20db58c67b3fa27e7277ed3aba5e2af829;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index 9dde550..708c005 100644
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -4,6 +4,7 @@ use strict;
 use base 'Catalyst::Base';
 use UNIVERSAL::require;
 use Catalyst::Log;
+use Text::ASCIITable;
 
 __PACKAGE__->mk_classdata($_) for qw/engine log/;
 
@@ -144,12 +145,21 @@ sub import {
         $caller->log->debug('Debug messages enabled');
     }
 
-    # Options
-    my $engine =
-      $ENV{MOD_PERL}
-      ? 'Catalyst::Engine::Apache'
-      : 'Catalyst::Engine::CGI';
+    my $engine = 'Catalyst::Engine::CGI';
 
+    if ( $ENV{MOD_PERL} ) {
+
+        require mod_perl;
+
+        if ( $mod_perl::VERSION >= 1.99 ) {
+            $engine = 'Catalyst::Engine::Apache::MP2';
+        }
+        else {
+            $engine = 'Catalyst::Engine::Apache::MP1';
+        }
+    }
+
+    my @plugins;
     foreach (@options) {
         if (/^\-Debug$/) {
             next if $caller->debug;
@@ -162,19 +172,23 @@ sub import {
         else {
             my $plugin = "Catalyst::Plugin::$_";
 
-            # Plugin caller should be our application class
-            eval "package $caller; require $plugin";
+            $plugin->require;
+
             if ($@) {
                 $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;
             }
         }
     }
+    my $t = Text::ASCIITable->new;
+    $t->setCols('Class');
+    $t->addRow($_) for @plugins;
+    $caller->log->debug( 'Loaded plugins', $t->draw )
+      if ( @plugins && $caller->debug );
 
     # Engine
     $engine = "Catalyst::Engine::$ENV{CATALYST_ENGINE}"