X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=lib%2FCatalyst.pm;h=e573b0d9195fb6de790fc085605e8a287acffc35;hp=f3279325d5c6d192d3fad879932fefc78f0c00e2;hb=e2adaa166c94d83075815f61e7c90bd4b48cd625;hpb=4f6748f101647dd3344339b19510947df6836412

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index f327932..e573b0d 100644
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -4,13 +4,14 @@ use strict;
 use base 'Catalyst::Base';
 use UNIVERSAL::require;
 use Catalyst::Log;
+use Catalyst::Utils;
 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.10';
+our $VERSION = '5.20';
 our @ISA;
 
 =head1 NAME
@@ -152,20 +153,25 @@ sub import {
     my $engine     = 'Catalyst::Engine::CGI';
     my $dispatcher = 'Catalyst::Dispatcher';
 
-    # Detect mod_perl
     if ( $ENV{MOD_PERL} ) {
+    
+        mod_perl->require;
 
-        require mod_perl;
-
-        if ( $ENV{MOD_PERL_API_VERSION} == 2 ) {
+        if ( $mod_perl::VERSION >= 1.99_90_22 ) {
             $engine = 'Catalyst::Engine::Apache::MP20';
         }
-        elsif ( $mod_perl::VERSION >= 1.99 ) {
+
+        elsif ( $mod_perl::VERSION >= 1.99_01 ) {
             $engine = 'Catalyst::Engine::Apache::MP19';
         }
-        else {
+
+        elsif ( $mod_perl::VERSION >= 1.27 ) {
             $engine = 'Catalyst::Engine::Apache::MP13';
         }
+
+        else {
+            die( qq/Unsupported mod_perl version: "$mod_perl::VERSION"/ );
+        }
     }
 
     $caller->log->info( "You are running an old helper script! "
@@ -218,6 +224,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,28 +239,22 @@ 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 $@;
+
     {
         no strict 'refs';
         push @{"$caller\::ISA"}, $engine;
     }
+
     $caller->engine($engine);
     $caller->log->debug(qq/Loaded engine "$engine"/) if $caller->debug;
 
     # Find home
-    my $name = $caller;
-    $name =~ s/\:\:/\//g;
-    my $path = $INC{"$name.pm"};
-    my $home = file($path)->absolute->dir;
-    $name =~ /(\w+)$/;
-    my $append = $1;
-    my $subdir = dir($home)->subdir($append);
-    for ( split '/', $name ) { $home = dir($home)->parent }
-    if ( $home =~ /blib$/ ) { $home = dir($home)->parent }
-    elsif ( !-f file( $home, 'Build.PL' ) ) { $home = $subdir }
-
+    my $home = Catalyst::Utils::home($caller);
     if ( $caller->debug ) {
         $home
           ? ( -d $home )
@@ -260,8 +262,8 @@ sub import {
           : $caller->log->debug(qq/Home "$home" doesn't exist/)
           : $caller->log->debug(q/Couldn't find home/);
     }
-    $caller->config->{home} = $home;
-    $caller->config->{root} = dir($home)->subdir('root');
+    $caller->config->{home} = $home || '';
+    $caller->config->{root} = defined $home ? dir($home)->subdir('root') : '';
 }
 
 =item $c->engine
@@ -309,7 +311,7 @@ sub plugin {
 
 =head1 LIMITATIONS
 
-mod_perl2 support are considered experimental and may contain bugs.
+mod_perl2 support is considered experimental and may contain bugs.
 
 =head1 SUPPORT
 
@@ -352,8 +354,9 @@ Sebastian Riedel, C<sri@oook.de>
 
 Andy Grundman, Andrew Ford, Andrew Ruthven, Autrijus Tang, Christian Hansen,
 Christopher Hicks, Dan Sully, Danijel Milicevic, David Naughton,
-Gary Ashton Jones, Jesse Sheidlower, Johan Lindstrom, Leon Brocard,
-Marcus Ramberg, Tatsuhiko Miyagawa and all the others who've helped.
+Gary Ashton Jones, Geoff Richards, Jesse Sheidlower, Jody Belka,
+Johan Lindstrom, Juan Camacho, Leon Brocard, Marcus Ramberg,
+Tatsuhiko Miyagawa and all the others who've helped.
 
 =head1 LICENSE