use base 'Catalyst::Base';
use UNIVERSAL::require;
use Catalyst::Log;
+use Text::ASCIITable;
+use Text::ASCIITable::Wrap 'wrap';
__PACKAGE__->mk_classdata($_) for qw/engine log/;
$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;
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( { hide_HeadRow => 1, hide_HeadLine => 1 } );
+ $t->setCols('Class');
+ $t->setColWidth( 'Class', 75, 1 );
+ $t->addRow( wrap( $_, 75 ) ) for @plugins;
+ $caller->log->debug( 'Loaded plugins', $t->draw )
+ 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 $@;
{
=head1 SEE ALSO
-L<Catalyst::Manual>, L<Catalyst::Test>, L<Catalyst::Request>,
-L<Catalyst::Response>, L<Catalyst::Engine>
+=over 4
+
+=item L<Catalyst::Manual> - The Catalyst Manual
+
+=item L<Catalyst::Engine> - Core Engine
+
+=item L<Catalyst::Log> - The Log Class.
+
+=item L<Catalyst::Request> - The Request Object
+
+=item L<Catalyst::Response> - The Response Object
+
+=item L<Catalyst::Test> - The test suite.
+
+=back
=head1 AUTHOR