Moved some PAR stuff

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index aca4920..cf21915 100644 (file)
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -18,19 +18,6 @@ use URI;
 use Scalar::Util qw/weaken/;
 use attributes;
 
-# For PAR
-require Catalyst::Helper;
-require Catalyst::PAR;
-require Catalyst::Build;
-require Catalyst::Test;
-
-require Catalyst::Engine::HTTP;
-require Catalyst::Engine::CGI;
-
-require Catalyst::Controller;
-require Catalyst::Model;
-require Catalyst::View;
-
 __PACKAGE__->mk_accessors(
     qw/counter request response state action stack namespace/
 );

diff --git a/lib/Catalyst/PAR.pm b/lib/Catalyst/PAR.pm
index 6d7164b..d74ed9c 100644 (file)
--- a/lib/Catalyst/PAR.pm
+++ b/lib/Catalyst/PAR.pm
@@ -75,6 +75,15 @@ BEGIN { \$ENV{CATALYST_ENGINE} = '$engine' };
 use lib 'lib';
 require $class;
 import $class;
+require Catalyst::Helper;
+require Catalyst::PAR;
+require Catalyst::Build;
+require Catalyst::Test;
+require Catalyst::Engine::HTTP;
+require Catalyst::Engine::CGI;
+require Catalyst::Controller;
+require Catalyst::Model;
+require Catalyst::View;
 $classes
 EOF
     $tmp_file->close;