X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=lib%2FCatalyst.pm;h=48291b7bf7ea95db6db60aca7a31cc2a6f7f1d15;hp=8a864ce130491a505b993f700af1900bb828252f;hb=367d15f8e1589aff5a4bc143ab0e958e3e311dd4;hpb=c24122df7669010c2e7209ce40eced3b4cd04183

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index 8a864ce..48291b7 100644
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -6,11 +6,11 @@ use UNIVERSAL::require;
 use Catalyst::Log;
 use Text::ASCIITable;
 use Path::Class;
-our $CATALYST_SCRIPT_GEN = 3;
+our $CATALYST_SCRIPT_GEN = 4;
 
 __PACKAGE__->mk_classdata($_) for qw/dispatcher engine log/;
 
-our $VERSION = '5.11';
+our $VERSION = '5.20';
 our @ISA;
 
 =head1 NAME
@@ -218,6 +218,8 @@ sub import {
     # Dispatcher
     $dispatcher = "Catalyst::Dispatcher::$ENV{CATALYST_DISPATCHER}"
       if $ENV{CATALYST_DISPATCHER};
+    my $appdis = $ENV{ uc($caller) . '_DISPATCHER' };
+    $dispatcher = "Catalyst::Dispatcher::$appdis" if $appdis;
 
     $dispatcher->require;
     die qq/Couldn't load dispatcher "$dispatcher", "$@"/ if $@;
@@ -231,6 +233,8 @@ sub import {
     # Engine
     $engine = "Catalyst::Engine::$ENV{CATALYST_ENGINE}"
       if $ENV{CATALYST_ENGINE};
+    my $appeng = $ENV{ uc($caller) . '_ENGINE' };
+    $engine = "Catalyst::Engine::$appeng" if $appeng;
 
     $engine->require;
     die qq/Couldn't load engine "$engine", "$@"/ if $@;