X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FHelper.pm;h=6e53d5b224ba6aa64b858c2c5560c7065faab8d8;hb=5811fa3e32d0a6631c2b89d64b06c2680423b967;hp=4ce4b905f98cfbca4c287f08aaeb0f1f92071cb0;hpb=5a8ed4fea844a2945eb98ae9ba76ba44b5d8ffdc;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst/Helper.pm b/lib/Catalyst/Helper.pm
index 4ce4b90..6e53d5b 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,6 +223,8 @@ $name->config(
     root => '$base/root',
 );
 
+$name->setup;
+
 sub default : Private {
     my ( \$self, \$c ) = \@_;
     \$c->res->output('Congratulations, $name is on Catalyst!');
@@ -308,8 +309,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
@@ -371,53 +372,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};
@@ -472,7 +426,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;