tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cos...@apache.org
Subject cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_registry.c jk_registry.h
Date Thu, 16 May 2002 23:45:41 GMT
costin      02/05/16 16:45:41

  Modified:    jk/native2/common jk_registry.c jk_registry.h
  Log:
  One change to make building with make easier.
  
  No more 'excludes', all C files will be compiled and loaded.
  
  We use an ifdef inside the file to genearte an empty factory method
  ( that just sets disabled ).
  
  Revision  Changes    Path
  1.24      +4 -23     jakarta-tomcat-connectors/jk/native2/common/jk_registry.c
  
  Index: jk_registry.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_registry.c,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- jk_registry.c	16 May 2002 20:58:44 -0000	1.23
  +++ jk_registry.c	16 May 2002 23:45:41 -0000	1.24
  @@ -67,7 +67,7 @@
   
   /***************************************************************************
    * Description: Worker list                                                *
  - * Version:     $Revision: 1.23 $                                           *
  + * Version:     $Revision: 1.24 $                                           *
    ***************************************************************************/
   
   /** Static declarations for all 'hardcoded' modules. This is a hack, 
  @@ -117,44 +117,25 @@
     env->registerFactory( env, "uri", jk2_uriEnv_factory );
     env->registerFactory( env, "config", jk2_config_factory );
     
  -  env->registerFactory( env, "worker.ajp13", jk2_worker_ajp14_factory );
  -  env->registerFactory( env, "ajp13", jk2_worker_ajp14_factory );
  +  env->registerFactory( env, "ajp13", jk2_worker_ajp13_factory );
     env->registerFactory( env, "lb",    jk2_worker_lb_factory );
  -  env->registerFactory( env, "worker.lb",    jk2_worker_lb_factory );
     env->registerFactory( env, "status", jk2_worker_status_factory );
  -  env->registerFactory( env, "worker.status", jk2_worker_status_factory );
     env->registerFactory( env, "run", jk2_worker_run_factory );
  -  env->registerFactory( env, "worker.run", jk2_worker_run_factory );
   
  -#ifdef HAVE_UNIXSOCKETS
     env->registerFactory( env, "channel.un", jk2_channel_un_factory );
  -#endif
   
  -#ifdef HAS_APR
  -  env->registerFactory( env, "channel.apr",
  -                        jk2_channel_apr_socket_factory );
  -#endif
  +  env->registerFactory( env, "channel.apr",jk2_channel_apr_socket_factory );
   
     env->registerFactory( env, "shm", jk2_shm_factory );
     env->registerFactory( env, "channel.socket", jk2_channel_socket_factory );
   
     
  -  env->registerFactory( env, "handler.response",
  -                        jk2_handler_response_factory );
  +  env->registerFactory( env, "handler.response", jk2_handler_response_factory );
     env->registerFactory( env, "handler.logon",   jk2_handler_logon_factory );
     
  -  /* Optional objects */
  -
  -#ifdef HAVE_JNI
     env->registerFactory( env, "channel.jni",   jk2_channel_jni_factory );
     env->registerFactory( env, "worker.jni",   jk2_worker_jni_factory );
     env->registerFactory( env, "vm",   jk2_vm_factory );
  -#endif
  -#ifdef AJP12
  -  env->registerFactory( env, "ajp12", jk2_worker_ajp12_factory );
  -  env->registerFactory( env, "worker.ajp12", jk2_worker_ajp12_factory );
  -#endif
  -
   
   }
   
  
  
  
  1.15      +2 -4      jakarta-tomcat-connectors/jk/native2/common/jk_registry.h
  
  Index: jk_registry.h
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_registry.h,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- jk_registry.h	16 May 2002 20:58:44 -0000	1.14
  +++ jk_registry.h	16 May 2002 23:45:41 -0000	1.15
  @@ -62,7 +62,7 @@
   
   /***************************************************************************
    * Description: Worker list                                                *
  - * Version:     $Revision: 1.14 $                                           *
  + * Version:     $Revision: 1.15 $                                           *
    ***************************************************************************/
   
   /** Static declarations for all 'hardcoded' modules. This is a hack, 
  @@ -84,7 +84,7 @@
    *  
    */
   
  -int JK_METHOD jk2_worker_ajp14_factory(jk_env_t *env, jk_pool_t *pool,
  +int JK_METHOD jk2_worker_ajp13_factory(jk_env_t *env, jk_pool_t *pool,
                                          jk_bean_t *result,
                                          const char *type, const char *name);
   
  @@ -129,11 +129,9 @@
   /* Factories for 'new' types. We use the new factory interface,
    *  workers will be updated later 
    */
  -#ifdef HAS_APR
   int JK_METHOD jk2_channel_apr_socket_factory(jk_env_t *env, jk_pool_t *pool,
                                                jk_bean_t *result,
                                                const char *type, const char *name);
  -#endif
   
   int JK_METHOD jk2_shm_factory(jk_env_t *env, jk_pool_t *pool,
                                 jk_bean_t *result,
  
  
  

--
To unsubscribe, e-mail:   <mailto:tomcat-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:tomcat-dev-help@jakarta.apache.org>


Mime
View raw message