Author: jim
Date: Wed May  6 16:00:22 2009
New Revision: 772334

URL: http://svn.apache.org/viewvc?rev=772334&view=rev
Log:
Move away from sub-modules

Added:
    httpd/httpd/branches/httpd-2.2-proxy/modules/proxy/mod_lbmethod_bybusyness.c
      - copied unchanged from r772330, httpd/httpd/branches/httpd-2.2-proxy/modules/proxy/balancers/mod_lbmethod_bybusyness.c
    httpd/httpd/branches/httpd-2.2-proxy/modules/proxy/mod_lbmethod_byrequests.c
      - copied unchanged from r772330, httpd/httpd/branches/httpd-2.2-proxy/modules/proxy/balancers/mod_lbmethod_byrequests.c
    httpd/httpd/branches/httpd-2.2-proxy/modules/proxy/mod_lbmethod_bytraffic.c
      - copied unchanged from r772330, httpd/httpd/branches/httpd-2.2-proxy/modules/proxy/balancers/mod_lbmethod_bytraffic.c
Removed:
    httpd/httpd/branches/httpd-2.2-proxy/modules/proxy/balancers/mod_lbmethod_bybusyness.c
    httpd/httpd/branches/httpd-2.2-proxy/modules/proxy/balancers/mod_lbmethod_bybusyness.dsp
    httpd/httpd/branches/httpd-2.2-proxy/modules/proxy/balancers/mod_lbmethod_byrequests.c
    httpd/httpd/branches/httpd-2.2-proxy/modules/proxy/balancers/mod_lbmethod_byrequests.dsp
    httpd/httpd/branches/httpd-2.2-proxy/modules/proxy/balancers/mod_lbmethod_bytraffic.c
    httpd/httpd/branches/httpd-2.2-proxy/modules/proxy/balancers/mod_lbmethod_bytraffic.dsp
Modified:
    httpd/httpd/branches/httpd-2.2-proxy/modules/proxy/balancers/config2.m4
    httpd/httpd/branches/httpd-2.2-proxy/modules/proxy/config.m4
    httpd/httpd/branches/httpd-2.2-proxy/modules/proxy/mod_proxy_balancer.c

Modified: httpd/httpd/branches/httpd-2.2-proxy/modules/proxy/balancers/config2.m4
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/httpd-2.2-proxy/modules/proxy/balancers/config2.m4?rev=772334&r1=772333&r2=772334&view=diff
==============================================================================
--- httpd/httpd/branches/httpd-2.2-proxy/modules/proxy/balancers/config2.m4 (original)
+++ httpd/httpd/branches/httpd-2.2-proxy/modules/proxy/balancers/config2.m4 Wed May  6 16:00:22 2009
@@ -1,7 +1,5 @@
 APACHE_MODPATH_INIT(proxy/balancers)
 
-APACHE_MODULE(lbmethod_byrequests, Apache proxy Load balancing by request counting, , , $proxy_mods_enable)
-APACHE_MODULE(lbmethod_bytraffic, Apache proxy Load balancing by traffic counting, , , $proxy_mods_enable)
-APACHE_MODULE(lbmethod_bybusyness, Apache proxy Load balancing by busyness, , , $proxy_mods_enable)
+dnl APACHE_MODULE(lbmethod_byrequests, Apache proxy Load balancing by request counting, , , $proxy_mods_enable)
 
 APACHE_MODPATH_FINISH

Modified: httpd/httpd/branches/httpd-2.2-proxy/modules/proxy/config.m4
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/httpd-2.2-proxy/modules/proxy/config.m4?rev=772334&r1=772333&r2=772334&view=diff
==============================================================================
--- httpd/httpd/branches/httpd-2.2-proxy/modules/proxy/config.m4 (original)
+++ httpd/httpd/branches/httpd-2.2-proxy/modules/proxy/config.m4 Wed May  6 16:00:22 2009
@@ -17,7 +17,7 @@
 proxy_ftp_objs="mod_proxy_ftp.lo"
 proxy_http_objs="mod_proxy_http.lo"
 proxy_ajp_objs="mod_proxy_ajp.lo ajp_header.lo ajp_link.lo ajp_msg.lo ajp_utils.lo"
-proxy_balancer_objs="mod_proxy_balancer.lo"
+proxy_balancer_objs="mod_proxy_balancer.lo mod_lbmethod_bybusyness.lo mod_lbmethod_byrequests.lo mod_lbmethod_bytraffic.lo"
 
 case "$host" in
   *os2*)

Modified: httpd/httpd/branches/httpd-2.2-proxy/modules/proxy/mod_proxy_balancer.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/httpd-2.2-proxy/modules/proxy/mod_proxy_balancer.c?rev=772334&r1=772333&r2=772334&view=diff
==============================================================================
--- httpd/httpd/branches/httpd-2.2-proxy/modules/proxy/mod_proxy_balancer.c (original)
+++ httpd/httpd/branches/httpd-2.2-proxy/modules/proxy/mod_proxy_balancer.c Wed May  6 16:00:22 2009
@@ -951,6 +951,10 @@
 
 }
 
+extern const proxy_balancer_method proxy_balancer_bytraffic;
+extern const proxy_balancer_method proxy_balancer_byrequests;
+extern const proxy_balancer_method proxy_balancer_bybusyness;
+
 static void ap_proxy_balancer_register_hook(apr_pool_t *p)
 {
     /* Only the mpm_winnt has child init hook handler.
@@ -965,6 +969,14 @@
     proxy_hook_pre_request(proxy_balancer_pre_request, NULL, NULL, APR_HOOK_FIRST);
     proxy_hook_post_request(proxy_balancer_post_request, NULL, NULL, APR_HOOK_FIRST);
     proxy_hook_canon_handler(proxy_balancer_canon, NULL, NULL, APR_HOOK_FIRST);
+
+    ap_register_provider(p, PROXY_LBMETHOD, "bytraffic", "0",
+                         &proxy_balancer_bytraffic);
+    ap_register_provider(p, PROXY_LBMETHOD, "byrequests", "0",
+                         &proxy_balancer_byrequests);
+    ap_register_provider(p, PROXY_LBMETHOD, "bybusyness", "0",
+                         &proxy_balancer_bybusyness);
+
 }
 
 module AP_MODULE_DECLARE_DATA proxy_balancer_module = {