X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=lib%2FCatalyst.pm;h=13e8d90950edac72d1ee592285cc786cda1f6c28;hp=39a9c32f6fbbe6680d362d971d7161bcdc92e203;hb=f0ee3380113797aafadaf452920d9d93f01f4aa7;hpb=269408a40f0f2da46a1d64588a668a7b1be5e1cc

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index 39a9c32..13e8d90 100644
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -77,6 +77,7 @@ __PACKAGE__->stats_class('Catalyst::Stats');
 # Remember to update this in Catalyst::Runtime as well!
 
 our $VERSION = '5.8000_06';
+$VERSION = eval $VERSION;
 
 sub import {
     my ( $class, @arguments ) = @_;
@@ -90,7 +91,7 @@ sub import {
 
     # Kill Adopt::NEXT warnings if we're a non-RC version
     if ($VERSION !~ /_\d{2}$/) {
-        Class::C3::Adopt::NEXT->unimport(qr/^Catalyst/);
+        Class::C3::Adopt::NEXT->unimport(qr/^Catalyst::/);
     }
 
     my $meta = Moose::Meta::Class->initialize($caller);
@@ -1295,7 +1296,7 @@ sub welcome_message {
                     they can save you a lot of work.</p>
                     <pre><code>script/${prefix}_create.pl -help</code></pre>
                     <p>Also, be sure to check out the vast and growing
-                    collection of <a href="http://cpansearch.perl.org/search?query=Catalyst%3A%3APlugin%3A%3A&amp;mode=all">plugins for Catalyst on CPAN</a>;
+                    collection of <a href="http://search.cpan.org/search?query=Catalyst">plugins for Catalyst on CPAN</a>;
                     you are likely to find what you need there.
                     </p>
 
@@ -2047,7 +2048,12 @@ sub setup_components {
 
     my @comps = sort { length $a <=> length $b } $locator->plugins;
     my %comps = map { $_ => 1 } @comps;
-    
+
+    my $deprecated_component_names = grep { /::[CMV]::/ } @comps;
+    $class->log->warn(qq{Your application is using the deprecated ::[MVC]:: type naming scheme.\n}.
+        qq{Please switch your class names to ::Model::, ::View:: and ::Controller: as appropriate.\n}
+    ) if $deprecated_component_names;
+
     for my $component ( @comps ) {
 
         # We pass ignore_loaded here so that overlay files for (e.g.)