removed cgi-server.pl

diff --git a/Changes b/Changes
index 8e8d7a5..58102b1 100644 (file)
--- a/Changes
+++ b/Changes
@@ -3,6 +3,7 @@ This file documents the revision history for Perl extension Catalyst.
 4.32  xxx
         - documented the log() accessor method in Catalyst (Andrew Ford)
         - added optional arguments to Catalyst::Log methods (Andrew Ford)
+        - removed cgi-server.pl
 
 4.32  Tue Mar 22 02:10:00 2005
         - made a damn typo *AAAAAAAAAAAAAAHHHH!!!*

diff --git a/lib/Catalyst/Engine/Server.pm b/lib/Catalyst/Engine/Server.pm
index 014e2f1..47aa7f6 100644 (file)
--- a/lib/Catalyst/Engine/Server.pm
+++ b/lib/Catalyst/Engine/Server.pm
@@ -26,13 +26,12 @@ This class overloads some methods from C<Catalyst::Engine::CGI>.
 =cut
 
 sub run {
-    my $class  = shift;
-    my $port   = shift || 3000;
-    my $script = shift;
+    my $class = shift;
+    my $port  = shift || 3000;
 
     my $server = Catalyst::Engine::Server::Simple->new($port);
 
-    $server->handler( sub { $script ? print `$script` : $class->handler } );
+    $server->handler( sub { $class->handler } );
     $server->run;
 }
 

diff --git a/lib/Catalyst/Helper.pm b/lib/Catalyst/Helper.pm
index 1382d22..75bcb88 100644 (file)
--- a/lib/Catalyst/Helper.pm
+++ b/lib/Catalyst/Helper.pm
@@ -40,7 +40,6 @@ sub mk_app {
     $self->_mk_apptest;
     $self->_mk_cgi;
     $self->_mk_server;
-    $self->_mk_cgiserver;
     $self->_mk_test;
     $self->_mk_create;
     return 1;
@@ -435,77 +434,6 @@ EOF
     chmod 0700, "$script/server.pl";
 }
 
-sub _mk_cgiserver {
-    my $self   = shift;
-    my $name   = $self->{name};
-    my $script = $self->{script};
-    $self->mk_file( "$script\/cgi-server.pl", <<"EOF");
-$Config{startperl} -w
-
-BEGIN { 
-    \$ENV{CATALYST_ENGINE} = 'Server';
-    \$ENV{CATALYST_TEST}   = 1;
-}
-
-use strict;
-use Getopt::Long;
-use Pod::Usage;
-use FindBin;
-use lib "\$FindBin::Bin/../lib";
-use File::Spec;
-use $name;
-
-my \$help = 0;
-my \$port = 3000;
-
-GetOptions( 'help|?' => \\\$help, 'port=s' => \\\$port );
-
-pod2usage(1) if \$help;
-
-$name->run( \$port, File::Spec->catfile( \$FindBin::Bin, 'nph-cgi.pl' ) );
-
-1;
-__END__
-
-=head1 NAME
-
-cgi-server - Catalyst CGI Testserver
-
-=head1 SYNOPSIS
-
-cgi-server.pl [options]
-
- Options:
-   -? -help    display this help and exits
-   -p -port    port (defaults to 3000)
-
- See also:
-   perldoc Catalyst::Manual
-   perldoc Catalyst::Manual::Intro
-
-=head1 DESCRIPTION
-
-Run a Catalyst CGI Testserver for this application.
-
-Similar to the regular server but doesn't require a restart
-after code changes!
-
-=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/cgi-server.pl";
-}
-
 sub _mk_test {
     my $self   = shift;
     my $name   = $self->{name};