[Apache-dispatch-devel] SF.net SVN: apache-dispatch: [26] trunk
Brought to you by:
geoffrey_young,
phred_moyer
Menu
▾
▴
[Apache-dispatch-devel] SF.net SVN: apache-dispatch: [26] trunk
|
From: <phr...@us...> - 2006-04-23 03:10:36
|
Revision: 26 Author: phred_moyer Date: 2006-04-22 20:10:10 -0700 (Sat, 22 Apr 2006) ViewCVS: http://svn.sourceforge.net/apache-dispatch/?rev=26&view=rev Log Message: ----------- Ok geoff you can stop cringing from my previous checkins, I understand how the xs voodoo works now. the makefile.pl wasn't in Apache::Dispatch namespace, it was in main namespace since the first line was shebang perl... Modified Paths: -------------- trunk/Makefile.PL trunk/lib/Apache/Dispatch.pm trunk/t/conf/extra.last.conf.in Modified: trunk/Makefile.PL =================================================================== --- trunk/Makefile.PL 2006-04-23 02:00:32 UTC (rev 25) +++ trunk/Makefile.PL 2006-04-23 03:10:10 UTC (rev 26) @@ -1,4 +1,4 @@ -#!perl +package Apache::Dispatch; require 5.005; @@ -38,7 +38,6 @@ } elsif ($mp_wanted != 2) { # mod_perl1 specific makefile - eval { require Apache::ExtUtils; require Apache::src; @@ -61,10 +60,18 @@ $makefile_params{'PL_FILES'} = {'set_pureperl.PL' => '0'}; $makefile_params{'PREREQ_PM'} = {mod_perl => 1.2401,}; + $makefile_params{'clean'} = {FILES => '*.xs*'}; + + import Apache::ExtUtils qw(command_table); + require Apache::Dispatch::Util; + my $directives = Apache::Dispatch::Util->directives(); + command_table($directives); + } my $inc = Apache::src->new->inc; die "Can't find mod_perl header files installed" unless $inc; + require ExtUtils::MakeMaker; ExtUtils::MakeMaker::WriteMakefile( NAME => 'Apache::Dispatch', Modified: trunk/lib/Apache/Dispatch.pm =================================================================== --- trunk/lib/Apache/Dispatch.pm 2006-04-23 02:00:32 UTC (rev 25) +++ trunk/lib/Apache/Dispatch.pm 2006-04-23 03:10:10 UTC (rev 26) @@ -11,111 +11,8 @@ use strict; use warnings; -my $VERSION = '0.10'; +our $VERSION = '0.10'; -my @directives = ( - - #------------------------------------------------------------------ - # DispatchPrefix defines the base class for a given <Location> - #------------------------------------------------------------------ - { - name => 'DispatchPrefix', - errmsg => 'a class to be used as the base class', - args_how => 'TAKE1', - req_override => 'OR_ALL', - }, - - #------------------------------------------------------------------ - # DispatchExtras defines the extra dispatch methods to enable - #------------------------------------------------------------------ - { - name => 'DispatchExtras', - errmsg => 'choose any of: Pre, Post, or Error', - args_how => 'ITERATE', - req_override => 'OR_ALL', - }, - - #------------------------------------------------------------------ - # DispatchStat enables module testing and subsequent reloading - #------------------------------------------------------------------ - { - name => 'DispatchStat', - errmsg => 'choose one of On, Off, or ISA', - args_how => 'TAKE1', - req_override => 'OR_ALL', - }, - - #------------------------------------------------------------------ - # DispatchAUTOLOAD defines AutoLoader behavior - #------------------------------------------------------------------ - { - name => 'DispatchAUTOLOAD', - errmsg => 'choose one of On or Off', - args_how => 'FLAG', - req_override => 'OR_ALL', - }, - - #------------------------------------------------------------------ - # DispatchDebug defines debugging verbosity - #------------------------------------------------------------------ - { - name => 'DispatchDebug', - errmsg => 'numeric verbosity level', - args_how => 'TAKE1', - req_override => 'OR_ALL', - }, - - #------------------------------------------------------------------ - # DispatchISA is a list of modules your module should inherit from - #------------------------------------------------------------------ - { - name => 'DispatchISA', - errmsg => 'a list of parent modules', - args_how => 'ITERATE', - req_override => 'OR_ALL', - }, - - #------------------------------------------------------------------ - # DispatchLocation allows you to redefine the <Location> - #------------------------------------------------------------------ - { - name => 'DispatchLocation', - errmsg => 'a location to replace the current <Location>', - args_how => 'TAKE1', - req_override => 'OR_ALL', - }, - - #------------------------------------------------------------------ - # DispatchRequire require()s the class - #------------------------------------------------------------------ - { - name => 'DispatchRequire', - errmsg => 'choose one of On or Off', - args_how => 'FLAG', - req_override => 'OR_ALL', - }, - - #------------------------------------------------------------------ - # DispatchFilter makes the dispatched handler Apache::Filter aware - #------------------------------------------------------------------ - { - name => 'DispatchFilter', - errmsg => 'choose one of On or Off', - args_how => 'FLAG', - req_override => 'OR_ALL', - }, - - #------------------------------------------------------------------ - # DispatchUppercase converts the first char of a class to uppercase - #------------------------------------------------------------------ - { - name => 'DispatchUpperCase', - errmsg => 'choose one of On or Off', - args_how => 'FLAG', - req_override => 'OR_ALL', - }, -); - use mod_perl 1.2401; use Apache::Constants qw(OK DECLINED SERVER_ERROR); use Apache::Log; @@ -129,7 +26,7 @@ require Apache::ModuleConfig; require DynaLoader; @Apache::Dispatch::ISA = qw(DynaLoader); - __PACKAGE__->bootstrap($VERSION); + __PACKAGE__->bootstrap($VERSION); } sub directives { Modified: trunk/t/conf/extra.last.conf.in =================================================================== --- trunk/t/conf/extra.last.conf.in 2006-04-23 02:00:32 UTC (rev 25) +++ trunk/t/conf/extra.last.conf.in 2006-04-23 03:10:10 UTC (rev 26) @@ -2,9 +2,11 @@ PerlLoadModule Apache2::Dispatch </IfDefine> <IfDefine APACHE1> - PerlLoadModule Apache::Dispatch + PerlModule Apache::Dispatch </IfDefine> - +<Perl> + print STDERR "GOOOOZAAAAAAAQ!!!"; +</Perl> <Location /plain> SetHandler perl-script DispatchRequire On This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |