X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=lib%2FCatalyst.pm;h=e2fac8af3dcd5421adc9758637f25800a954d08d;hp=8db075a90f1cf44178a0b3648ab2d7e9effcec0c;hb=ee9fa6cdfb1e7f28645fdb98478b70fea513cc18;hpb=145074c2e045b36a52cefcfded0908b91013f9ea

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index 8db075a..e2fac8a 100644
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -5,9 +5,9 @@ use base 'Class::Data::Inheritable';
 use UNIVERSAL::require;
 use Catalyst::Log;
 
-__PACKAGE__->mk_classdata($_) for qw/_config log/;
+__PACKAGE__->mk_classdata($_) for qw/_config engine log/;
 
-our $VERSION = '4.32';
+our $VERSION = '5.00';
 our @ISA;
 
 =head1 NAME
@@ -141,19 +141,13 @@ sub import {
     my ( $self, @options ) = @_;
     my $caller = caller(0);
 
-    # Class
-    {
+    unless ( $caller->isa($self) ) {
         no strict 'refs';
-        *{"$caller\::handler"} =
-          sub { Catalyst::Engine::handler( $caller, @_ ) };
-
-        unless ( $caller->isa($self) ) {
-            push @{"$caller\::ISA"}, $self;
-        }
+        push @{"$caller\::ISA"}, $self;
     }
 
-    unless ( $self->log ) {
-        $self->log( Catalyst::Log->new );
+    unless ( $caller->log ) {
+        $caller->log( Catalyst::Log->new );
     }
 
     # Options
@@ -194,9 +188,14 @@ sub import {
         no strict 'refs';
         push @{"$caller\::ISA"}, $engine;
     }
+    $caller->engine($engine);
     $caller->log->debug(qq/Loaded engine "$engine"/) if $caller->debug;
 }
 
+=item $c->engine
+
+Contains the engine class.
+
 =item $c->log
 
 Contains the logging object.  Unless it is already set Catalyst sets this up with a
@@ -234,9 +233,9 @@ Sebastian Riedel, C<sri@oook.de>
 =head1 THANK YOU
 
 Andrew Ford, Andrew Ruthven, Christian Hansen, Christopher Hicks,
-Danijel Milicevic, David Naughton, Gary Ashton Jones, Jesse Sheidlower,
-Johan Lindstrom, Marcus Ramberg, Tatsuhiko Miyagawa and all the others
-who've helped.
+Dan Sully, Danijel Milicevic, David Naughton, Gary Ashton Jones,
+Jesse Sheidlower, Johan Lindstrom, Marcus Ramberg, Tatsuhiko Miyagawa
+and all the others who've helped.
 
 =head1 LICENSE