[svn:modperl-modules] rev 216 - in Apache-Scoreboard-2.0/trunk: . lib/Apache t/conf t/response/TestInternal

Author: MJH
Date: Tue May 24 11:23:36 2005
New Revision: 216

Modified:
   Apache-Scoreboard-2.0/trunk/Makefile.PL
   Apache-Scoreboard-2.0/trunk/Scoreboard.xs
   Apache-Scoreboard-2.0/trunk/lib/Apache/Scoreboard.pm
   Apache-Scoreboard-2.0/trunk/t/conf/modperl_extra.pl
   Apache-Scoreboard-2.0/trunk/t/response/TestInternal/basic.pm
Log:
Match the namespace changes for mod_perl2 release (RC5 and above)


Modified: Apache-Scoreboard-2.0/trunk/Makefile.PL
==============================================================================
--- Apache-Scoreboard-2.0/trunk/Makefile.PL	(original)
+++ Apache-Scoreboard-2.0/trunk/Makefile.PL	Tue May 24 11:23:36 2005
@@ -3,8 +3,7 @@ use strict;
 use warnings FATAL => 'all';
 #no warnings 'redefine';
 
-use Apache2;
-use mod_perl 1.99;
+use mod_perl2;
 
 # XXX: need to check that the same perl is used as the one mod_perl
 # was built with, otherwise unresolved symbols problems occur:
@@ -22,7 +21,7 @@ use Apache::TestMM qw(test clean);
 # prerequisites
 my %require = (
     "Apache::Test" => "1.10", # ipv6 fixes
-    "mod_perl"     => "1.9917",
+    "mod_perl"     => "2.00",
 );
 
 my @scripts = qw(t/TEST);

Modified: Apache-Scoreboard-2.0/trunk/Scoreboard.xs
==============================================================================
--- Apache-Scoreboard-2.0/trunk/Scoreboard.xs	(original)
+++ Apache-Scoreboard-2.0/trunk/Scoreboard.xs	Tue May 24 11:23:36 2005
@@ -210,7 +210,7 @@ BOOT:
 
 int
 scoreboard_send(r)
-    Apache::RequestRec r
+    Apache2::RequestRec r
 
 
 SV *

Modified: Apache-Scoreboard-2.0/trunk/lib/Apache/Scoreboard.pm
==============================================================================
--- Apache-Scoreboard-2.0/trunk/lib/Apache/Scoreboard.pm	(original)
+++ Apache-Scoreboard-2.0/trunk/lib/Apache/Scoreboard.pm	Tue May 24 11:23:36 2005
@@ -8,7 +8,7 @@ use warnings FATAL => 'all';
 use Carp;
 
 BEGIN {
-    require mod_perl;
+    require mod_perl2;
     die "This module was built against mod_perl 2.0 ",
         "and can't be used with $mod_perl::VERSION, "
             unless $mod_perl::VERSION > 1.98;

Modified: Apache-Scoreboard-2.0/trunk/t/conf/modperl_extra.pl
==============================================================================
--- Apache-Scoreboard-2.0/trunk/t/conf/modperl_extra.pl	(original)
+++ Apache-Scoreboard-2.0/trunk/t/conf/modperl_extra.pl	Tue May 24 11:23:36 2005
@@ -1,12 +1,10 @@
-use Apache2;
-
 use ModPerl::Util (); #for CORE::GLOBAL::exit
 
-use Apache::RequestRec ();
-use Apache::RequestIO ();
-use Apache::RequestUtil ();
+use Apache2::RequestRec ();
+use Apache2::RequestIO ();
+use Apache2::RequestUtil ();
 
-use Apache::Const -compile => ':common';
+use Apache2::Const -compile => ':common';
 use APR::Const -compile => ':common';
 
 unless ($ENV{MOD_PERL}) {

Modified: Apache-Scoreboard-2.0/trunk/t/response/TestInternal/basic.pm
==============================================================================
--- Apache-Scoreboard-2.0/trunk/t/response/TestInternal/basic.pm	(original)
+++ Apache-Scoreboard-2.0/trunk/t/response/TestInternal/basic.pm	Tue May 24 11:23:36 2005
@@ -5,13 +5,13 @@ use warnings FATAL => 'all';
 
 use Apache::Test;
 
-use Apache::Response ();
-use Apache::RequestRec ();
+use Apache2::Response ();
+use Apache2::RequestRec ();
 
 use Apache::Scoreboard ();
 use MyTest::Common ();
 
-use Apache::Const -compile => 'OK';
+use Apache2::Const -compile => 'OK';
 
 sub handler {
     my $r = shift;
@@ -26,7 +26,7 @@ sub handler {
     my $image = Apache::Scoreboard->image($r->pool);
     MyTest::Common::test2($image);
 
-    Apache::OK;
+    Apache2::Const::OK;
 }
 
 1;