X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FHelper.pm;h=ae8898a70c3bef29e71346db693b1424ef607112;hb=aa64badacdc24647a55bf96f3e682fdaf9461e22;hp=71efd7d7f0ba3c35d25cf58904e7a5f8cf7b7d9c;hpb=d96e14c21fb544597f459aaaad969c34af7f2d1f;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst/Helper.pm b/lib/Catalyst/Helper.pm
index 71efd7d..ae8898a 100644
--- a/lib/Catalyst/Helper.pm
+++ b/lib/Catalyst/Helper.pm
@@ -39,7 +39,6 @@ sub mk_app {
     $self->_mk_changes;
     $self->_mk_apptest;
     $self->_mk_cgi;
-    $self->_mk_nphcgi;
     $self->_mk_fcgi;
     $self->_mk_server;
     $self->_mk_test;
@@ -224,14 +223,10 @@ $name->config(
     root => '$base/root',
 );
 
-$name->action(
-
-    '!default' => sub {
-        my ( \$self, \$c ) = \@_;
-        \$c->res->output('Congratulations, $name is on Catalyst!');
-    },
-
-);
+sub default : Private {
+    my ( \$self, \$c ) = \@_;
+    \$c->res->output('Congratulations, $name is on Catalyst!');
+}
 
 =head1 NAME
 
@@ -312,8 +307,8 @@ EOF
 use Test::More;
 
 eval "use Test::Pod 1.14";
-plan skip_all => 'Test::Pod 1.14 required' if $@;
-plan skip_all => 'set TEST_POD to enable this test' unless $ENV{TEST_POD};
+plan skip_all => 'Test::Pod 1.14 required' if \$@;
+plan skip_all => 'set TEST_POD to enable this test' unless \$ENV{TEST_POD};
 
 all_pod_files_ok();
 EOF
@@ -375,53 +370,6 @@ EOF
     chmod 0700, "$script/cgi.pl";
 }
 
-sub _mk_nphcgi {
-    my $self   = shift;
-    my $name   = $self->{name};
-    my $script = $self->{script};
-    $self->mk_file( "$script\/nph-cgi.pl", <<"EOF");
-$Config{startperl} -w
-
-BEGIN { \$ENV{CATALYST_ENGINE} = 'CGI::NPH' }
-
-use strict;
-use FindBin;
-use lib "\$FindBin::Bin/../lib";
-use $name;
-
-$name->run;
-
-1;
-__END__
-
-=head1 NAME
-
-nph-cgi - Catalyst CGI
-
-=head1 SYNOPSIS
-
-See L<Catalyst::Manual>
-
-=head1 DESCRIPTION
-
-Run a Catalyst application as nph cgi.
-
-=head1 AUTHOR
-
-Sebastian Riedel, C<sri\@oook.de>
-
-=head1 COPYRIGHT
-
-Copyright 2004 Sebastian Riedel. All rights reserved.
-
-This library is free software. You can redistribute it and/or modify it under
-the same terms as perl itself.
-
-=cut
-EOF
-    chmod 0700, "$script/nph-cgi.pl";
-}
-
 sub _mk_fcgi {
     my $self   = shift;
     my $name   = $self->{name};
@@ -476,7 +424,7 @@ sub _mk_server {
     $self->mk_file( "$script\/server.pl", <<"EOF");
 $Config{startperl} -w
 
-BEGIN { \$ENV{CATALYST_ENGINE} = 'HTTP::Daemon' }
+BEGIN { \$ENV{CATALYST_ENGINE} = 'HTTP' }
 
 use strict;
 use Getopt::Long;
@@ -676,14 +624,11 @@ sub _mk_compclass {
     my $action = '';
     $action = <<"EOF" if $type eq 'C';
 
-$app->action(
-
-    '!?default' => sub {
-        my ( \$self, \$c ) = \@_;
-        \$c->res->output('Congratulations, $class is on Catalyst!');
-    },
+sub default : Private {
+    my ( \$self, \$c ) = \@_;
+    \$c->res->output('Congratulations, $class is on Catalyst!');
+}
 
-);
 EOF
     my $file = $self->{file};
     return $self->mk_file( "$file", <<"EOF");