Stop the app class being a controller, and stop it being stuffed in the component...

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index c0ad6b8..9a9aaf5 100644 (file)
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -10,6 +10,8 @@ use Catalyst::Log;
 use Catalyst::Utils;
 use Catalyst::Controller;
 use Catalyst::Context;
+use Catalyst::Exception::Detach;
+use Catalyst::Exception::Go;
 use Devel::InnerPackage ();
 use Module::Pluggable::Object ();
 use Text::SimpleTable ();
@@ -71,9 +73,9 @@ sub import {
     }
 
     my $meta = Moose::Meta::Class->initialize($caller);
+    # Make the caller inherit from Catalyst
     unless ( $caller->isa('Catalyst') ) {
-        my @superclasses = ($meta->superclasses, $class, 'Catalyst::Controller');
-        $meta->superclasses(@superclasses);
+        $meta->superclasses($meta->superclasses, 'Catalyst');
     }
     # Avoid possible C3 issues if 'Moose::Object' is already on RHS of MyApp
     $meta->superclasses(grep { $_ ne 'Moose::Object' } $meta->superclasses);
@@ -826,11 +828,6 @@ EOF
           if ( keys %{ $class->components } );
     }
 
-    # Add our self to components, since we are also a component
-    if( $class->isa('Catalyst::Controller') ){
-      $class->components->{$class} = $class;
-    }
-
     $class->setup_actions;
 
     if ( $class->debug ) {