[svn:modperl-modules] rev 247 - in Apache-Peek/trunk: . t/apachepeek t/response/TestApachePeek

Author: [email protected]
Date: Sat Jul  9 16:35:06 2005
New Revision: 247

Modified:
   Apache-Peek/trunk/Peek.pm.mp2.perl5.6
   Apache-Peek/trunk/Peek.pm.mp2.perl5.8
   Apache-Peek/trunk/t/apachepeek/basic.t
   Apache-Peek/trunk/t/response/TestApachePeek/basic.pm
Log:
more updates for mp2


Modified: Apache-Peek/trunk/Peek.pm.mp2.perl5.6
==============================================================================
--- Apache-Peek/trunk/Peek.pm.mp2.perl5.6	(original)
+++ Apache-Peek/trunk/Peek.pm.mp2.perl5.6	Sat Jul  9 16:35:06 2005
@@ -12,10 +12,10 @@ our @ISA = qw(Exporter DynaLoader Devel:
 our $VERSION = "INSERT";
 our @EXPORT = qw(Dump);
 
-use mod_perl;
+use 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;
+    unless $mod_perl2::VERSION > 1.99022;
 
 bootstrap Apache::Peek;
 

Modified: Apache-Peek/trunk/Peek.pm.mp2.perl5.8
==============================================================================
--- Apache-Peek/trunk/Peek.pm.mp2.perl5.8	(original)
+++ Apache-Peek/trunk/Peek.pm.mp2.perl5.8	Sat Jul  9 16:35:06 2005
@@ -9,11 +9,10 @@ use base qw(Exporter Devel::Peek);
 our $VERSION = "INSERT";
 our @EXPORT = qw(Dump DumpArray);
 
-use Apache2;
-use mod_perl;
+use 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;
+    "and can't be used with $mod_perl2::VERSION, "
+    unless $mod_perl2::VERSION > 1.99022;
 
 XSLoader::load 'Apache::Peek';
 

Modified: Apache-Peek/trunk/t/apachepeek/basic.t
==============================================================================
--- Apache-Peek/trunk/t/apachepeek/basic.t	(original)
+++ Apache-Peek/trunk/t/apachepeek/basic.t	Sat Jul  9 16:35:06 2005
@@ -12,5 +12,11 @@ my $str = GET_BODY $location;
 
 ok $str;
 
-ok t_cmp(qr/Apache::Const.*?OK/, $str);
+eval { require mod_perl2 };
+unless ($@) {
+    ok t_cmp($str, qr/Apache2::Const.*?OK/);
+}
+else {
+    ok t_cmp($str, qr/Apache::Const.*?OK/);
+}
 

Modified: Apache-Peek/trunk/t/response/TestApachePeek/basic.pm
==============================================================================
--- Apache-Peek/trunk/t/response/TestApachePeek/basic.pm	(original)
+++ Apache-Peek/trunk/t/response/TestApachePeek/basic.pm	Sat Jul  9 16:35:06 2005
@@ -3,15 +3,15 @@ package TestApachePeek::basic;
 use strict;
 use warnings FATAL => 'all';
 
-use mod_perl;
-use constant MP2 => $mod_perl::VERSION < 1.99 ? 0 : 1;
+use mod_perl2;
+use constant MP2 => 1;
 
 BEGIN {
     if (MP2) {
-        require Apache::RequestRec;
-        require Apache::RequestIO;
-        require Apache::Const;
-        Apache::Const->import(-compile => 'OK');
+        require Apache2::RequestRec;
+        require Apache2::RequestIO;
+        require Apache2::Const;
+        Apache2::Const->import(-compile => 'OK');
     }
     else {
         require Apache;
@@ -29,9 +29,9 @@ sub handler {
 
     $r->send_http_header() unless MP2;
 
-    Apache::Peek::Dump(\&Apache::Const::OK);
+    Apache::Peek::Dump(\&Apache2::Const::OK);
 
-    return MP2 ? Apache::OK : Apache::Constants::OK;
+    return MP2 ? Apache2::Const::OK : Apache::Constants::OK;
 }
 1;
 __END__