apache-dispatch-devel Mailing List for Apache::Dispatch

Brought to you by: geoffrey_young, phred_moyer

apache-dispatch-devel — Apache::Dispatch development list

You can subscribe to this list here.

2006	_Jan	_Feb	_Mar (4)	_Apr (33)	_May (10)	_Jun (22)	_Jul (3)	_Aug (15)	_Sep (3)	_Oct (3)	_Nov	_Dec
2007	_Jan	_Feb	_Mar	_Apr	_May	_Jun	_Jul (2)	_Aug (5)	_Sep	_Oct	_Nov	_Dec (9)
2008	_Jan (6)	_Feb (2)	_Mar	_Apr	_May	_Jun (11)	_Jul	_Aug	_Sep	_Oct (2)	_Nov	_Dec
2009	_Jan	_Feb	_Mar	_Apr (12)	_May	_Jun	_Jul	_Aug	_Sep	_Oct	_Nov	_Dec
2010	_Jan	_Feb (3)	_Mar	_Apr	_May	_Jun	_Jul	_Aug	_Sep	_Oct	_Nov	_Dec

Flat | Threaded

1 2 3 .. 6 > >> (Page 1 of 6)

[Apache-dispatch-devel] SF.net SVN: apache-dispatch:[86] trunk

From: <phr...@us...> - 2010-02-13 02:43:34

Revision: 86
          http://apache-dispatch.svn.sourceforge.net/apache-dispatch/?rev=86&view=rev
Author:   phred_moyer
Date:     2010-02-13 02:43:27 +0000 (Sat, 13 Feb 2010)

Log Message:
-----------
Notes from Andreas Koenig on why I'm getting version errors for indexing.

our $VERSION = $Apache::Dispatch::Util::VERSION;

Such a line isn't understood by MakeMaker parse_version: it will only
return undef. But you can declare what you wish to be indexed in the
META.yml if you do not want to change the line.

Modified Paths:
--------------
    trunk/Changes
    trunk/lib/Apache/Dispatch/Util.pm
    trunk/lib/Apache/Dispatch.pm
    trunk/lib/Apache2/Dispatch.pm

Modified: trunk/Changes
===================================================================
--- trunk/Changes	2010-02-09 07:11:48 UTC (rev 85)
+++ trunk/Changes	2010-02-13 02:43:27 UTC (rev 86)
@@ -1,5 +1,8 @@
 Revision history for Perl extension Apache::Dispatch
 
+0.15 02.12.2010 18:38 PST
+  - set explicit versions in files so MakeMaker can parse them
+
 0.14 02.08.2010 23:09 PST
   - set the exit code to 255 if Apache::Bootstrap dependencies missing
 

Modified: trunk/lib/Apache/Dispatch/Util.pm
===================================================================
--- trunk/lib/Apache/Dispatch/Util.pm	2010-02-09 07:11:48 UTC (rev 85)
+++ trunk/lib/Apache/Dispatch/Util.pm	2010-02-13 02:43:27 UTC (rev 86)
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-our $VERSION = '0.14';
+our $VERSION = '0.15';
 
 =head1 NAME
 

Modified: trunk/lib/Apache/Dispatch.pm
===================================================================
--- trunk/lib/Apache/Dispatch.pm	2010-02-09 07:11:48 UTC (rev 85)
+++ trunk/lib/Apache/Dispatch.pm	2010-02-13 02:43:27 UTC (rev 86)
@@ -14,7 +14,7 @@
 use Apache::Log			   ();
 use Apache::Dispatch::Util ();
 
-our $VERSION = $Apache::Dispatch::Util::VERSION;
+our $VERSION = 0.15;
 
 BEGIN {
     push @Apache::Dispatch::ISA, qw(Apache::Dispatch::Util);

Modified: trunk/lib/Apache2/Dispatch.pm
===================================================================
--- trunk/lib/Apache2/Dispatch.pm	2010-02-09 07:11:48 UTC (rev 85)
+++ trunk/lib/Apache2/Dispatch.pm	2010-02-13 02:43:27 UTC (rev 86)
@@ -18,7 +18,7 @@
 use Apache::Dispatch::Util;
 push @Apache2::Dispatch::ISA, qw(Apache::Dispatch::Util);
 
-our $VERSION = $Apache::Dispatch::Util::VERSION;
+our $VERSION = 0.15;
 
 # Initialize the directives
 my $directives = __PACKAGE__->directives();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Apache-dispatch-devel] SF.net SVN: apache-dispatch:[85] trunk

From: <phr...@us...> - 2010-02-09 07:11:54

Revision: 85
          http://apache-dispatch.svn.sourceforge.net/apache-dispatch/?rev=85&view=rev
Author:   phred_moyer
Date:     2010-02-09 07:11:48 +0000 (Tue, 09 Feb 2010)

Log Message:
-----------
Set the exit code to 255 on bootstrap dep failures to make cpantesters happy.

Modified Paths:
--------------
    trunk/Changes
    trunk/Makefile.PL
    trunk/lib/Apache/Dispatch/Util.pm

Modified: trunk/Changes
===================================================================
--- trunk/Changes	2010-02-06 21:18:41 UTC (rev 84)
+++ trunk/Changes	2010-02-09 07:11:48 UTC (rev 85)
@@ -1,5 +1,8 @@
 Revision history for Perl extension Apache::Dispatch
 
+0.14 02.08.2010 23:09 PST
+  - set the exit code to 255 if Apache::Bootstrap dependencies missing
+
 0.13 02.06.2010 13:08 PST
   - require Apache::Bootstrap 0.07 to install on mp1/mp2 properly
   - fix some of the Makefile.PL logic so that mp2 is checked first

Modified: trunk/Makefile.PL
===================================================================
--- trunk/Makefile.PL	2010-02-06 21:18:41 UTC (rev 84)
+++ trunk/Makefile.PL	2010-02-09 07:11:48 UTC (rev 85)
@@ -9,12 +9,13 @@
 # minimum version of A::B required
 my $ab = 0.07;
 eval { require Apache::Bootstrap };
+do { $! = 255; die "Please install Apache::Bootstrap $ab"; } if $@;
 
-die "Please install Apache::Bootstrap $ab" if $@;
+if ($Apache::Bootstrap::VERSION < $ab) {
+    $! = 255;
+    die "Apache::Bootstrap $ab required, found " . $Apache::Bootstrap::VERSION;
+}
 
-die "Apache::Bootstrap $ab required, found " . $Apache::Bootstrap::VERSION
-    if ($Apache::Bootstrap::VERSION < $ab);
-
 # make sure we have at least one minimum version of mod_perl
 my $bs = eval { Apache::Bootstrap->new({ mod_perl2 => 1.99022,
                                          mod_perl  => 1.30 }) };

Modified: trunk/lib/Apache/Dispatch/Util.pm
===================================================================
--- trunk/lib/Apache/Dispatch/Util.pm	2010-02-06 21:18:41 UTC (rev 84)
+++ trunk/lib/Apache/Dispatch/Util.pm	2010-02-09 07:11:48 UTC (rev 85)
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-our $VERSION = '0.13';
+our $VERSION = '0.14';
 
 =head1 NAME
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Apache-dispatch-devel] SF.net SVN: apache-dispatch:[84] trunk

From: <phr...@us...> - 2010-02-06 21:18:48

Revision: 84
          http://apache-dispatch.svn.sourceforge.net/apache-dispatch/?rev=84&view=rev
Author:   phred_moyer
Date:     2010-02-06 21:18:41 +0000 (Sat, 06 Feb 2010)

Log Message:
-----------
Release 0.13

Modified Paths:
--------------
    trunk/Changes
    trunk/Makefile.PL
    trunk/README
    trunk/lib/Apache/Dispatch/Util.pm
    trunk/lib/Apache/Dispatch.pm
    trunk/lib/Apache2/Dispatch.pm

Modified: trunk/Changes
===================================================================
--- trunk/Changes	2009-04-26 07:13:11 UTC (rev 83)
+++ trunk/Changes	2010-02-06 21:18:41 UTC (rev 84)
@@ -1,6 +1,7 @@
 Revision history for Perl extension Apache::Dispatch
 
-0.13-dev
+0.13 02.06.2010 13:08 PST
+  - require Apache::Bootstrap 0.07 to install on mp1/mp2 properly
   - fix some of the Makefile.PL logic so that mp2 is checked first
 
 0.12 04.25.2009 16:06 PST

Modified: trunk/Makefile.PL
===================================================================
--- trunk/Makefile.PL	2009-04-26 07:13:11 UTC (rev 83)
+++ trunk/Makefile.PL	2010-02-06 21:18:41 UTC (rev 84)
@@ -3,42 +3,51 @@
 use strict;
 use warnings;
 
+use constant DEBUG => $ENV{AB_DEBUG} || 0;
+
+#########################################################################
 # minimum version of A::B required
-use Apache::Bootstrap 0.07;
+my $ab = 0.07;
+eval { require Apache::Bootstrap };
 
-my $bootstrap;
+die "Please install Apache::Bootstrap $ab" if $@;
 
-BEGIN {
-    # make sure we have at least one minimum version required
-    $bootstrap = Apache::Bootstrap->new({ mod_perl2 => 1.99022,
-                                          mod_perl  => 1.30 });
-}
+die "Apache::Bootstrap $ab required, found " . $Apache::Bootstrap::VERSION
+    if ($Apache::Bootstrap::VERSION < $ab);
 
-# try mp2 first, but allow builds with mod_perl one 
+# make sure we have at least one minimum version of mod_perl
+my $bs = eval { Apache::Bootstrap->new({ mod_perl2 => 1.99022,
+                                         mod_perl  => 1.30 }) };
+do { $! = 255; die($@); } if $@;
+##########################################################################
+
+
+# try mp2 first, but allow builds with mod_perl one
 # when MOD_PERL_1_BUILD ENV is set (for maintainers mostly)
-my $mp_gen = $bootstrap->satisfy_mp_generation(2);
+my $mp_gen = $bs->satisfy_mp_generation(2);
 if (! $ENV{MOD_PERL_1_BUILD} && $mp_gen) {
 
-	warn("building for mp2 since MOD_PERL_1_BUILD not set");
+	warn("building for mp2 since MOD_PERL_1_BUILD not set") if DEBUG;
     push @ARGV, "-apxs $ENV{MP_APXS}" if exists $ENV{MP_APXS};
 
-} elsif ( $mp_gen = $bootstrap->satisfy_mp_generation(1)) {
+} elsif ( $mp_gen = $bs->satisfy_mp_generation(1)) {
 
-	warn("building for mp1");
+	warn("building for mp1") if DEBUG;
 } else {
 	die "no mp generation could be satisfied\n";
 }
 
 # check for Apache::Test, $HAS_APACHE_TEST contains version or is undefined
-my $HAS_APACHE_TEST = $bootstrap->check_for_apache_test();
+my $HAS_APACHE_TEST = $bs->check_for_apache_test();
 
 # calculate common makefile version vars
-my $apache = $bootstrap->apache_major_version;
+
+my $apache = $bs->apache_major_version;
 my $base_lib = "lib/$apache/Dispatch.pm";
 
 # common makefile build options
 my %maker_opts = (
-    PREREQ_PM     => $bootstrap->mp_prereqs,
+    PREREQ_PM     => $bs->mp_prereqs,
     clean         => { FILES => 't/TEST, *.xs*' },
     NAME          => "$apache\::Dispatch",
     VERSION_FROM  => 'lib/Apache/Dispatch/Util.pm',
@@ -84,7 +93,7 @@
 
 }
 
-$bootstrap->WriteMakefile( %maker_opts );
+$bs->WriteMakefile( %maker_opts );
 
 pop @ARGV if $ENV{MOD_PERL_1_BUILD};
 

Modified: trunk/README
===================================================================
--- trunk/README	2009-04-26 07:13:11 UTC (rev 83)
+++ trunk/README	2010-02-06 21:18:41 UTC (rev 84)
@@ -1,12 +1,12 @@
 NAME
-    Apache::Dispatch - call PerlHandlers with the ease of Registry scripts
+    Apache2::Dispatch - call PerlHandlers with the ease of Registry scripts
 
 SYNOPSIS
     Makefile.PL:
 
-        # require util since it can be used outside an apache process
+        # require a:d:util since it can be used outside an apache process
         PREREQ_PM    => {
-            'Apache::Dispatch::Util'    => 0.11,
+            'Apache::Dispatch::Util'    => 0.13,
         }
 
     httpd.conf:
@@ -28,6 +28,11 @@
       </Location>
 
 DESCRIPTION
+    As of version 0.13, Apache2::Dispatch is now the preferred package over
+    Apache::Dispatch.  The ASF end of lifed Apache 1.3, so future versions
+    of Apache2::Dispatch will default to installing against mod_perl2.
+    mod_perl1 is still very much supported through, thanks to Apache::Boostrap.
+
     Apache::Dispatch translates $r->uri into a class and method and runs it
     as a PerlHandler. Basically, this allows you to call PerlHandlers as you
     would Regsitry scripts without having to load your httpd.conf with a

Modified: trunk/lib/Apache/Dispatch/Util.pm
===================================================================
--- trunk/lib/Apache/Dispatch/Util.pm	2009-04-26 07:13:11 UTC (rev 83)
+++ trunk/lib/Apache/Dispatch/Util.pm	2010-02-06 21:18:41 UTC (rev 84)
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-our $VERSION = '0.13-dev';
+our $VERSION = '0.13';
 
 =head1 NAME
 

Modified: trunk/lib/Apache/Dispatch.pm
===================================================================
--- trunk/lib/Apache/Dispatch.pm	2009-04-26 07:13:11 UTC (rev 83)
+++ trunk/lib/Apache/Dispatch.pm	2010-02-06 21:18:41 UTC (rev 84)
@@ -9,13 +9,13 @@
 use strict;
 use warnings;
 
-our $VERSION = '0.13-dev';
-
 use mod_perl 1.2401;
 use Apache::Constants qw(OK DECLINED SERVER_ERROR);
 use Apache::Log			   ();
 use Apache::Dispatch::Util ();
 
+our $VERSION = $Apache::Dispatch::Util::VERSION;
+
 BEGIN {
     push @Apache::Dispatch::ISA, qw(Apache::Dispatch::Util);
 

Modified: trunk/lib/Apache2/Dispatch.pm
===================================================================
--- trunk/lib/Apache2/Dispatch.pm	2009-04-26 07:13:11 UTC (rev 83)
+++ trunk/lib/Apache2/Dispatch.pm	2010-02-06 21:18:41 UTC (rev 84)
@@ -9,8 +9,6 @@
 use strict;
 use warnings;
 
-our $VERSION = '0.13-dev';
-
 use mod_perl2 1.99023;
 use Apache2::Const -compile => qw(OK DECLINED SERVER_ERROR);
 use Apache2::Log         ();
@@ -20,6 +18,8 @@
 use Apache::Dispatch::Util;
 push @Apache2::Dispatch::ISA, qw(Apache::Dispatch::Util);
 
+our $VERSION = $Apache::Dispatch::Util::VERSION;
+
 # Initialize the directives
 my $directives = __PACKAGE__->directives();
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Apache-dispatch-devel] SF.net SVN: apache-dispatch:[83] trunk

From: <phr...@us...> - 2009-04-26 07:13:16

Revision: 83
          http://apache-dispatch.svn.sourceforge.net/apache-dispatch/?rev=83&view=rev
Author:   phred_moyer
Date:     2009-04-26 07:13:11 +0000 (Sun, 26 Apr 2009)

Log Message:
-----------
Fixup the Makefile.PL logic so that it tries mp2 first.
I think this mp1/mp2 logic stuff is finally working well.

Modified Paths:
--------------
    trunk/Changes
    trunk/Makefile.PL
    trunk/lib/Apache/Dispatch/Util.pm

Modified: trunk/Changes
===================================================================
--- trunk/Changes	2009-04-25 23:24:32 UTC (rev 82)
+++ trunk/Changes	2009-04-26 07:13:11 UTC (rev 83)
@@ -1,6 +1,7 @@
 Revision history for Perl extension Apache::Dispatch
 
 0.13-dev
+  - fix some of the Makefile.PL logic so that mp2 is checked first
 
 0.12 04.25.2009 16:06 PST
   - set library versions to $Apache::Dispatch::Util::VERSION so PAUSE

Modified: trunk/Makefile.PL
===================================================================
--- trunk/Makefile.PL	2009-04-25 23:24:32 UTC (rev 82)
+++ trunk/Makefile.PL	2009-04-26 07:13:11 UTC (rev 83)
@@ -4,7 +4,7 @@
 use warnings;
 
 # minimum version of A::B required
-use Apache::Bootstrap 0.06;
+use Apache::Bootstrap 0.07;
 
 my $bootstrap;
 
@@ -14,16 +14,19 @@
                                           mod_perl  => 1.30 });
 }
 
-# allow builds with mod_perl one when MOD_PERL_1_BUILD ENV is set
-my $mp_gen;
-if ( $ENV{MOD_PERL_1_BUILD} ) {
+# try mp2 first, but allow builds with mod_perl one 
+# when MOD_PERL_1_BUILD ENV is set (for maintainers mostly)
+my $mp_gen = $bootstrap->satisfy_mp_generation(2);
+if (! $ENV{MOD_PERL_1_BUILD} && $mp_gen) {
 
-    $mp_gen = $bootstrap->satisfy_mp_generation(1);
+	warn("building for mp2 since MOD_PERL_1_BUILD not set");
+    push @ARGV, "-apxs $ENV{MP_APXS}" if exists $ENV{MP_APXS};
+
+} elsif ( $mp_gen = $bootstrap->satisfy_mp_generation(1)) {
+
+	warn("building for mp1");
 } else {
-
-    # else we build for mp2
-    push @ARGV, "-apxs $ENV{MP_APXS}" if exists $ENV{MP_APXS};
-    $mp_gen = $bootstrap->satisfy_mp_generation(2);
+	die "no mp generation could be satisfied\n";
 }
 
 # check for Apache::Test, $HAS_APACHE_TEST contains version or is undefined

Modified: trunk/lib/Apache/Dispatch/Util.pm
===================================================================
--- trunk/lib/Apache/Dispatch/Util.pm	2009-04-25 23:24:32 UTC (rev 82)
+++ trunk/lib/Apache/Dispatch/Util.pm	2009-04-26 07:13:11 UTC (rev 83)
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-our $VERSION = 0.13-dev;
+our $VERSION = '0.13-dev';
 
 =head1 NAME
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Apache-dispatch-devel] SF.net SVN: apache-dispatch:[82] trunk/lib/Apache/Dispatch.pm

From: <phr...@us...> - 2009-04-25 23:24:41

Revision: 82
          http://apache-dispatch.svn.sourceforge.net/apache-dispatch/?rev=82&view=rev
Author:   phred_moyer
Date:     2009-04-25 23:24:32 +0000 (Sat, 25 Apr 2009)

Log Message:
-----------
remove old cvs tag

Modified Paths:
--------------
    trunk/lib/Apache/Dispatch.pm

Modified: trunk/lib/Apache/Dispatch.pm
===================================================================
--- trunk/lib/Apache/Dispatch.pm	2009-04-25 23:19:41 UTC (rev 81)
+++ trunk/lib/Apache/Dispatch.pm	2009-04-25 23:24:32 UTC (rev 82)
@@ -1,7 +1,5 @@
 package Apache::Dispatch;
 
-# $Id: Dispatch.pm,v 1.34 2002/12/02 19:29:26 geoff Exp $
-
 #---------------------------------------------------------------------
 #
 # usage: PerlHandler Apache::Dispatch


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Apache-dispatch-devel] SF.net SVN: apache-dispatch:[81] trunk/RELEASE

From: <phr...@us...> - 2009-04-25 23:19:50

Revision: 81
          http://apache-dispatch.svn.sourceforge.net/apache-dispatch/?rev=81&view=rev
Author:   phred_moyer
Date:     2009-04-25 23:19:41 +0000 (Sat, 25 Apr 2009)

Log Message:
-----------
update release doc

Modified Paths:
--------------
    trunk/RELEASE

Modified: trunk/RELEASE
===================================================================
--- trunk/RELEASE	2009-04-25 23:18:29 UTC (rev 80)
+++ trunk/RELEASE	2009-04-25 23:19:41 UTC (rev 81)
@@ -81,4 +81,5 @@
      $ perl -pi -e 's/(\d+)\.(\d+)/join(".", $1, $2+1)/eg' RELEASE
 
   d. commit Changes
-     % svn ci -m "start 0.13-dev cycle" Changes RELEASE lib/Apache/Dispatch.pm
+     % svn ci -m "start 0.13-dev cycle" Changes RELEASE lib/Apache/Dispatch.pm \
+        lib/Apache2/Dispatch.pm lib/Apache/Dispatch/Util.pm


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Apache-dispatch-devel] SF.net SVN: apache-dispatch:[80] trunk/lib/Apache

From: <phr...@us...> - 2009-04-25 23:18:39

Revision: 80
          http://apache-dispatch.svn.sourceforge.net/apache-dispatch/?rev=80&view=rev
Author:   phred_moyer
Date:     2009-04-25 23:18:29 +0000 (Sat, 25 Apr 2009)

Log Message:
-----------
CPAN indexer issue still present, looks like it pulls the version
out of the code with a regex or something rather than evaling it.

Modified Paths:
--------------
    trunk/lib/Apache/Dispatch.pm
    trunk/lib/Apache2/Dispatch.pm

Modified: trunk/lib/Apache/Dispatch.pm
===================================================================
--- trunk/lib/Apache/Dispatch.pm	2009-04-25 23:12:13 UTC (rev 79)
+++ trunk/lib/Apache/Dispatch.pm	2009-04-25 23:18:29 UTC (rev 80)
@@ -11,14 +11,13 @@
 use strict;
 use warnings;
 
+our $VERSION = '0.13-dev';
 
 use mod_perl 1.2401;
 use Apache::Constants qw(OK DECLINED SERVER_ERROR);
 use Apache::Log			   ();
 use Apache::Dispatch::Util ();
 
-our $VERSION = $Apache::Dispatch::Util::VERSION;
-
 BEGIN {
     push @Apache::Dispatch::ISA, qw(Apache::Dispatch::Util);
 

Modified: trunk/lib/Apache2/Dispatch.pm
===================================================================
--- trunk/lib/Apache2/Dispatch.pm	2009-04-25 23:12:13 UTC (rev 79)
+++ trunk/lib/Apache2/Dispatch.pm	2009-04-25 23:18:29 UTC (rev 80)
@@ -9,6 +9,8 @@
 use strict;
 use warnings;
 
+our $VERSION = '0.13-dev';
+
 use mod_perl2 1.99023;
 use Apache2::Const -compile => qw(OK DECLINED SERVER_ERROR);
 use Apache2::Log         ();
@@ -18,8 +20,6 @@
 use Apache::Dispatch::Util;
 push @Apache2::Dispatch::ISA, qw(Apache::Dispatch::Util);
 
-our $VERSION = $Apache::Dispatch::Util::VERSION;
-
 # Initialize the directives
 my $directives = __PACKAGE__->directives();
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Apache-dispatch-devel] SF.net SVN: apache-dispatch:[79] trunk

From: <phr...@us...> - 2009-04-25 23:12:18

Revision: 79
          http://apache-dispatch.svn.sourceforge.net/apache-dispatch/?rev=79&view=rev
Author:   phred_moyer
Date:     2009-04-25 23:12:13 +0000 (Sat, 25 Apr 2009)

Log Message:
-----------
Start 0.13 dev cycle

Modified Paths:
--------------
    trunk/Changes
    trunk/lib/Apache/Dispatch/Util.pm

Modified: trunk/Changes
===================================================================
--- trunk/Changes	2009-04-25 23:10:40 UTC (rev 78)
+++ trunk/Changes	2009-04-25 23:12:13 UTC (rev 79)
@@ -1,5 +1,7 @@
 Revision history for Perl extension Apache::Dispatch
 
+0.13-dev
+
 0.12 04.25.2009 16:06 PST
   - set library versions to $Apache::Dispatch::Util::VERSION so PAUSE
 	can index them correctly

Modified: trunk/lib/Apache/Dispatch/Util.pm
===================================================================
--- trunk/lib/Apache/Dispatch/Util.pm	2009-04-25 23:10:40 UTC (rev 78)
+++ trunk/lib/Apache/Dispatch/Util.pm	2009-04-25 23:12:13 UTC (rev 79)
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-our $VERSION = 0.12;
+our $VERSION = 0.13-dev;
 
 =head1 NAME
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Apache-dispatch-devel] SF.net SVN: apache-dispatch:[78] trunk

From: <phr...@us...> - 2009-04-25 23:10:45

Revision: 78
          http://apache-dispatch.svn.sourceforge.net/apache-dispatch/?rev=78&view=rev
Author:   phred_moyer
Date:     2009-04-25 23:10:40 +0000 (Sat, 25 Apr 2009)

Log Message:
-----------
Release 0.12 which fixes 0.11 CPAN version indexer issue

Modified Paths:
--------------
    trunk/Changes
    trunk/lib/Apache/Dispatch/Util.pm
    trunk/lib/Apache/Dispatch.pm
    trunk/lib/Apache2/Dispatch.pm

Modified: trunk/Changes
===================================================================
--- trunk/Changes	2009-04-25 22:51:15 UTC (rev 77)
+++ trunk/Changes	2009-04-25 23:10:40 UTC (rev 78)
@@ -1,6 +1,8 @@
 Revision history for Perl extension Apache::Dispatch
 
-0.12-dev
+0.12 04.25.2009 16:06 PST
+  - set library versions to $Apache::Dispatch::Util::VERSION so PAUSE
+	can index them correctly
 
 0.11 04.25.2009 14:32 PST
   - remove t/TEST.PL (it is not needed)

Modified: trunk/lib/Apache/Dispatch/Util.pm
===================================================================
--- trunk/lib/Apache/Dispatch/Util.pm	2009-04-25 22:51:15 UTC (rev 77)
+++ trunk/lib/Apache/Dispatch/Util.pm	2009-04-25 23:10:40 UTC (rev 78)
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-our $VERSION = 0.12-dev;
+our $VERSION = 0.12;
 
 =head1 NAME
 

Modified: trunk/lib/Apache/Dispatch.pm
===================================================================
--- trunk/lib/Apache/Dispatch.pm	2009-04-25 22:51:15 UTC (rev 77)
+++ trunk/lib/Apache/Dispatch.pm	2009-04-25 23:10:40 UTC (rev 78)
@@ -17,6 +17,7 @@
 use Apache::Log			   ();
 use Apache::Dispatch::Util ();
 
+our $VERSION = $Apache::Dispatch::Util::VERSION;
 
 BEGIN {
     push @Apache::Dispatch::ISA, qw(Apache::Dispatch::Util);
@@ -47,7 +48,7 @@
     require Apache::ModuleConfig;
     require DynaLoader;
     push @Apache::Dispatch::ISA, qw(DynaLoader);
-    __PACKAGE__->bootstrap($Apache::Dispatch::Util::VERSION);
+    __PACKAGE__->bootstrap($VERSION);
 }
 
 sub handler {

Modified: trunk/lib/Apache2/Dispatch.pm
===================================================================
--- trunk/lib/Apache2/Dispatch.pm	2009-04-25 22:51:15 UTC (rev 77)
+++ trunk/lib/Apache2/Dispatch.pm	2009-04-25 23:10:40 UTC (rev 78)
@@ -18,6 +18,8 @@
 use Apache::Dispatch::Util;
 push @Apache2::Dispatch::ISA, qw(Apache::Dispatch::Util);
 
+our $VERSION = $Apache::Dispatch::Util::VERSION;
+
 # Initialize the directives
 my $directives = __PACKAGE__->directives();
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Apache-dispatch-devel] SF.net SVN: apache-dispatch:[77] trunk

From: <phr...@us...> - 2009-04-25 22:51:26

Revision: 77
          http://apache-dispatch.svn.sourceforge.net/apache-dispatch/?rev=77&view=rev
Author:   phred_moyer
Date:     2009-04-25 22:51:15 +0000 (Sat, 25 Apr 2009)

Log Message:
-----------
start 0.12 dev cycle

Modified Paths:
--------------
    trunk/Changes
    trunk/RELEASE
    trunk/lib/Apache/Dispatch/Util.pm

Modified: trunk/Changes
===================================================================
--- trunk/Changes	2009-04-25 22:46:21 UTC (rev 76)
+++ trunk/Changes	2009-04-25 22:51:15 UTC (rev 77)
@@ -1,5 +1,7 @@
 Revision history for Perl extension Apache::Dispatch
 
+0.12-dev
+
 0.11 04.25.2009 14:32 PST
   - remove t/TEST.PL (it is not needed)
   - put version in Apache::Dispatch::Util to avoid issue with Apache2::Module

Modified: trunk/RELEASE
===================================================================
--- trunk/RELEASE	2009-04-25 22:46:21 UTC (rev 76)
+++ trunk/RELEASE	2009-04-25 22:51:15 UTC (rev 77)
@@ -6,8 +6,8 @@
 
   a. edit ./Changes:
      - find lib -type f -name "*.pm" | \
-         xargs perl -pi -e 's,0.11-dev,0.11-RC1,g'
-     - perl -pi -e 's,0.11-dev,0.11-RC1,g' Changes
+         xargs perl -pi -e 's,0.12-dev,0.12-RC1,g'
+     - perl -pi -e 's,0.12-dev,0.12-RC1,g' Changes
 
      - don't commit these (see dev@ archives)
 
@@ -26,7 +26,7 @@
      o dev/perl.apache.org
      o modperl/perl.apache.org
 
-  Subject: [RELEASE CANDIDATE] Apache-Dispatch 0.11 RC\d+
+  Subject: [RELEASE CANDIDATE] Apache-Dispatch 0.12 RC\d+
 
    (or maybe longer to give most people a chance to catch up). no need
    to tag this package
@@ -61,7 +61,7 @@
 5. Announce the package
 
   a. post ... to the modperl, announce lists
-  Subject: [ANNOUNCE] Apache-Dispatch 0.11
+  Subject: [ANNOUNCE] Apache-Dispatch 0.12
      include 
   - MD5 sig (as it comes from CPAN upload announce).
   - the latest Changes
@@ -81,4 +81,4 @@
      $ perl -pi -e 's/(\d+)\.(\d+)/join(".", $1, $2+1)/eg' RELEASE
 
   d. commit Changes
-     % svn ci -m "start 0.12-dev cycle" Changes RELEASE lib/Apache/Dispatch.pm
+     % svn ci -m "start 0.13-dev cycle" Changes RELEASE lib/Apache/Dispatch.pm

Modified: trunk/lib/Apache/Dispatch/Util.pm
===================================================================
--- trunk/lib/Apache/Dispatch/Util.pm	2009-04-25 22:46:21 UTC (rev 76)
+++ trunk/lib/Apache/Dispatch/Util.pm	2009-04-25 22:51:15 UTC (rev 77)
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-our $VERSION = 0.11;
+our $VERSION = 0.12-dev;
 
 =head1 NAME
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Apache-dispatch-devel] SF.net SVN: apache-dispatch:[76] trunk

From: <phr...@us...> - 2009-04-25 22:46:33

Revision: 76
          http://apache-dispatch.svn.sourceforge.net/apache-dispatch/?rev=76&view=rev
Author:   phred_moyer
Date:     2009-04-25 22:46:21 +0000 (Sat, 25 Apr 2009)

Log Message:
-----------
Release 0.11 with A::B 0.06

Modified Paths:
--------------
    trunk/Changes
    trunk/MANIFEST
    trunk/README
    trunk/lib/Apache/Dispatch.pm

Modified: trunk/Changes
===================================================================
--- trunk/Changes	2009-04-19 08:11:26 UTC (rev 75)
+++ trunk/Changes	2009-04-25 22:46:21 UTC (rev 76)
@@ -1,6 +1,6 @@
 Revision history for Perl extension Apache::Dispatch
 
-0.11 04.05.2009 20:34 PDT
+0.11 04.25.2009 14:32 PST
   - remove t/TEST.PL (it is not needed)
   - put version in Apache::Dispatch::Util to avoid issue with Apache2::Module
   - document PerlLoadModule for Dispatch* directives - ideysus@annocpan

Modified: trunk/MANIFEST
===================================================================
--- trunk/MANIFEST	2009-04-19 08:11:26 UTC (rev 75)
+++ trunk/MANIFEST	2009-04-25 22:46:21 UTC (rev 76)
@@ -23,5 +23,4 @@
 t/03filter.t
 t/04oo.t
 t/conf/extra.last.conf.in
-t/TEST.PL
 META.yml                                 Module meta-data (added by MakeMaker)

Modified: trunk/README
===================================================================
--- trunk/README	2009-04-19 08:11:26 UTC (rev 75)
+++ trunk/README	2009-04-25 22:46:21 UTC (rev 76)
@@ -1,324 +1,310 @@
 NAME
+    Apache::Dispatch - call PerlHandlers with the ease of Registry scripts
 
-Apache::Dispatch - call PerlHandlers with the ease of Registry scripts
-
 SYNOPSIS
+    Makefile.PL:
 
-Makefile.PL:
+        # require util since it can be used outside an apache process
+        PREREQ_PM    => {
+            'Apache::Dispatch::Util'    => 0.11,
+        }
 
-    # require util since it can be used outside an apache process
-    PREREQ_PM    => {
-        'Apache::Dispatch::Util'    => 0.11,
+    httpd.conf:
 
-httpd.conf:
+      PerlModule Apache::Dispatch
+      PerlModule Bar
 
-  PerlModule Apache::Dispatch
-  PerlModule Bar
+      DispatchExtras Pre Post Error
+      DispatchStat On
+      DispatchISA "My::Utils"
+      DispatchAUTOLOAD Off
 
-  DispatchExtras Pre Post Error
-  DispatchStat On
-  DispatchISA "My::Utils"
-  DispatchAUTOLOAD Off
+      <Location /Foo>
+        SetHandler perl-script
+        PerlHandler Apache::Dispatch
 
-  <Location /Foo>
-    SetHandler perl-script
-    PerlHandler Apache::Dispatch
+        DispatchPrefix Bar
+        DispatchFilter Off
+      </Location>
 
-    DispatchPrefix Bar
-    DispatchFilter Off
-  </Location>
-
 DESCRIPTION
+    Apache::Dispatch translates $r->uri into a class and method and runs it
+    as a PerlHandler. Basically, this allows you to call PerlHandlers as you
+    would Regsitry scripts without having to load your httpd.conf with a
+    slurry of <Location> tags.
 
-Apache::Dispatch translates $r->uri into a class and method and runs
-it as a PerlHandler.  Basically, this allows you to call PerlHandlers
-as you would Regsitry scripts without having to load your httpd.conf
-with a slurry of <Location> tags.
-
 EXAMPLE
+      in httpd.conf
 
-  in httpd.conf
+        PerlModule Apache::Dispatch
+        PerlModule Bar
 
-    PerlModule Apache::Dispatch
-    PerlModule Bar
+        <Location /Foo>
+          SetHandler perl-script
+          PerlHandler Apache::Dispatch
 
-    <Location /Foo>
-      SetHandler perl-script
-      PerlHandler Apache::Dispatch
+          DispatchPrefix Bar
+        </Location>
 
-      DispatchPrefix Bar
-    </Location>
+      in browser:
+        http://localhost/Foo/baz
 
-  in browser:
-    http://localhost/Foo/baz
+      the results are the same as if your httpd.conf looked like:
+        <Location /Foo>
+          SetHandler perl-script
+          PerlHandler Bar->dispatch_baz
+        </Location>
 
-  the results are the same as if your httpd.conf looked like:
-    <Location /Foo>
-      SetHandler perl-script
-      PerlHandler Bar->dispatch_baz
-    </Location>
+    but with the additional security of protecting the class name from the
+    browser and keeping the method name from being called directly. Because
+    any class under the Bar:: hierarchy can be called, one <Location>
+    directive is able to handle all the methods of Bar, Bar::Baz, etc...
 
-but with the additional security of protecting the class name from
-the browser and keeping the method name from being called directly.
-Because any class under the Bar:: hierarchy can be called, one
-<Location> directive is able to handle all the methods of Bar,
-Bar::Baz, etc...
-
 CONFIGURATION DIRECTIVES
+      DispatchPrefix
+        The base class to be substituted for the $r->location part of the
+        uri.
 
-  DispatchPrefix
-    The base class to be substituted for the $r->location part of the
-    uri.
+      DispatchLocation
+        Using Apache::Dispatch from a <Directory> directive, either 
+        directly or from a .htaccess file, will _require_ the use of
+        DispatchLocation, which defines the location from which
+        Apache::Dispatch will start class->method() translation.
+        For example:
 
-  DispatchLocation
-    Using Apache::Dispatch from a <Directory> directive, either 
-    directly or from a .htaccess file, will _require_ the use of
-    DispatchLocation, which defines the starting location from which
-    Apache::Dispatch will start class->method() translation.
-    For example:
+          httpd.conf
+            DocumentRoot /usr/local/apache/htdocs
+            <Directory /usr/local/apache/htdocs/>
+              ...
+            <Directory>
 
-      httpd.conf
-        DocumentRoot /usr/local/apache/htdocs
-        <Directory /usr/local/apache/htdocs/>
-          ...
-        <Directory>
+         .htaccess (in /usr/local/apache/htdocs/Foo)
+            SetHandler perl-script
+            PerlHandler Apache::Dispatch
+            DispatchPrefix Baz
+            DispatchLocation /Foo
 
-     .htaccess (in /usr/local/apache/htdocs/Foo)
-        SetHandler perl-script
-        PerlHandler Apache::Dispatch
-        DispatchPrefix Baz
-        DispatchLocation /Foo
+        This allows a request to /Foo/Bar/biff to properly map to
+        Baz::Bar->biff().  
 
-    This allows a request to /Foo/Bar/biff to properly map to
-    Baz::Bar->biff().  
+        While intended specifically for <Directory> configurations, one
+        could use DispatchLocation to further obscure uri translations
+        within <Location> sections as well by changing the part of
+        the uri that is substitued with your module.
 
-    While intended specifically for <Directory> configurations, one
-    could use DispatchLocation to further obscure uri translations
-    within <Location> sections as well by changing the part of
-    the uri that is substitued with your module.
+      DispatchExtras
+        An optional list of extra processing to enable per-request.  If
+        the main handler is not a valid method call, the request is 
+        declined prior to the execution of any of the extra methods.
 
-  DispatchExtras
-    An optional list of extra processing to enable per-request.  If
-    the main handler is not a valid method call, the request is 
-    declined prior to the execution of any of the extra methods.
+          Pre   - eval()s Foo->pre_dispatch($r) prior to dispatching the
+                  uri.  The $@ of the eval is not checked in any way.
 
-      Pre   - eval()s Foo->pre_dispatch($r) prior to dispatching the
-              uri.  The $@ of the eval is not checked in any way.
+          Post  - eval()s Foo->post_dispatch($r) after dispatching the
+                  uri.  The $@ of the eval is not checked in any way.
 
-      Post  - eval()s Foo->post_dispatch($r) after dispatching the
-              uri.  The $@ of the eval is not checked in any way.
+          Error - If the main handler returns other than OK then 
+                  Foo->error_dispatch($r, $@) is called and return status
+                  of it is returned instead.  Unlike the pre and post
+                  processing routines above, error_dispatch is not wrapped
+                  in an eval, so if it dies, the Apache::Dispatch dies,
+                  and Apache will process the error using ErrorDocument,
+                  custom_response(), etc.
+                  With error_dispatch() disabled, the return status of the
+                  the main handler is returned to the client.
 
-      Error - If the main handler returns other than OK then 
-              Foo->error_dispatch($r, $@) is called and return status
-              of it is returned instead.  Unlike the pre and post
-              processing routines above, error_dispatch is not wrapped
-              in an eval, so if it dies, the Apache::Dispatch dies,
-              and Apache will process the error using ErrorDocument,
-              custom_response(), etc.
-              With error_dispatch() disabled, the return status of the
-              the main handler is returned to the client.
+      DispatchRequire
+        An optional directive that enables require()ing of the module that
+        is the result of the uri to class->method translation.  This allows
+        your configuration to be a bit more dynamic, but also decreases
+        security somewhat.  And don't forget that you really should be
+        pre-loading frequently used modules in the parent process to reduce
+        overhead - DispatchRequire is a directive of conveinence.
 
-  DispatchRequire
-    An optional directive that enables require()ing of the module that
-    is the result of the uri to class->method translation.  This allows
-    your configuration to be a bit more dynamic, but also decreases
-    security somewhat.  And don't forget that you really should be
-    pre-loading frequently used modules in the parent process to reduce
-    overhead - DispatchRequire is a directive of conveinence.
+          On    - require() the module
 
-      On    - require() the module
+          Off   - Do not require() the module (Default)
 
-      Off   - Do not require() the module (Default)
+      DispatchStat
+        An optional directive that enables reloading of the module that is
+        the result of the uri to class->method translation, similar to
+        Apache::Registry, Apache::Reload, or Apache::StatINC.
 
-  DispatchStat
-    An optional directive that enables reloading of the module that is
-    the result of the uri to class->method translation, similar to
-    Apache::Registry, Apache::Reload, or Apache::StatINC.
+          On    - Test the called package for modification and reload on
+                  change
 
-      On    - Test the called package for modification and reload on
-              change
+          Off   - Do not test or reload the package (Default)
 
-      Off   - Do not test or reload the package (Default)
+          ISA   - Test the called package, and all other packages in the
+                  called package's @ISA, and reload on change
 
-      ISA   - Test the called package, and all other packages in the
-              called package's @ISA, and reload on change
+      DispatchAUTOLOAD
+        An optional directive that enables unknown methods to use 
+        AutoLoader.  It may be applied on a per-server or per-location
+        basis and defaults to Off.  Please see the special section on 
+        AUTOLOAD below.
 
-  DispatchAUTOLOAD
-    An optional directive that enables unknown methods to use 
-    AutoLoader.  It may be applied on a per-server or per-location
-    basis and defaults to Off.  Please see the special section on 
-    AUTOLOAD below.
+          On    - Allow for methods to be defined in AUTOLOAD method
 
-      On    - Allow for methods to be defined in AUTOLOAD method
-
-      Off   - Turn off search for AUTOLOAD method (Default)
+          Off   - Turn off search for AUTOLOAD method (Default)
     
-  DispatchISA
-    An optional list of parent classes you want your dispatched class
-    to inherit from.
+      DispatchISA
+        An optional list of parent classes you want your dispatched class
+        to inherit from.
 
-  DispatchFilter 
-    If you have Apache::Filter 1.013 or above installed, you can take
-    advantage of other Apache::Filter aware modules.  Please see the
-    section on FILTERING below.  In keeping with Apache::Filter
-    standards, PerlSetVar Filter has the same effect as DispatchFilter
-    but with lower precedence.
+      DispatchFilter 
+        If you have Apache::Filter 1.013 or above installed, you can take
+        advantage of other Apache::Filter aware modules.  Please see the
+        section on FILTERING below.  In keeping with Apache::Filter
+        standards, PerlSetVar Filter has the same effect as DispatchFilter
+        but with lower precedence.
 
-      On    - make the output of your module Apache::Filter aware
+          On    - make the output of your module Apache::Filter aware
 
-      Off   - do not use Apache::Filter (Default)
+          Off   - do not use Apache::Filter (Default)
 
+      DispatchDebug
+        Set DispatchDebug to 1 or 2 to control the verbosity of
+        debug statements.
+  
 SPECIAL CODING GUIDELINES
+    Migrating to Apache::Dispatch is relatively painless - it requires only
+    a few minor code changes. The good news is that once you adapt code to
+    work with Dispatch, it can be used as a conventional mod_perl method
+    handler, requiring only a few considerations. Below are a few things
+    that require attention.
 
-Migrating to Apache::Dispatch is relatively painless - it requires
-only a few minor code changes.  The good news is that once you adapt
-code to work with Dispatch, it can be used as a conventional mod_perl
-method handler, requiring only a few considerations.  Below are a few
-things that require attention.
+    In the interests of security, all handler methods must be prefixed with
+    'dispatch_', which is added to the uri behind the scenes. Unlike
+    ordinary mod_perl handlers, for Apache::Dispatch there is no default
+    method (with a tiny exception - see NOTES below).
 
-In the interests of security, all handler methods must be prefixed
-with 'dispatch_', which is added to the uri behind the scenes.  Unlike
-ordinary mod_perl handlers, for Apache::Dispatch there is no default
-method (with a tiny exception - see NOTES below).
+    Apache::Dispatch uses object oriented calls behind the scenes. This
+    means that you either need to account for your handler to be called as a
+    method handler, such as
 
-Apache::Dispatch uses object oriented calls behind the scenes.  This 
-means that you either need to account for your handler to be called
-as a method handler, such as
+      sub dispatch_bar {
+        my $self  = shift;  # your class
+        my $r     = shift;
+      }
 
-  sub dispatch_bar {
-    my $self  = shift;  # your class
-    my $r     = shift;
-  }
+    or get the Apache request object directly via
 
-or get the Apache request object directly via
+      sub dispatch_bar {
+        my $r     = Apache->request;
+      }
 
-  sub dispatch_bar {
-    my $r     = Apache->request;
-  }
+    If you want to use the handler unmodified outside of Apache::Dispatch,
+    you must do three things:
 
-If you want to use the handler unmodified outside of Apache::Dispatch,
-you must do three things:
+      prototype your handler:
 
-  prototype your handler:
+        sub dispatch_baz ($$) {
+          my $self  = shift;
+          my $r     = shift;
+        }
 
-    sub dispatch_baz ($$) {
-      my $self  = shift;
-      my $r     = shift;
-    }
+      change your httpd.conf entry:
 
-  change your httpd.conf entry:
+        <Location /Foo>
+          SetHandler perl-script
+          PerlHandler Bar->dispatch_baz
+        </Location>
 
-    <Location /Foo>
-      SetHandler perl-script
-      PerlHandler Bar->dispatch_baz
-    </Location>
+      pre-load your module:
+        PerlModule Bar
+          or
+        PerlRequire startup.pl
+        # where startup.pl contains
+        # use Bar;
 
-  pre-load your module:
-    PerlModule Bar
-      or
-    PerlRequire startup.pl
-    # where startup.pl contains
-    # use Bar;
+    That's it - now the handler can be swapped in and out of Dispatch
+    without further modification. See the Eagle book on method handlers for
+    more details.
 
-That's it - now the handler can be swapped in and out of Dispatch 
-without further modification.  See the Eagle book on method handlers
-for more details.
-
 FILTERING
+    Apache::Dispatch provides for output filtering using Apache::Filter
+    1.013 and above.
 
-Apache::Dispatch provides for output filtering using Apache::Filter
-1.013 and above.
+      <Location /Foo>
+        SetHandler perl-script
+        PerlHandler Apache::Dispatch Apache::Compress
 
-  <Location /Foo>
-    SetHandler perl-script
-    PerlHandler Apache::Dispatch Apache::Compress
+        DispatchPrefix Bar
+        DispatchFilter On
+      </Location>
 
-    DispatchPrefix Bar
-    DispatchFilter On
-  </Location>
+    Your handler need do nothing special to make its output the start of the
+    chain - Apache::Dispatch registers itself with Apache::Filter and hides
+    the task from your handler. Thus, any dispatched handler is
+    automatically Apache::Filter ready without the need for additional code.
 
-Your handler need do nothing special to make its output the start of
-the chain - Apache::Dispatch registers itself with Apache::Filter and
-hides the task from your handler.  Thus, any dispatched handler is
-automatically Apache::Filter ready without the need for additional
-code.
+    The only caveat is that you must use the request object that is passed
+    to the handler and not get it directly using Apache->request.
 
-The only caveat is that you must use the request object that is passed
-to the handler and not get it directly using Apache->request.
-
 AUTOLOAD
+    Support for AUTOLOAD has been made optional, but requires special care.
+    Please take the time to read the camel book on using AUTOLOAD with can()
+    and subroutine declarations (3rd ed pp326-329).
 
-Support for AUTOLOAD has been made optional, but requires special
-care.  Please take the time to read the camel book on using AUTOLOAD
-with can() and subroutine declarations (3rd ed pp326-329).
+    Basically, you declare the methods you want AUTOLOAD to capture by name
+    at the top of your script. This is necessary because can() will return
+    true if your class (or any parent class) contains an AUTOLOAD method,
+    but $AUTOLOAD will only be populated for declared method calls. Hence,
+    without a declaration you won't be able to get at the name of the method
+    you want to AUTOLOAD.
 
-Basically, you declare the methods you want AUTOLOAD to capture by 
-name at the top of your script.  This is necessary because can() 
-will return true if your class (or any parent class) contains an
-AUTOLOAD method, but $AUTOLOAD will only be populated for declared
-method calls.  Hence, without a declaration you won't be able to
-get at the name of the method you want to AUTOLOAD.
+    DispatchISA introduced some convenience, but some headaches as well - if
+    you inherit from a class that uses AutoLoader then ALL method calls are
+    true. And as just explained, AUTOLOAD() will not know what the called
+    method was. This may represent a problem if you aren't aware that, say,
+    CGI.pm uses AutoLoader and spend a few hours trying to figure out why
+    all of a sudden every URL under Dispatch is bombing. You may want to
+    check out NEXT.pm (available from CPAN) for use in your AUTOLOAD
+    routines to help circumvent this partucular feature.
 
-DispatchISA introduced some convenience, but some headaches as well - 
-if you inherit from a class that uses AutoLoader then ALL method calls
-are true.  And as just explained, AUTOLOAD() will not know what the
-called method was.  This may represent a problem if you aren't aware
-that, say, CGI.pm uses AutoLoader and spend a few hours trying to 
-figure out why all of a sudden every URL under Dispatch is bombing.
+    If you decide to use DispatchISA it is HIGHLY SUGGESTED that you do so
+    with DispatchAUTOLOAD Off (which is the default behavior).
 
-If you decide to use DispatchISA it is HIGHLY SUGGESTED that you do so
-with DispatchAUTOLOAD Off (which is the default behavior).
-
 NOTES
+    If you define a dispatch_index() method calls to /Foo will default to
+    it. Unfortunately, this implicit translation only happens at the highest
+    level - calls to /Foo/Bar will translate to Foo->Bar() (that is, unless
+    Foo::Bar is your DispatchPrefix, in which case it will work but
+    /Foo/Bar/Baz will not, etc). Explicit calls to /Foo/index follow the
+    normal dispatch rules.
 
-If you define a dispatch_index() method calls to /Foo will default to
-it.  Unfortunately, this implicit translation only happens at the
-highest level - calls to /Foo/Bar will translate to Foo->Bar() (that
-is, unless Foo::Bar is your DispatchPrefix, in which case it will
-work but /Foo/Bar/Baz will not, etc).  Explicit calls to /Foo/index
-follow the normal dispatch rules.
+    If the uri can be dispatched but contains anything other than
+    [a-zA-Z0-9_/-] Apache::Dispatch declines to handle the request.
 
-If the uri can be dispatched but contains anything other than
-[a-zA-Z0-9_/-] Apache::Dispatch declines to handle the request.
+    Like everything in perl, the package names are case sensitive.
 
-Like everything in perl, the package names are case sensitive.
+    Warnings have been left on, so if you set an invalid class with
+    DispatchISA you will see a message like: Can't locate package Foo::Bar
+    for @Bar::Baz::ISA at .../Apache/Dispatch.pm line 277.
 
-Warnings have been left on, so if you set an invalid class with
-DispatchISA you will see a message like:
-  Can't locate package Foo::Bar for @Bar::Baz::ISA at 
-  .../Apache/Dispatch.pm line 277.
+    This is alpha software, and as such has not been tested on multiple
+    platforms or environments for security, stability or other concerns. It
+    requires PERL_DIRECTIVE_HANDLERS=1, PERL_LOG_API=1, PERL_HANDLER=1, and
+    maybe other hooks to function properly.
 
-Verbose debugging is enabled by setting $Apache::Dispatch::DEBUG=1.
-Very verbose debugging is enabled at 2.  To turn off all debug
-information set your Apache LogLevel directive above info level.
-
-This is alpha software, and as such has not been tested on multiple
-platforms or environments for security, stability or other concerns.
-It requires PERL_DIRECTIVE_HANDLERS=1, PERL_LOG_API=1, PERL_HANDLER=1,
-and maybe other hooks to function properly.
-
 FEATURES/BUGS
+    If a module fails reload under DispatchStat, Apache::Dispatch declines
+    the request. This might change to SERVER_ERROR in the future...
 
-If a module fails reload under DispatchStat, Apache::Dispatch declines
-the request.  This might change to SERVER_ERROR in the future...
-
 SEE ALSO
+    perl(1), mod_perl(1), Apache(3), Apache::Filter(3), Apache::Reload(3),
+    Apache::StatINC(3)
 
-perl(1), mod_perl(1), Apache(3), Apache::Filter(3), Apache::Reload(3),
-Apache::StatINC(3)
-
 MAINTAINER
+    Fred Moyer <ph...@ap...>
 
-Fred Moyer <ph...@ap...>
-
 AUTHOR
+    Geoffrey Young <ge...@cp...>
 
-Geoffrey Young <ge...@cp...>
-
 COPYRIGHT
+    Copyright 2001-2006 Geoffrey Young - all rights reserved.
 
-Copyright 2001 Geoffrey Young - all rights reserved.
+    This library is free software; you can redistribute it and/or modify it
+    under the same terms as Perl itself.
 
-This library is free software; you can redistribute it and/or
-modify it under the same terms as Perl itself.
-

Modified: trunk/lib/Apache/Dispatch.pm
===================================================================
--- trunk/lib/Apache/Dispatch.pm	2009-04-19 08:11:26 UTC (rev 75)
+++ trunk/lib/Apache/Dispatch.pm	2009-04-25 22:46:21 UTC (rev 76)
@@ -47,7 +47,7 @@
     require Apache::ModuleConfig;
     require DynaLoader;
     push @Apache::Dispatch::ISA, qw(DynaLoader);
-    __PACKAGE__->bootstrap($VERSION);
+    __PACKAGE__->bootstrap($Apache::Dispatch::Util::VERSION);
 }
 
 sub handler {
@@ -323,6 +323,7 @@
     # require util since it can be used outside an apache process
     PREREQ_PM    => {
         'Apache::Dispatch::Util'    => 0.11,
+    }
 
 httpd.conf:
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Apache-dispatch-devel] SF.net SVN: apache-dispatch:[75] trunk/Makefile.PL

From: <phr...@us...> - 2009-04-19 08:11:36

Revision: 75
          http://apache-dispatch.svn.sourceforge.net/apache-dispatch/?rev=75&view=rev
Author:   phred_moyer
Date:     2009-04-19 08:11:26 +0000 (Sun, 19 Apr 2009)

Log Message:
-----------
Revert part of earlier commit, we don't need version.pm

Modified Paths:
--------------
    trunk/Makefile.PL

Modified: trunk/Makefile.PL
===================================================================
--- trunk/Makefile.PL	2009-04-19 08:10:17 UTC (rev 74)
+++ trunk/Makefile.PL	2009-04-19 08:11:26 UTC (rev 75)
@@ -3,10 +3,8 @@
 use strict;
 use warnings;
 
-use version;
-
 # minimum version of A::B required
-use Apache::Bootstrap 0.05;
+use Apache::Bootstrap 0.06;
 
 my $bootstrap;
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Apache-dispatch-devel] SF.net SVN: apache-dispatch:[74] trunk

From: <phr...@us...> - 2009-04-19 08:10:32

Revision: 74
          http://apache-dispatch.svn.sourceforge.net/apache-dispatch/?rev=74&view=rev
Author:   phred_moyer
Date:     2009-04-19 08:10:17 +0000 (Sun, 19 Apr 2009)

Log Message:
-----------
after reviewing what t/TEST.PL does, and reading up on Apache::Test, and running a few tests, it looks like we do not need that file

Modified Paths:
--------------
    trunk/Changes
    trunk/Makefile.PL

Removed Paths:
-------------
    trunk/t/TEST.PL

Modified: trunk/Changes
===================================================================
--- trunk/Changes	2009-04-06 04:25:50 UTC (rev 73)
+++ trunk/Changes	2009-04-19 08:10:17 UTC (rev 74)
@@ -1,6 +1,7 @@
 Revision history for Perl extension Apache::Dispatch
 
 0.11 04.05.2009 20:34 PDT
+  - remove t/TEST.PL (it is not needed)
   - put version in Apache::Dispatch::Util to avoid issue with Apache2::Module
   - document PerlLoadModule for Dispatch* directives - ideysus@annocpan
   - reduce unnecessary log verbosity

Modified: trunk/Makefile.PL
===================================================================
--- trunk/Makefile.PL	2009-04-06 04:25:50 UTC (rev 73)
+++ trunk/Makefile.PL	2009-04-19 08:10:17 UTC (rev 74)
@@ -3,8 +3,10 @@
 use strict;
 use warnings;
 
+use version;
+
 # minimum version of A::B required
-use Apache::Bootstrap 0.06;
+use Apache::Bootstrap 0.05;
 
 my $bootstrap;
 

Deleted: trunk/t/TEST.PL
===================================================================
--- trunk/t/TEST.PL	2009-04-06 04:25:50 UTC (rev 73)
+++ trunk/t/TEST.PL	2009-04-19 08:10:17 UTC (rev 74)
@@ -1,8 +0,0 @@
-#!perl
-
-use strict;
-use warnings FATAL => 'all';
-
-use Apache::TestRunPerl();
-
-Apache::TestRunPerl->new->run(@ARGV);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Apache-dispatch-devel] SF.net SVN: apache-dispatch:[73] trunk/Makefile.PL

From: <phr...@us...> - 2009-04-06 04:25:57

Revision: 73
          http://apache-dispatch.svn.sourceforge.net/apache-dispatch/?rev=73&view=rev
Author:   phred_moyer
Date:     2009-04-06 04:25:50 +0000 (Mon, 06 Apr 2009)

Log Message:
-----------

Find subtle bug in Apache::Bootstrap

Modified Paths:
--------------
    trunk/Makefile.PL

Modified: trunk/Makefile.PL
===================================================================
--- trunk/Makefile.PL	2009-04-06 03:41:35 UTC (rev 72)
+++ trunk/Makefile.PL	2009-04-06 04:25:50 UTC (rev 73)
@@ -4,14 +4,14 @@
 use warnings;
 
 # minimum version of A::B required
-use Apache::Bootstrap 0.05;
+use Apache::Bootstrap 0.06;
 
 my $bootstrap;
 
 BEGIN {
     # make sure we have at least one minimum version required
     $bootstrap = Apache::Bootstrap->new({ mod_perl2 => 1.99022,
-                                          mod_perl1 => 0, });
+                                          mod_perl  => 1.30 });
 }
 
 # allow builds with mod_perl one when MOD_PERL_1_BUILD ENV is set


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Apache-dispatch-devel] SF.net SVN: apache-dispatch:[72] trunk

From: <phr...@us...> - 2009-04-06 03:41:39

Revision: 72
          http://apache-dispatch.svn.sourceforge.net/apache-dispatch/?rev=72&view=rev
Author:   phred_moyer
Date:     2009-04-06 03:41:35 +0000 (Mon, 06 Apr 2009)

Log Message:
-----------
Use Apache::Bootstrap 0.05.
Put version in Apache::Dispatch::Util (thanks randy kobes for the suggestion)

Modified Paths:
--------------
    trunk/Changes
    trunk/Makefile.PL
    trunk/README
    trunk/lib/Apache/Dispatch/Util.pm
    trunk/lib/Apache/Dispatch.pm
    trunk/lib/Apache2/Dispatch.pm

Modified: trunk/Changes
===================================================================
--- trunk/Changes	2008-10-08 19:35:44 UTC (rev 71)
+++ trunk/Changes	2009-04-06 03:41:35 UTC (rev 72)
@@ -1,6 +1,7 @@
 Revision history for Perl extension Apache::Dispatch
 
-0.11
+0.11 04.05.2009 20:34 PDT
+  - put version in Apache::Dispatch::Util to avoid issue with Apache2::Module
   - document PerlLoadModule for Dispatch* directives - ideysus@annocpan
   - reduce unnecessary log verbosity
   - use Apache::Bootstrap to bootstrap mod_perl version

Modified: trunk/Makefile.PL
===================================================================
--- trunk/Makefile.PL	2008-10-08 19:35:44 UTC (rev 71)
+++ trunk/Makefile.PL	2009-04-06 03:41:35 UTC (rev 72)
@@ -4,13 +4,14 @@
 use warnings;
 
 # minimum version of A::B required
-use Apache::Bootstrap 0.03;
+use Apache::Bootstrap 0.05;
 
 my $bootstrap;
 
 BEGIN {
     # make sure we have at least one minimum version required
-    $bootstrap = Apache::Bootstrap->new({ mod_perl2 => '1.99022', mod_perl => 0, });
+    $bootstrap = Apache::Bootstrap->new({ mod_perl2 => 1.99022,
+                                          mod_perl1 => 0, });
 }
 
 # allow builds with mod_perl one when MOD_PERL_1_BUILD ENV is set
@@ -37,7 +38,7 @@
     PREREQ_PM     => $bootstrap->mp_prereqs,
     clean         => { FILES => 't/TEST, *.xs*' },
     NAME          => "$apache\::Dispatch",
-    VERSION_FROM  => $base_lib,
+    VERSION_FROM  => 'lib/Apache/Dispatch/Util.pm',
     ABSTRACT_FROM => $base_lib,
 );
 

Modified: trunk/README
===================================================================
--- trunk/README	2008-10-08 19:35:44 UTC (rev 71)
+++ trunk/README	2009-04-06 03:41:35 UTC (rev 72)
@@ -4,6 +4,12 @@
 
 SYNOPSIS
 
+Makefile.PL:
+
+    # require util since it can be used outside an apache process
+    PREREQ_PM    => {
+        'Apache::Dispatch::Util'    => 0.11,
+
 httpd.conf:
 
   PerlModule Apache::Dispatch

Modified: trunk/lib/Apache/Dispatch/Util.pm
===================================================================
--- trunk/lib/Apache/Dispatch/Util.pm	2008-10-08 19:35:44 UTC (rev 71)
+++ trunk/lib/Apache/Dispatch/Util.pm	2009-04-06 03:41:35 UTC (rev 72)
@@ -3,6 +3,8 @@
 use strict;
 use warnings;
 
+our $VERSION = 0.11;
+
 =head1 NAME
 
   Apache::Dispatch::Util - methods for Apache::Dispatch and Apache2::Dispatch

Modified: trunk/lib/Apache/Dispatch.pm
===================================================================
--- trunk/lib/Apache/Dispatch.pm	2008-10-08 19:35:44 UTC (rev 71)
+++ trunk/lib/Apache/Dispatch.pm	2009-04-06 03:41:35 UTC (rev 72)
@@ -11,13 +11,13 @@
 use strict;
 use warnings;
 
-our $VERSION = '0.11';
 
 use mod_perl 1.2401;
 use Apache::Constants qw(OK DECLINED SERVER_ERROR);
 use Apache::Log			   ();
 use Apache::Dispatch::Util ();
 
+
 BEGIN {
     push @Apache::Dispatch::ISA, qw(Apache::Dispatch::Util);
 
@@ -318,6 +318,12 @@
 
 =head1 SYNOPSIS
 
+Makefile.PL:
+
+    # require util since it can be used outside an apache process
+    PREREQ_PM    => {
+        'Apache::Dispatch::Util'    => 0.11,
+
 httpd.conf:
 
   PerlModule Apache::Dispatch

Modified: trunk/lib/Apache2/Dispatch.pm
===================================================================
--- trunk/lib/Apache2/Dispatch.pm	2008-10-08 19:35:44 UTC (rev 71)
+++ trunk/lib/Apache2/Dispatch.pm	2009-04-06 03:41:35 UTC (rev 72)
@@ -9,8 +9,6 @@
 use strict;
 use warnings;
 
-$Apache2::Dispatch::VERSION = '0.11';
-
 use mod_perl2 1.99023;
 use Apache2::Const -compile => qw(OK DECLINED SERVER_ERROR);
 use Apache2::Log         ();
@@ -244,6 +242,12 @@
 
 =head1 SYNOPSIS
 
+Makefile.PL:
+
+    # require util since it can be used outside an apache process
+    PREREQ_PM    => {
+        'Apache::Dispatch::Util'    => 0.11,
+
 httpd.conf:
 
   PerlLoadModule Apache2::Dispatch


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Apache-dispatch-devel] SF.net SVN: apache-dispatch:[71] trunk/Changes

From: <phr...@us...> - 2008-10-08 19:36:00

Revision: 71
          http://apache-dispatch.svn.sourceforge.net/apache-dispatch/?rev=71&view=rev
Author:   phred_moyer
Date:     2008-10-08 19:35:44 +0000 (Wed, 08 Oct 2008)

Log Message:
-----------
attribute spot to change

Modified Paths:
--------------
    trunk/Changes

Modified: trunk/Changes
===================================================================
--- trunk/Changes	2008-10-08 19:34:44 UTC (rev 70)
+++ trunk/Changes	2008-10-08 19:35:44 UTC (rev 71)
@@ -1,6 +1,7 @@
 Revision history for Perl extension Apache::Dispatch
 
 0.11
+  - document PerlLoadModule for Dispatch* directives - ideysus@annocpan
   - reduce unnecessary log verbosity
   - use Apache::Bootstrap to bootstrap mod_perl version
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Apache-dispatch-devel] SF.net SVN: apache-dispatch:[70] trunk/lib/Apache2/Dispatch.pm

From: <phr...@us...> - 2008-10-08 19:34:58

Revision: 70
          http://apache-dispatch.svn.sourceforge.net/apache-dispatch/?rev=70&view=rev
Author:   phred_moyer
Date:     2008-10-08 19:34:44 +0000 (Wed, 08 Oct 2008)

Log Message:
-----------
Document use of PerlLoadModule instead of PerlModule, thanks to ideysus on
Annocpan for the spot
Wow sourceforge checkins suck.

Modified Paths:
--------------
    trunk/lib/Apache2/Dispatch.pm

Modified: trunk/lib/Apache2/Dispatch.pm
===================================================================
--- trunk/lib/Apache2/Dispatch.pm	2008-06-22 08:42:48 UTC (rev 69)
+++ trunk/lib/Apache2/Dispatch.pm	2008-10-08 19:34:44 UTC (rev 70)
@@ -246,8 +246,8 @@
 
 httpd.conf:
 
-  PerlModule Apache2::Dispatch
-  PerlModule Bar
+  PerlLoadModule Apache2::Dispatch
+  PerlLoadModule Bar
 
   DispatchExtras Pre Post Error
   DispatchStat On


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Re: [Apache-dispatch-devel] SF.net SVN: apache-dispatch: [67] trunk/Makefile.PL

From: Geoffrey Y. <ge...@mo...> - 2008-06-24 14:05:48

Fred Moyer wrote:
> Geoffrey Young wrote:
>>
>>
>> Fred Moyer wrote:
>>> Geoff, if this Apache::Bootstrap module proves successful in making 
>>> this makefile easy to write, do you know of any licensing issues that 
>>> it might run into?  It uses ASF licensed code, so I don't know if it 
>>> would have to be an official mod_perl project.
>>
>> do you mean you've released it to CPAN but are wondering if it makes 
>> sense to integrate it into mod_perl core?
> 
> To be more clear, I pulled parts of ASF code (sizelimit, etc) and put it 
> into this module.  I put this module under the Perl Artistic license, 
> but am wondering if I can do that.  I attributed the mod_perl 
> development list in the Author section, and mentioned clearly where the 
> origin of the code was from.

I have no idea if that's ok from a legal pov, but it's your code :)

any code donated to the ASF will need to be re-licensed under the ASF 
license or it will not be incorporated.  for code borrowed under an ASF 
license, it's not a problem.  for code written by you, you control the 
license terms, so you could just slap an ASF license on it an it would 
probably be easiest.

but IANAL, and I really detest even needing to think about this 
licensing stuff.  I get why it's important, I just don't like when it's 
me that needs to be bothered with it :)

--Geoff

Re: [Apache-dispatch-devel] SF.net SVN: apache-dispatch: [67] trunk/Makefile.PL

From: Fred M. <fr...@re...> - 2008-06-23 19:50:11

Geoffrey Young wrote:
> 
> 
> Fred Moyer wrote:
>> Geoff, if this Apache::Bootstrap module proves successful in making 
>> this makefile easy to write, do you know of any licensing issues that 
>> it might run into?  It uses ASF licensed code, so I don't know if it 
>> would have to be an official mod_perl project.
> 
> do you mean you've released it to CPAN but are wondering if it makes 
> sense to integrate it into mod_perl core?

To be more clear, I pulled parts of ASF code (sizelimit, etc) and put it 
into this module.  I put this module under the Perl Artistic license, 
but am wondering if I can do that.  I attributed the mod_perl 
development list in the Author section, and mentioned clearly where the 
origin of the code was from.

Re: [Apache-dispatch-devel] SF.net SVN: apache-dispatch: [67] trunk/Makefile.PL

From: Fred M. <fr...@re...> - 2008-06-23 19:30:23

Geoffrey Young wrote:
> 
> 
> Fred Moyer wrote:
>> Geoff, if this Apache::Bootstrap module proves successful in making 
>> this makefile easy to write, do you know of any licensing issues that 
>> it might run into?  It uses ASF licensed code, so I don't know if it 
>> would have to be an official mod_perl project.
> 
> do you mean you've released it to CPAN but are wondering if it makes 
> sense to integrate it into mod_perl core?

I haven't released anything to CPAN yet, still figuring out what this 
code needs to accomplish before letting it loose :)

> that nobody seems to care probably means that nobody cares.  but I don't 
> see any reason why we can't bring it into core, pending what others feel 
> like on dev@

Right on, I'd definitely like to get buy in from other devs.  It is a 
small component, but one that I feel has caused a lot of time sink 
maintaining dual life modules.

> hope all is well.

Pretty well, got back from YAPC in Chicago last week.  Am having grand 
ideas about a mod_perl workshop :)

> 
> --Geoff

Re: [Apache-dispatch-devel] SF.net SVN: apache-dispatch: [67] trunk/Makefile.PL

From: Geoffrey Y. <ge...@mo...> - 2008-06-23 19:27:09

Fred Moyer wrote:
> Geoff, if this Apache::Bootstrap module proves successful in making this 
> makefile easy to write, do you know of any licensing issues that it 
> might run into?  It uses ASF licensed code, so I don't know if it would 
> have to be an official mod_perl project.

do you mean you've released it to CPAN but are wondering if it makes 
sense to integrate it into mod_perl core?

when we took over Apache::Reload from matt we just had him fill out a 
software grant.  I did some other ASF-related stuff, but it was all 
pretty simple.

> 
> I'm going to push out 0.03 tomorrow, maybe it is worthwhile, maybe not, 
> but it has make this makefile business a lot easier to deal with :)

:)

that nobody seems to care probably means that nobody cares.  but I don't 
see any reason why we can't bring it into core, pending what others feel 
like on dev@

hope all is well.

--Geoff

[Apache-dispatch-devel] SF.net SVN: apache-dispatch: [64] trunk

From: <phr...@us...> - 2008-06-22 11:03:01

Revision: 64
          http://apache-dispatch.svn.sourceforge.net/apache-dispatch/?rev=64&view=rev
Author:   phred_moyer
Date:     2008-06-20 17:05:27 -0700 (Fri, 20 Jun 2008)

Log Message:
-----------
Testing replacement of the bootstrapping yuckiness with Apache::Bootstrap

Modified Paths:
--------------
    trunk/Changes
    trunk/Makefile.PL
    trunk/lib/Apache/Dispatch.pm
    trunk/lib/Apache2/Dispatch.pm

Modified: trunk/Changes
===================================================================
--- trunk/Changes	2008-01-08 19:14:39 UTC (rev 63)
+++ trunk/Changes	2008-06-21 00:05:27 UTC (rev 64)
@@ -1,5 +1,8 @@
 Revision history for Perl extension Apache::Dispatch
 
+0.11
+  - use Apache::Bootstrap to bootstrap mod_perl version
+
 0.10 01.08.2008
   - steal the RELEASE doc from Apache::Reload and adapt it - fred
   - steal the Makefile.PL from A::R, and merge it with our needed custom

Modified: trunk/Makefile.PL
===================================================================
--- trunk/Makefile.PL	2008-01-08 19:14:39 UTC (rev 63)
+++ trunk/Makefile.PL	2008-06-21 00:05:27 UTC (rev 64)
@@ -5,22 +5,33 @@
 
 use Config;
 
-my %prereqs = ();
+BEGIN {
+    my $AB_VER = 0.02;
+    my $fail_msg = "Warning: prerequisite Apache::Bootstrap $AB_VER not found.";
+    
+    eval { require Apache::Bootstrap };
+    die $fail_msg . "\n" if $@;
+
+    die $fail_msg . " We have $Apache::Bootstrap::VERSION.\n"
+        if $Apache::Bootstrap::VERSION < $AB_VER;
+}
+
+my %prereqs = ( );
 my %mp2     = ( mod_perl2 => 1.99022 );
 my %mp1     = ( mod_perl => 0 );
 
 my $mp_gen;
 if ( $ENV{MOD_PERL_2_BUILD} ) {
     push @ARGV, "-apxs $ENV{MP_APXS}";
-    my $mp_gen = satisfy_mp_generation(2);
+    my $mp_gen = Apache::Bootstrap->satisfy_mp_generation(2);
 }
 else {
-    $mp_gen = satisfy_mp_generation();
+    $mp_gen = Apache::Bootstrap->satisfy_mp_generation();
 }
 
 %prereqs = ( $mp_gen == 1 ? %mp1 : %mp2 );
 
-my $HAS_APACHE_TEST = check_for_apache_test();
+my $HAS_APACHE_TEST = Apache::Bootstrap->check_for_apache_test();
 
 my %common_opts = (
     PREREQ_PM => \%prereqs,
@@ -86,157 +97,6 @@
     pop @ARGV;
 }
 
-sub check_for_apache_test {
-    return unless eval {
-        require Apache::Test;
-        require Apache::TestMM;
-        require Apache::TestRunPerl;
-        1;
-    };
-
-    Apache::TestMM::filter_args();
-
-    my %args;
-    { 
-        no warnings;
-        %args = @Apache::TestMM::Argv;
-    }
-
-    return 0
-      unless (
-        (
-            Apache::TestConfig->can('custom_config_path')
-            and -f Apache::TestConfig->custom_config_path()
-        )
-        or $args{apxs}
-        or $args{httpd}
-        or $ENV{APACHE_TEST_HTTPD}
-        or $ENV{APACHE_TEST_APXS}
-      );
-
-    Apache::TestRunPerl->generate_script();
-
-    return 1;
-}
-
-# If a specific generation was passed as an argument,
-#     if satisfied
-#         return the same generation
-#     else
-#         die
-# else @ARGV and %ENV will be checked for specific orders
-#     if the specification will be found
-#         if satisfied
-#             return the specified generation
-#         else
-#             die
-#     else if any mp generation is found
-#              return it
-#           else
-#              die
-
-sub satisfy_mp_generation {
-    my $wanted = shift || wanted_mp_generation();
-
-    unless ( $wanted == 1 || $wanted == 2 ) {
-        die "don't know anything about mod_perl generation: $wanted\n"
-          . "currently supporting only generations 1 and 2";
-    }
-
-    my $selected = 0;
-
-    if ( $wanted == 1 ) {
-        require_mod_perl();
-        if ( $mod_perl::VERSION >= 1.99 ) {
-
-            # so we don't pick 2.0 version if 1.0 is wanted
-            die "You don't seem to have mod_perl 1.0 installed";
-        }
-        $selected = 1;
-    }
-    elsif ( $wanted == 2 ) {
-
-        #warn "Looking for mod_perl 2.0";
-        require_mod_perl();
-        if ( $mod_perl::VERSION < 2.0 ) {
-            die "You don't seem to have mod_perl 2.0 installed";
-        }
-        $selected = 2;
-    }
-    else {
-        require_mod_perl();
-        $selected = $mod_perl::VERSION >= 1.99 ? 2 : 1;
-        warn "Using $mod_perl::VERSION\n";
-    }
-
-    return $selected;
-}
-
-sub require_mod_perl {
-    eval { require mod_perl };
-    eval { require mod_perl2 } if ($@);
-    die "Can't find mod_perl installed\nThe error was: $@" if $@;
-}
-
-# the function looks at %ENV and Makefile.PL option to figure out
-# whether a specific mod_perl generation was requested.
-# It uses the following logic:
-# via options:
-# perl Makefile.PL MOD_PERL=2
-# or via %ENV:
-# env MOD_PERL=1 perl Makefile.PL
-#
-# return value is:
-# 1 or 2 if the specification was found (mp 1 and mp 2 respectively)
-# 0 otherwise
-sub wanted_mp_generation {
-
-    # check if we have a command line specification
-    # flag: 0: unknown, 1: mp1, 2: mp2
-    my $flag = 0;
-    foreach my $key (@ARGV) {
-        if ( $key =~ /^MOD_PERL=(\d)$/ ) {
-            $flag = $1;
-        }
-    }
-
-    # check %ENV
-    my $env = exists $ENV{MOD_PERL} ? $ENV{MOD_PERL} : 0;
-
-    # check for contradicting requirements
-    if ( $env && $flag && $flag != $env ) {
-        die <<EOF;
-Can\'t decide which mod_perl version should be used, since you have
-supplied contradicting requirements:
-    enviroment variable MOD_PERL=$env
-    Makefile.PL option  MOD_PERL=$flag
-EOF
-    }
-
-    my $wanted = 0;
-    $wanted = 2 if $env == 2 || $flag == 2;
-    $wanted = 1 if $env == 1 || $flag == 1;
-
-    unless ($wanted) {
-
-        # if still unknown try to require mod_perl.pm
-        eval { require mod_perl };
-        if ($@) {
-
-            # if we don't have mp1, check for mp2
-            eval { require mod_perl2 } if ($@);
-            unless ($@) {
-                $wanted = 2;
-            }
-        }
-        else {
-            $wanted = 1;
-        }
-    }
-
-    return $wanted;
-}
-
 package MY;
 
 sub postamble {

Modified: trunk/lib/Apache/Dispatch.pm
===================================================================
--- trunk/lib/Apache/Dispatch.pm	2008-01-08 19:14:39 UTC (rev 63)
+++ trunk/lib/Apache/Dispatch.pm	2008-06-21 00:05:27 UTC (rev 64)
@@ -11,7 +11,7 @@
 use strict;
 use warnings;
 
-our $VERSION = '0.10';
+our $VERSION = '0.11';
 
 use mod_perl 1.2401;
 use Apache::Constants qw(OK DECLINED SERVER_ERROR);

Modified: trunk/lib/Apache2/Dispatch.pm
===================================================================
--- trunk/lib/Apache2/Dispatch.pm	2008-01-08 19:14:39 UTC (rev 63)
+++ trunk/lib/Apache2/Dispatch.pm	2008-06-21 00:05:27 UTC (rev 64)
@@ -9,7 +9,7 @@
 use strict;
 use warnings;
 
-$Apache2::Dispatch::VERSION = '0.10';
+$Apache2::Dispatch::VERSION = '0.11';
 
 use mod_perl2 1.99023;
 use Apache2::Const -compile => qw(OK DECLINED SERVER_ERROR);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Apache-dispatch-devel] SF.net SVN: apache-dispatch: [65] trunk/Makefile.PL

From: <phr...@us...> - 2008-06-22 10:47:40

Revision: 65
          http://apache-dispatch.svn.sourceforge.net/apache-dispatch/?rev=65&view=rev
Author:   phred_moyer
Date:     2008-06-21 01:43:13 -0700 (Sat, 21 Jun 2008)

Log Message:
-----------
Clean up after failed attempts to build a::d1 then a::d2

Modified Paths:
--------------
    trunk/Makefile.PL

Modified: trunk/Makefile.PL
===================================================================
--- trunk/Makefile.PL	2008-06-21 00:05:27 UTC (rev 64)
+++ trunk/Makefile.PL	2008-06-21 08:43:13 UTC (rev 65)
@@ -35,7 +35,7 @@
 
 my %common_opts = (
     PREREQ_PM => \%prereqs,
-    clean     => { FILES => 't/TEST' },
+    clean     => { FILES => 't/TEST, *.xs*'  },
 );
 
 if ( $mp_gen == 1 ) {
@@ -60,7 +60,6 @@
 will need a C compiler and Apache/mod_perl sources.\n\n";
 
         $makefile_params{'PL_FILES'} = { 'set_pureperl.PL' => '0' };
-        $makefile_params{'clean'}    = { FILES             => '*.xs*' };
 
         import Apache::ExtUtils qw(command_table);
         use lib 'lib';


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Apache-dispatch-devel] SF.net SVN: apache-dispatch: [69] trunk/Makefile.PL

From: <phr...@us...> - 2008-06-22 08:42:49

Revision: 69
          http://apache-dispatch.svn.sourceforge.net/apache-dispatch/?rev=69&view=rev
Author:   phred_moyer
Date:     2008-06-22 01:42:48 -0700 (Sun, 22 Jun 2008)

Log Message:
-----------
We don't need 'use Config'.  Huh.

Modified Paths:
--------------
    trunk/Makefile.PL

Modified: trunk/Makefile.PL
===================================================================
--- trunk/Makefile.PL	2008-06-22 08:40:27 UTC (rev 68)
+++ trunk/Makefile.PL	2008-06-22 08:42:48 UTC (rev 69)
@@ -3,8 +3,6 @@
 use strict;
 use warnings;
 
-use Config;
-
 # minimum version of A::B required
 use Apache::Bootstrap 0.03;
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Apache-dispatch-devel] SF.net SVN: apache-dispatch: [68] trunk/Makefile.PL

From: <phr...@us...> - 2008-06-22 08:40:22

Revision: 68
          http://apache-dispatch.svn.sourceforge.net/apache-dispatch/?rev=68&view=rev
Author:   phred_moyer
Date:     2008-06-22 01:40:27 -0700 (Sun, 22 Jun 2008)

Log Message:
-----------
Fix conditional

Modified Paths:
--------------
    trunk/Makefile.PL

Modified: trunk/Makefile.PL
===================================================================
--- trunk/Makefile.PL	2008-06-22 08:13:40 UTC (rev 67)
+++ trunk/Makefile.PL	2008-06-22 08:40:27 UTC (rev 68)
@@ -84,7 +84,7 @@
 
 $bootstrap->WriteMakefile( %maker_opts );
 
-pop @ARGV unless $ENV{MOD_PERL_1_BUILD};
+pop @ARGV if $ENV{MOD_PERL_1_BUILD};
 
 package MY;
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Flat | Threaded

1 2 3 .. 6 > >> (Page 1 of 6)

2006	Jan	Feb	Mar (4)	Apr (33)	May (10)	Jun (22)	Jul (3)	Aug (15)	Sep (3)	Oct (3)	Nov	Dec
2007	Jan	Feb	Mar	Apr	May	Jun	Jul (2)	Aug (5)	Sep	Oct	Nov	Dec (9)
2008	Jan (6)	Feb (2)	Mar	Apr	May	Jun (11)	Jul	Aug	Sep	Oct (2)	Nov	Dec
2009	Jan	Feb	Mar	Apr (12)	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2010	Jan	Feb (3)	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec