X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FAdmin.pm;h=ac47c61869f0c44bed110223c69e37d0a50bc5a7;hb=9485509b5b6fa85268a7256a20907e1f698d6af6;hp=80c5f6354d49f290c6fbb16c85359999a0e1a800;hpb=3b27cdacd7f07d77572776a1120d317a5c567f5a;p=dbsrgits%2FDBIx-Class-Historic.git

diff --git a/lib/DBIx/Class/Admin.pm b/lib/DBIx/Class/Admin.pm
index 80c5f63..ac47c61 100644
--- a/lib/DBIx/Class/Admin.pm
+++ b/lib/DBIx/Class/Admin.pm
@@ -87,8 +87,8 @@ has 'schema' => (
 
 sub _build_schema {
   my ($self)  = @_;
-  require Class::C3::Componentised;
-  Class::C3::Componentised->ensure_class_loaded($self->schema_class);
+  require Class::MOP;
+  Class::MOP::load_class($self->schema_class);
 
   $self->connect_info->[3]->{ignore_version} =1;
   return $self->schema_class->connect(@{$self->connect_info()} ); # ,  $self->connect_info->[3], { ignore_version => 1} );
@@ -209,8 +209,8 @@ has config => (
 sub _build_config {
   my ($self) = @_;
 
-  eval { require Config::Any }
-    or die ("Config::Any is required to parse the config file.\n");
+  try { require Config::Any }
+    catch { die ("Config::Any is required to parse the config file.\n") };
 
   my $cfg = Config::Any->load_files ( {files => [$self->config_file], use_ext =>1, flatten_to_hash=>1});