Index: apache-1.3/mod_webapp.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/apache-1.3/mod_webapp.c,v
retrieving revision 1.32
diff -r1.32 mod_webapp.c
71d70
< #include <wa_version.h>
86,90d84
< static void wam_init_handler(server_rec *s, ap_pool *p)
< {
<     ap_add_version_component(WA_EXPOSED_VERSION);
< }
< 
96c90
< static void wam_shutdown(server_rec *s, pool *p) {/*void *nil) { */
---
> static void wam_child_destroy(server_rec *s, pool *p) {
103c97
< static void wam_startup(server_rec *s, pool *p) {
---
> static void wam_child_init(server_rec *s, pool *p) {
108a103,107
> /* Initialize the module, by adding our version info in Apache. */
> static void wam_module_init(server_rec *s, ap_pool *p) {
>     ap_add_version_component(WA_VERSION);
> }
> 
541c540
<     wam_init_handler,                   /* module initializer */
---
>     wam_module_init,                    /* module initializer */
556,557c555,556
<     wam_startup,                        /* child initializer */
<     wam_shutdown,                       /* child exit/cleanup */
---
>     wam_child_init,                     /* child initializer */
>     wam_child_destroy,                  /* child exit/cleanup */
Index: apache-2.0/mod_webapp.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/apache-2.0/mod_webapp.c,v
retrieving revision 1.8
diff -r1.8 mod_webapp.c
72d71
< #include <wa_version.h>
92,95c91,93
< static int wam_init_handler(apr_pool_t *p, apr_pool_t *plog, apr_pool_t *ptemp,
<                              server_rec *s)
< {
<     ap_add_version_component(p, WA_EXPOSED_VERSION);
---
> static int wam_module_init(apr_pool_t *p, apr_pool_t *plog, apr_pool_t *ptemp,
>                             server_rec *s) {
>     ap_add_version_component(p, WA_VERSION);
100c98
< static apr_status_t wam_shutdown(void *data) {/*void *nil) { */
---
> static apr_status_t wam_child_destroy(void *data) {/*void *nil) { */
108c106
< static void wam_startup(apr_pool_t *p, server_rec *s) {
---
> static void wam_child_init(apr_pool_t *p, server_rec *s) {
112c110
<     apr_pool_cleanup_register(p, NULL, wam_shutdown, apr_pool_cleanup_null);
---
>     apr_pool_cleanup_register(p, NULL, wam_child_destroy, apr_pool_cleanup_null);
531c529
< static void register_hooks(apr_pool_t *p)
---
> static void wam_hooks(apr_pool_t *p)
532a531,533
>     ap_hook_post_config(wam_module_init, NULL, NULL, APR_HOOK_MIDDLE);
>     ap_hook_child_init(wam_child_init, NULL, NULL, APR_HOOK_MIDDLE);
>     ap_hook_map_to_storage(wam_map_to_storage, NULL, NULL, APR_HOOK_MIDDLE);
535,537d535
<     ap_hook_child_init(wam_startup, NULL, NULL, APR_HOOK_MIDDLE);
<     ap_hook_map_to_storage(wam_map_to_storage, NULL, NULL, APR_HOOK_MIDDLE);
<     ap_hook_post_config(wam_init_handler, NULL, NULL, APR_HOOK_MIDDLE);
548c546
<     register_hooks
---
>     wam_hooks,
Index: include/wa.h
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/include/wa.h,v
retrieving revision 1.15
diff -r1.15 wa.h
117a118
> #include <wa_version.h>
Index: include/wa_version.h
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/include/wa_version.h,v
retrieving revision 1.2
diff -r1.2 wa_version.h
61,89c61,65
< 
< /************** START OF AREA TO MODIFY BEFORE RELEASING *************/
< #define WA_VERMAJOR     1
< #define WA_VERMINOR     2
< #define WA_VERFIX       0
< #define WA_VERSTRING    "1.2.0-dev"
< 
< /* Beta number */
< #define WA_VERBETA      1
< #define WA_BETASTRING   "1"
< /* set WA_VERISRELEASE to 1 when release (do not forget to commit!) */
< #define WA_VERISRELEASE 1
< /************** END OF AREA TO MODIFY BEFORE RELEASING *************/
< 
< #define PACKAGE "mod_webapp/"
< /* Build WA_EXPOSED_VERSION and WA_VERSION */
< #define WA_EXPOSED_VERSION_INT PACKAGE WA_VERSTRING
< 
< #if ( WA_VERISRELEASE == 1 )
< #define WA_EXPOSED_VERSION WA_EXPOSED_VERSION_INT
< #undef WA_VERBETA
< #define WA_VERBETA 255
< #else
< #define WA_EXPOSED_VERSION WA_EXPOSED_VERSION_INT "-beta-" WA_BETASTRING
< #endif
< 
< #define WA_MAKEVERSION(major, minor, fix, beta) (((major) << 24) + ((minor) << 16) + ((fix) << 8) + (beta))
< 
< #define WA_VERSION WA_MAKEVERSION(WA_VERMAJOR, WA_VERMINOR, WA_VERFIX, WA_VERBETA)
---
> #define WA_VENDOR   "Apache Software Foundation"
> #define WA_PRODUCT  "WebApp Module"
> #define WA_NAME     "mod_webapp"
> #define WA_REVISION "1.2.0-dev"
> #define WA_VERSION  WA_NAME "/" WA_REVISION