[svn:modperl-modules] rev 219 - in Apache-VMonitor-2.0/trunk: . lib/Apache

Author: MJH
Date: Thu May 26 07:42:17 2005
New Revision: 219

Modified:
   Apache-VMonitor-2.0/trunk/Changes
   Apache-VMonitor-2.0/trunk/lib/Apache/VMonitor.pm
Log:
Update to match API changes in MP2 RC5 and above


Modified: Apache-VMonitor-2.0/trunk/Changes
==============================================================================
--- Apache-VMonitor-2.0/trunk/Changes	(original)
+++ Apache-VMonitor-2.0/trunk/Changes	Thu May 26 07:42:17 2005
@@ -4,6 +4,8 @@
 
 =item 2.04 - dev
 
+Update to match the API changes in MP2 RC5 and above
+
 
 
 =item 2.03 - Fri Mar 18 15:26:11 EST 2005
@@ -47,4 +49,4 @@ be subclassable and support mod_perl 1st
 
 =back
 
-=cut
\ No newline at end of file
+=cut

Modified: Apache-VMonitor-2.0/trunk/lib/Apache/VMonitor.pm
==============================================================================
--- Apache-VMonitor-2.0/trunk/lib/Apache/VMonitor.pm	(original)
+++ Apache-VMonitor-2.0/trunk/lib/Apache/VMonitor.pm	Thu May 26 07:42:17 2005
@@ -15,12 +15,12 @@ BEGIN {
     die "mod_perl is required to run this module: $@" if $@;
 
     if (MP2) {
-        require Apache::ServerUtil;
-        require Apache::RequestRec;
-        require Apache::RequestIO;
+        require Apache2::ServerUtil;
+        require Apache2::RequestRec;
+        require Apache2::RequestIO;
         require APR::Table;
-        require Apache::Const;
-        Apache::Const->import('OK');
+        require Apache2::Const;
+        Apache2::Const->import('OK');
     } else {
         require Apache;
         require Apache::Constants;
@@ -32,14 +32,14 @@ BEGIN {
 
 # once 2.0 is released drop the Apache::MPM_IS_THREADED case
 use constant APACHE_IS_THREADED => MP2 && 
-    require Apache::MPM && Apache::MPM->is_threaded();
+    require Apache2::MPM && Apache2::MPM->is_threaded();
 
 # Apache::Scoreboard for 1.3 scoreboard has the vhost accessor only
 # starting from version 0.12
 use constant HAS_VHOSTS => (MP2 || $Apache::Scoreboard::VERSION > 0.11);
 
 use constant SERVER_LIMIT => MP2
-    ? Apache::Const::SERVER_LIMIT
+    ? Apache::Scoreboard->image(APR::Pool->new)->server_limit
     : Apache::Constants::HARD_SERVER_LIMIT;
 
 #use constant THREAD_LIMIT => MP2
@@ -47,7 +47,7 @@ use constant SERVER_LIMIT => MP2
 #    : 0; # no threads in mp1
 
 use constant SINGLE_PROCESS_MODE => MP2
-    ? Apache::ServerUtil::exists_config_define('ONE_PROCESS')
+    ? Apache2::ServerUtil::exists_config_define('ONE_PROCESS')
     : Apache->define('X');
 
 my $gtop = GTop->new;