remove catalyst-manual dependency, change default helper to use parent

diff --git a/Changes b/Changes
index ab971cb..c9ab904 100644 (file)
--- a/Changes
+++ b/Changes
@@ -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

diff --git a/Makefile.PL b/Makefile.PL
index a14f47b..3eb4eef 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -10,10 +10,10 @@ requires 'Class::Accessor::Fast';
 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';

diff --git a/lib/Catalyst/Helper.pm b/lib/Catalyst/Helper.pm
index a6fb937..c3870b1 100644 (file)
--- a/lib/Catalyst/Helper.pm
+++ b/lib/Catalyst/Helper.pm
@@ -617,7 +617,9 @@ use Catalyst::Runtime '5.70';
 # 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';
 
@@ -669,7 +671,7 @@ package [% rootname %];
 
 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 @@ package [% class %];
 
 use strict;
 use warnings;
-use base 'Catalyst::[% long_type %]';
+use parent 'Catalyst::[% long_type %]';
 
 =head1 NAME