[Catalyst-commits] r10510 - in
Catalyst-Devel/1.00/branches/helper_refactor: lib/Catalyst
share/root
t0m at dev.catalyst.perl.org
t0m at dev.catalyst.perl.org
Fri Jun 12 00:44:41 GMT 2009
Author: t0m
Date: 2009-06-12 00:44:41 +0000 (Fri, 12 Jun 2009)
New Revision: 10510
Removed:
Catalyst-Devel/1.00/branches/helper_refactor/share/root/cgi.tt
Catalyst-Devel/1.00/branches/helper_refactor/share/root/fastcgi.tt
Catalyst-Devel/1.00/branches/helper_refactor/share/root/favicon.ico
Catalyst-Devel/1.00/branches/helper_refactor/share/root/makefile.tt
Catalyst-Devel/1.00/branches/helper_refactor/share/root/rootclass.tt
Catalyst-Devel/1.00/branches/helper_refactor/share/root/server.tt
Modified:
Catalyst-Devel/1.00/branches/helper_refactor/lib/Catalyst/Helper.pm
Log:
Fix favicon to final location, delete more crap
Modified: Catalyst-Devel/1.00/branches/helper_refactor/lib/Catalyst/Helper.pm
===================================================================
--- Catalyst-Devel/1.00/branches/helper_refactor/lib/Catalyst/Helper.pm 2009-06-12 00:42:45 UTC (rev 10509)
+++ Catalyst-Devel/1.00/branches/helper_refactor/lib/Catalyst/Helper.pm 2009-06-12 00:44:41 UTC (rev 10510)
@@ -470,7 +470,7 @@
sub _mk_favicon {
my $self = shift;
my $root = $self->{root};
- my $favicon = $self->get_sharedir_file( 'root', 'favicon.ico' );
+ my $favicon = $self->get_sharedir_file( 'root', 'favicon.ico.bin' );
my $dest = File::Spec->catfile( $root, "favicon.ico" );
$self->mk_file( $dest, $favicon );
Deleted: Catalyst-Devel/1.00/branches/helper_refactor/share/root/cgi.tt
===================================================================
--- Catalyst-Devel/1.00/branches/helper_refactor/share/root/cgi.tt 2009-06-12 00:42:45 UTC (rev 10509)
+++ Catalyst-Devel/1.00/branches/helper_refactor/share/root/cgi.tt 2009-06-12 00:44:41 UTC (rev 10510)
@@ -1,37 +0,0 @@
-[% startperl %]
-
-BEGIN { $ENV{CATALYST_ENGINE} ||= 'CGI' }
-
-use strict;
-use warnings;
-use FindBin;
-use lib "$FindBin::Bin/../lib";
-use [% name %];
-
-[% name %]->run;
-
-1;
-
-=head1 NAME
-
-[% appprefix %]_cgi.pl - Catalyst CGI
-
-=head1 SYNOPSIS
-
-See L<Catalyst::Manual>
-
-=head1 DESCRIPTION
-
-Run a Catalyst application as a cgi script.
-
-=head1 AUTHORS
-
-Catalyst Contributors, see Catalyst.pm
-
-=head1 COPYRIGHT
-
-
-This library is free software. You can redistribute it and/or modify
-it under the same terms as Perl itself.
-
-=cut
Deleted: Catalyst-Devel/1.00/branches/helper_refactor/share/root/fastcgi.tt
===================================================================
--- Catalyst-Devel/1.00/branches/helper_refactor/share/root/fastcgi.tt 2009-06-12 00:42:45 UTC (rev 10509)
+++ Catalyst-Devel/1.00/branches/helper_refactor/share/root/fastcgi.tt 2009-06-12 00:44:41 UTC (rev 10510)
@@ -1,79 +0,0 @@
-[% startperl %]
-
-BEGIN { $ENV{CATALYST_ENGINE} ||= 'FastCGI' }
-
-use strict;
-use warnings;
-use Getopt::Long;
-use Pod::Usage;
-use FindBin;
-use lib "$FindBin::Bin/../lib";
-use [% name %];
-
-my $help = 0;
-my ( $listen, $nproc, $pidfile, $manager, $detach, $keep_stderr );
-
-GetOptions(
- 'help|?' => \$help,
- 'listen|l=s' => \$listen,
- 'nproc|n=i' => \$nproc,
- 'pidfile|p=s' => \$pidfile,
- 'manager|M=s' => \$manager,
- 'daemon|d' => \$detach,
- 'keeperr|e' => \$keep_stderr,
-);
-
-pod2usage(1) if $help;
-
-[% name %]->run(
- $listen,
- { nproc => $nproc,
- pidfile => $pidfile,
- manager => $manager,
- detach => $detach,
- keep_stderr => $keep_stderr,
- }
-);
-
-1;
-
-=head1 NAME
-
-[% appprefix %]_fastcgi.pl - Catalyst FastCGI
-
-=head1 SYNOPSIS
-
-[% appprefix %]_fastcgi.pl [options]
-
- Options:
- -? -help display this help and exits
- -l -listen Socket path to listen on
- (defaults to standard input)
- can be HOST:PORT, :PORT or a
- filesystem path
- -n -nproc specify number of processes to keep
- to serve requests (defaults to 1,
- requires -listen)
- -p -pidfile specify filename for pid file
- (requires -listen)
- -d -daemon daemonize (requires -listen)
- -M -manager specify alternate process manager
- (FCGI::ProcManager sub-class)
- or empty string to disable
- -e -keeperr send error messages to STDOUT, not
- to the webserver
-
-=head1 DESCRIPTION
-
-Run a Catalyst application as fastcgi.
-
-=head1 AUTHORS
-
-Catalyst Contributors, see Catalyst.pm
-
-=head1 COPYRIGHT
-
-This library is free software. You can redistribute it and/or modify
-it under the same terms as Perl itself.
-
-=cut
Deleted: Catalyst-Devel/1.00/branches/helper_refactor/share/root/favicon.ico
===================================================================
(Binary files differ)
Deleted: Catalyst-Devel/1.00/branches/helper_refactor/share/root/makefile.tt
===================================================================
--- Catalyst-Devel/1.00/branches/helper_refactor/share/root/makefile.tt 2009-06-12 00:42:45 UTC (rev 10509)
+++ Catalyst-Devel/1.00/branches/helper_refactor/share/root/makefile.tt 2009-06-12 00:44:41 UTC (rev 10510)
@@ -1,20 +0,0 @@
-[% startperl %]
-# IMPORTANT: if you delete this file your app will not work as
-# expected. You have been warned.
-use inc::Module::Install;
-
-name '[% dir %]';
-all_from '[% path %]';
-
-requires 'Catalyst::Runtime' => '[% catalyst_version %]';
-requires 'Catalyst::Plugin::ConfigLoader';
-requires 'Catalyst::Plugin::Static::Simple';
-requires 'Catalyst::Action::RenderView';
-requires 'parent';
-requires 'Config::General'; # This should reflect the config file format you've chosen
- # See Catalyst::Plugin::ConfigLoader for supported formats
-catalyst;
-
-install_script glob('script/*.pl');
-auto_install;
-WriteAll;
Deleted: Catalyst-Devel/1.00/branches/helper_refactor/share/root/rootclass.tt
===================================================================
--- Catalyst-Devel/1.00/branches/helper_refactor/share/root/rootclass.tt 2009-06-12 00:42:45 UTC (rev 10509)
+++ Catalyst-Devel/1.00/branches/helper_refactor/share/root/rootclass.tt 2009-06-12 00:44:41 UTC (rev 10510)
@@ -1,61 +0,0 @@
-package [% rootname %];
-
-use strict;
-use warnings;
-use parent 'Catalyst::Controller';
-
-#
-# Sets the actions in this controller to be registered with no prefix
-# so they function identically to actions created in MyApp.pm
-#
-__PACKAGE__->config->{namespace} = '';
-
-=head1 NAME
-
-[% rootname %] - Root Controller for [% name %]
-
-=head1 DESCRIPTION
-
-[enter your description here]
-
-=head1 METHODS
-
-=cut
-
-=head2 index
-
-=cut
-
-sub index :Path :Args(0) {
- my ( $self, $c ) = @_;
-
- # Hello World
- $c->response->body( $c->welcome_message );
-}
-
-sub default :Path {
- my ( $self, $c ) = @_;
- $c->response->body( 'Page not found' );
- $c->response->status(404);
-}
-
-=head2 end
-
-Attempt to render a view, if needed.
-
-=cut
-
-sub end : ActionClass('RenderView') {}
-
-=head1 AUTHOR
-
-[% author %]
-
-=head1 LICENSE
-
-This library is free software. You can redistribute it and/or modify
-it under the same terms as Perl itself.
-
-=cut
-
-1;
Deleted: Catalyst-Devel/1.00/branches/helper_refactor/share/root/server.tt
===================================================================
--- Catalyst-Devel/1.00/branches/helper_refactor/share/root/server.tt 2009-06-12 00:42:45 UTC (rev 10509)
+++ Catalyst-Devel/1.00/branches/helper_refactor/share/root/server.tt 2009-06-12 00:44:41 UTC (rev 10510)
@@ -1,159 +0,0 @@
-[% startperl %]
-
-BEGIN {
- $ENV{CATALYST_ENGINE} ||= 'HTTP';
- $ENV{CATALYST_SCRIPT_GEN} = [% scriptgen %];
- require Catalyst::Engine::HTTP;
-}
-
-use strict;
-use warnings;
-use Getopt::Long;
-use Pod::Usage;
-use FindBin;
-use lib "$FindBin::Bin/../lib";
-
-my $debug = 0;
-my $fork = 0;
-my $help = 0;
-my $host = undef;
-my $port = $ENV{[% appenv %]_PORT} || $ENV{CATALYST_PORT} || 3000;
-my $keepalive = 0;
-my $restart = $ENV{[% appenv %]_RELOAD} || $ENV{CATALYST_RELOAD} || 0;
-my $background = 0;
-my $pidfile = undef;
-
-my $check_interval;
-my $file_regex;
-my $watch_directory;
-my $follow_symlinks;
-
-my @argv = @ARGV;
-
-GetOptions(
- 'debug|d' => \$debug,
- 'fork|f' => \$fork,
- 'help|?' => \$help,
- 'host=s' => \$host,
- 'port|p=s' => \$port,
- 'keepalive|k' => \$keepalive,
- 'restart|r' => \$restart,
- 'restartdelay|rd=s' => \$check_interval,
- 'restartregex|rr=s' => \$file_regex,
- 'restartdirectory=s@' => \$watch_directory,
- 'followsymlinks' => \$follow_symlinks,
- 'background' => \$background,
- 'pidfile=s' => \$pidfile,
-);
-
-pod2usage(1) if $help;
-
-if ( $debug ) {
- $ENV{CATALYST_DEBUG} = 1;
-}
-
-# If we load this here, then in the case of a restarter, it does not
-# need to be reloaded for each restart.
-require Catalyst;
-
-# If this isn't done, then the Catalyst::Devel tests for the restarter
-# fail.
-$| = 1 if $ENV{HARNESS_ACTIVE};
-
-my $runner = sub {
- # This is require instead of use so that the above environment
- # variables can be set at runtime.
- require [% name %];
-
- [% name %]->run(
- $port, $host,
- {
- argv => \@argv,
- 'fork' => $fork,
- keepalive => $keepalive,
- background => $background,
- pidfile => $pidfile,
- }
- );
-};
-
-if ( $restart ) {
- die "Cannot run in the background and also watch for changed files.\n"
- if $background;
-
- require Catalyst::Restarter;
-
- my $subclass = Catalyst::Restarter->pick_subclass;
-
- my %args;
- $args{follow_symlinks} = 1
- if $follow_symlinks;
- $args{directories} = $watch_directory
- if defined $watch_directory;
- $args{sleep_interval} = $check_interval
- if defined $check_interval;
- $args{filter} = qr/$file_regex/
- if defined $file_regex;
-
- my $restarter = $subclass->new(
- %args,
- start_sub => $runner,
- );
-
- $restarter->run_and_watch;
-}
-else {
- $runner->();
-}
-
-1;
-
-=head1 NAME
-
-[% appprefix %]_server.pl - Catalyst Testserver
-
-=head1 SYNOPSIS
-
-[% appprefix %]_server.pl [options]
-
- Options:
- -d -debug force debug mode
- -f -fork handle each request in a new process
- (defaults to false)
- -? -help display this help and exits
- -host host (defaults to all)
- -p -port port (defaults to 3000)
- -k -keepalive enable keep-alive connections
- -r -restart restart when files get modified
- (defaults to false)
- -rd -restartdelay delay between file checks
- (ignored if you have Linux::Inotify2 installed)
- -rr -restartregex regex match files that trigger
- a restart when modified
- (defaults to '\.yml$|\.yaml$|\.conf|\.pm$')
- -restartdirectory the directory to search for
- modified files, can be set mulitple times
- (defaults to '[SCRIPT_DIR]/..')
- -follow_symlinks follow symlinks in search directories
- (defaults to false. this is a no-op on Win32)
- -background run the process in the background
- -pidfile specify filename for pid file
-
- See also:
- perldoc Catalyst::Manual
- perldoc Catalyst::Manual::Intro
-
-=head1 DESCRIPTION
-
-Run a Catalyst Testserver for this application.
-
-=head1 AUTHORS
-
-Catalyst Contributors, see Catalyst.pm
-
-=head1 COPYRIGHT
-
-This library is free software. You can redistribute it and/or modify
-it under the same terms as Perl itself.
-
-=cut
More information about the Catalyst-commits
mailing list