Added C::Utils and C::E::A::MP2 to MANIFEST. Reorderd subs in C::E::A::* to be in...

diff --git a/MANIFEST b/MANIFEST
index c88a09a..ca9b8af 100644 (file)
--- a/MANIFEST
+++ b/MANIFEST
@@ -6,6 +6,7 @@ lib/Catalyst/Engine.pm
 lib/Catalyst/Engine/Apache.pm
 lib/Catalyst/Engine/Apache/MP13.pm
 lib/Catalyst/Engine/Apache/MP19.pm
+lib/Catalyst/Engine/Apache/MP20.pm
 lib/Catalyst/Engine/CGI.pm
 lib/Catalyst/Engine/FCGI.pm
 lib/Catalyst/Engine/HTTP.pm
@@ -24,6 +25,7 @@ lib/Catalyst/Request.pm
 lib/Catalyst/Request/Upload.pm
 lib/Catalyst/Response.pm
 lib/Catalyst/Test.pm
+lib/Catalyst/Utils.pm
 Makefile.PL
 MANIFEST                       This list of files
 META.yml

diff --git a/lib/Catalyst/Engine/Apache.pm b/lib/Catalyst/Engine/Apache.pm
index e66f434..9f52366 100644 (file)
--- a/lib/Catalyst/Engine/Apache.pm
+++ b/lib/Catalyst/Engine/Apache.pm
@@ -18,7 +18,7 @@ See L<Catalyst>.
 
 =head1 DESCRIPTION
 
-This is the Catalyst engine specialized for Apache (i.e. for mod_perl).
+This is a base class engine specialized for Apache (i.e. for mod_perl).
 
 =head1 METHODS
 
@@ -135,6 +135,7 @@ L<Catalyst>.
 =head1 AUTHOR
 
 Sebastian Riedel, C<sri@cpan.org>
+Christian Hansen C<ch@ngmedia.com>
 
 =head1 COPYRIGHT
 

diff --git a/lib/Catalyst/Engine/Apache/MP13.pm b/lib/Catalyst/Engine/Apache/MP13.pm
index 9f7512e..86f86a1 100644 (file)
--- a/lib/Catalyst/Engine/Apache/MP13.pm
+++ b/lib/Catalyst/Engine/Apache/MP13.pm
@@ -12,7 +12,7 @@ Apache::Constants->import(':common');
 
 =head1 NAME
 
-Catalyst::Engine::Apache::MP13 - Catalyst Apache MP1.3 Engine
+Catalyst::Engine::Apache::MP13 - Catalyst Apache MP13 Engine
 
 =head1 SYNOPSIS
 
@@ -62,6 +62,15 @@ sub handler ($$) {
     shift->SUPER::handler(@_);
 }
 
+=item $c->prepare_request($r)
+
+=cut
+
+sub prepare_request {
+    my ( $c, $r ) = @_;
+    $c->apache( Apache::Request->new($r) );
+}
+
 =item $c->prepare_uploads
 
 =cut
@@ -86,15 +95,6 @@ sub prepare_uploads {
     $c->req->_assign_values( $c->req->uploads, \@uploads );
 }
 
-=item $c->prepare_request($r)
-
-=cut
-
-sub prepare_request {
-    my ( $c, $r ) = @_;
-    $c->apache( Apache::Request->new($r) );
-}
-
 =back
 
 =head1 SEE ALSO
@@ -104,6 +104,7 @@ L<Catalyst>, L<Catalyst::Engine>, L<Catalyst::Engine::Apache>.
 =head1 AUTHOR
 
 Sebastian Riedel, C<sri@cpan.org>
+Christian Hansen C<ch@ngmedia.com>
 
 =head1 COPYRIGHT
 

diff --git a/lib/Catalyst/Engine/Apache/MP19.pm b/lib/Catalyst/Engine/Apache/MP19.pm
index a14718a..89761a8 100644 (file)
--- a/lib/Catalyst/Engine/Apache/MP19.pm
+++ b/lib/Catalyst/Engine/Apache/MP19.pm
@@ -67,6 +67,15 @@ sub handler : method {
     shift->SUPER::handler(@_);
 }
 
+=item $c->prepare_request($r)
+
+=cut
+
+sub prepare_request {
+    my ( $c, $r ) = @_;
+    $c->apache( Apache::Request->new($r) );
+}
+
 =item $c->prepare_uploads
 
 =cut
@@ -94,15 +103,6 @@ sub prepare_uploads {
     $c->request->_assign_values( $c->req->uploads, \@uploads );
 }
 
-=item $c->prepare_request($r)
-
-=cut
-
-sub prepare_request {
-    my ( $c, $r ) = @_;
-    $c->apache( Apache::Request->new($r) );
-}
-
 =back
 
 =head1 SEE ALSO
@@ -112,6 +112,7 @@ L<Catalyst>, L<Catalyst::Engine>, L<Catalyst::Engine::Apache>.
 =head1 AUTHOR
 
 Sebastian Riedel, C<sri@cpan.org>
+Christian Hansen C<ch@ngmedia.com>
 
 =head1 COPYRIGHT
 

diff --git a/lib/Catalyst/Engine/Apache/MP20.pm b/lib/Catalyst/Engine/Apache/MP20.pm
index ff54230..74575e0 100644 (file)
--- a/lib/Catalyst/Engine/Apache/MP20.pm
+++ b/lib/Catalyst/Engine/Apache/MP20.pm
@@ -26,7 +26,7 @@ See L<Catalyst>.
 
 =head1 DESCRIPTION
 
-This is the Catalyst engine specialized for Apache mod_perl version 2.
+This is the Catalyst engine specialized for Apache mod_perl version 2.0.
 
 =head1 OVERLOADED METHODS
 
@@ -66,6 +66,15 @@ sub handler : method {
     shift->SUPER::handler(@_);
 }
 
+=item $c->prepare_request($r)
+
+=cut
+
+sub prepare_request {
+    my ( $c, $r ) = @_;
+    $c->apache( Apache2::Request->new($r) );
+}
+
 =item $c->prepare_uploads
 
 =cut
@@ -93,15 +102,6 @@ sub prepare_uploads {
     $c->req->_assign_values( $c->req->uploads, \@uploads );
 }
 
-=item $c->prepare_request($r)
-
-=cut
-
-sub prepare_request {
-    my ( $c, $r ) = @_;
-    $c->apache( Apache2::Request->new($r) );
-}
-
 =back
 
 =head1 SEE ALSO
@@ -111,6 +111,7 @@ L<Catalyst>, L<Catalyst::Engine>, L<Catalyst::Engine::Apache>.
 =head1 AUTHOR
 
 Sebastian Riedel, C<sri@cpan.org>
+Christian Hansen C<ch@ngmedia.com>
 
 =head1 COPYRIGHT