[Catalyst-commits] r7577 - in Catalyst-Devel/1.00/trunk: . lib/Catalyst

[marcus at dev.catalyst.perl.org]

Author: marcus
Date: 2008-04-06 21:59:05 +0100 (Sun, 06 Apr 2008)
New Revision: 7577

Modified:
   Catalyst-Devel/1.00/trunk/Changes
   Catalyst-Devel/1.00/trunk/Makefile.PL
   Catalyst-Devel/1.00/trunk/lib/Catalyst/Helper.pm
Log:
remove catalyst-manual dependency, change default helper to use parent

Modified: Catalyst-Devel/1.00/trunk/Changes
===================================================================
--- Catalyst-Devel/1.00/trunk/Changes	2008-04-06 19:42:48 UTC (rev 7576)
+++ Catalyst-Devel/1.00/trunk/Changes	2008-04-06 20:59:05 UTC (rev 7577)
@@ -1,6 +1,9 @@
 This file documents the revision history for Perl extension Catalyst-Devel.
 
-1.04	2007-XX-XX
+        - Change from use Catalyst to use parent and load plugins  in setup call
+        - Remove Catalyst::Manual dependency.
+
+1.04	2008-02-07 16:04:00
         - Update default actions in Root.pm
         - Patch Helper.pm so Module::Pluggable::Object ignores emacs temp
           files appropriately for restarting server

Modified: Catalyst-Devel/1.00/trunk/Makefile.PL
===================================================================
--- Catalyst-Devel/1.00/trunk/Makefile.PL	2008-04-06 19:42:48 UTC (rev 7576)
+++ Catalyst-Devel/1.00/trunk/Makefile.PL	2008-04-06 20:59:05 UTC (rev 7577)
@@ -10,10 +10,10 @@
 requires 'Path::Class' => '0.09';
 requires 'Template'    => '2.14';
 requires 'Catalyst'    => '5.7000';
-requires 'Catalyst::Manual' => '5.7000'; # keep sync'd with Catalyst
 requires 'Catalyst::Action::RenderView' => '0.04';
 requires 'Catalyst::Plugin::Static::Simple' => '0.16';
 requires 'Catalyst::Plugin::ConfigLoader';
+requires 'parent';
 requires 'YAML'        => '0.55';
 requires 'Module::Install' => '0.64';
 requires 'File::Copy::Recursive';

Modified: Catalyst-Devel/1.00/trunk/lib/Catalyst/Helper.pm
===================================================================
--- Catalyst-Devel/1.00/trunk/lib/Catalyst/Helper.pm	2008-04-06 19:42:48 UTC (rev 7576)
+++ Catalyst-Devel/1.00/trunk/lib/Catalyst/Helper.pm	2008-04-06 20:59:05 UTC (rev 7577)
@@ -617,8 +617,10 @@
 # Static::Simple: will serve static files from the application's root 
 #                 directory
 
-use Catalyst qw/-Debug ConfigLoader Static::Simple/;
+use parent qw/Catalyst/;
 
+[% name %]->plugins(qw/-Debug ConfigLoader Static::Simple/);
+
 our $VERSION = '0.01';
 
 # Configure the application. 
@@ -669,7 +671,7 @@
 
 use strict;
 use warnings;
-use base 'Catalyst::Controller';
+use parent 'Catalyst::Controller';
 
 #
 # Sets the actions in this controller to be registered with no prefix
@@ -1153,7 +1155,7 @@
 
 use strict;
 use warnings;
-use base 'Catalyst::[% long_type %]';
+use parent 'Catalyst::[% long_type %]';
 
 =head1 NAME