X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FException.pm;h=02610a472abfc9b90556f3b634a68e64dcfd2069;hb=3cdcf968aa321182c36f5fe4f499d581f59bdeac;hp=ade1a46b8e7abb4c7df94a38ce032c7862a125a9;hpb=ebfde331f96f61128105df0b2c4904cc0d5593e5;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst/Exception.pm b/lib/Catalyst/Exception.pm
index ade1a46..02610a4 100644
--- a/lib/Catalyst/Exception.pm
+++ b/lib/Catalyst/Exception.pm
@@ -1,16 +1,10 @@
 package Catalyst::Exception;
 
-use strict;
-use vars qw[@ISA $CATALYST_EXCEPTION_CLASS];
-use UNIVERSAL::require;
-
-BEGIN {
-    push( @ISA, $CATALYST_EXCEPTION_CLASS || 'Catalyst::Exception::Base' );
-}
+# XXX: See bottom of file for Exception implementation
 
 package Catalyst::Exception::Base;
 
-use strict;
+use Moose;
 use Carp ();
 
 =head1 NAME
@@ -29,13 +23,11 @@ This is the Catalyst Exception class.
 
 =head1 METHODS
 
-=over 4
+=head2 throw( $message )
 
-=item throw( $message )
+=head2 throw( message => $message )
 
-=item throw( message => $message )
-
-=item throw( error => $error )
+=head2 throw( error => $error )
 
 Throws a fatal exception.
 
@@ -52,7 +44,9 @@ sub throw {
     Carp::croak($message);
 }
 
-=back
+=head2 meta
+
+Provided by Moose
 
 =head1 AUTHOR
 
@@ -66,4 +60,13 @@ it under the same terms as Perl itself.
 
 =cut
 
+package Catalyst::Exception;
+
+use Moose;
+use vars qw[$CATALYST_EXCEPTION_CLASS];
+
+BEGIN {
+    extends($CATALYST_EXCEPTION_CLASS || 'Catalyst::Exception::Base');
+}
+
 1;