cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_registry.c jk_registry.h

2002-06-11 Thread costin 

costin  2002/06/11 15:50:24

  Modified:jk/native2 build.xml
   jk/native2/common jk_registry.c jk_registry.h
  Log:
  Add signal and user components.
  
  We use them only in jkjni - to allow java to send/receive signals
  and change user id.
  
  ( they are not yet ready, especially receiving signals from java )
  
  Revision  ChangesPath
  1.37  +2 -2  jakarta-tomcat-connectors/jk/native2/build.xml
  
  Index: build.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/build.xml,v
  retrieving revision 1.36
  retrieving revision 1.37
  diff -u -r1.36 -r1.37
  --- build.xml 9 Jun 2002 00:13:35 -   1.36
  +++ build.xml 11 Jun 2002 22:50:24 -  1.37
  @@ -385,8 +385,7 @@
   info=Building for NetWare platform /
 def name=XP_NETWARE if=netware
   info=Building for NetWare platform /
  -  def name=HAS_APR
  -info=JNI is now based on APR /
  +  def name=HAS_APR info=JNI is now based on APR /
 def name=_REENTRANT /
 def name=HAVE_JNI /
  
  @@ -410,6 +409,7 @@
 def name=_MBCS if=win32 /
 def name=_USRDLL if=win32 /
 def name=JNI_CONNECT_EXPORTS if=win32 /
  +  def name=HAVE_SIGNAL unless=win32 /
   
 import fileName=libhttpd.lib if=win32 /
 import fileName=libapr.lib if=win32 /
  
  
  
  1.28  +3 -3  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.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- jk_registry.c 10 Jun 2002 21:55:06 -  1.27
  +++ jk_registry.c 11 Jun 2002 22:50:24 -  1.28
  @@ -140,7 +140,7 @@
 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 );
  -
  -
  +  env-registerFactory( env, signal,  jk2_signal_factory);
  +  env-registerFactory( env, user,  jk2_user_factory);
   }
   
  
  
  
  1.18  +9 -1  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.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- jk_registry.h 31 May 2002 17:52:05 -  1.17
  +++ jk_registry.h 11 Jun 2002 22:50:24 -  1.18
  @@ -183,3 +183,11 @@
   int JK_METHOD jk2_mutex_proc_factory( jk_env_t *env ,jk_pool_t *pool,
 jk_bean_t *result,
 const char *type, const char *name);
  +
  +int JK_METHOD jk2_signal_factory( jk_env_t *env ,jk_pool_t *pool,
  +  jk_bean_t *result,
  +  const char *type, const char *name);
  +
  +int JK_METHOD jk2_user_factory( jk_env_t *env ,jk_pool_t *pool,
  +jk_bean_t *result,
  +const char *type, const char *name);
  
  
  

--
To unsubscribe, e-mail:   mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]

cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_registry.c jk_registry.h

2002-05-16 Thread costin 

costin  02/05/16 13:58:44

  Modified:jk/native2/common jk_registry.c jk_registry.h
  Log:
  The shm object will be registered in all cases.
  
  Inside jk_shm we'll detect what we can use and disable the component
  if no shm is available.
  
  Revision  ChangesPath
  1.23  +3 -4  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.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- jk_registry.c 15 May 2002 19:45:45 -  1.22
  +++ jk_registry.c 16 May 2002 20:58:44 -  1.23
  @@ -67,7 +67,7 @@
   
   /***
* Description: Worker list*
  - * Version: $Revision: 1.22 $   *
  + * Version: $Revision: 1.23 $   *
***/
   
   /** Static declarations for all 'hardcoded' modules. This is a hack, 
  @@ -133,10 +133,9 @@
   #ifdef HAS_APR
 env-registerFactory( env, channel.apr,
   jk2_channel_apr_socket_factory );
  -#if APR_HAS_SHARED_MEMORY
  -  env-registerFactory( env, shm, jk2_shm_factory );
  -#endif
   #endif
  +
  +  env-registerFactory( env, shm, jk2_shm_factory );
 env-registerFactory( env, channel.socket, jk2_channel_socket_factory );
   
 
  
  
  
  1.14  +2 -2  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.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- jk_registry.h 9 May 2002 00:05:14 -   1.13
  +++ jk_registry.h 16 May 2002 20:58:44 -  1.14
  @@ -62,7 +62,7 @@
   
   /***
* Description: Worker list*
  - * Version: $Revision: 1.13 $   *
  + * Version: $Revision: 1.14 $   *
***/
   
   /** Static declarations for all 'hardcoded' modules. This is a hack, 
  @@ -133,12 +133,12 @@
   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,
 const char *type, const char *name);
   
  -#endif
   
   int JK_METHOD jk2_channel_jni_factory(jk_env_t *env, jk_pool_t *pool,
 jk_bean_t *result,
  
  
  

--
To unsubscribe, e-mail:   mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]

cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_registry.c jk_registry.h

2002-05-16 Thread costin 

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  ChangesPath
  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 -  1.23
  +++ jk_registry.c 16 May 2002 23:45:41 -  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 -  1.14
  +++ jk_registry.h 16 May 2002 23:45:41 -  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

cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_registry.c

2002-05-10 Thread nacho 

nacho   02/05/10 16:45:19

  Modified:jk/native2/common jk_registry.c
  Log:
  * More unix.sockets code ifdefed for Win32
  
  Revision  ChangesPath
  1.21  +6 -2  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.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- jk_registry.c 9 May 2002 00:05:14 -   1.20
  +++ jk_registry.c 10 May 2002 23:45:18 -  1.21
  @@ -55,10 +55,12 @@
*   *
* = */
   
  +#include jk_global.h
  +
   #include jk_logger.h
   #include jk_pool.h
   #include jk_service.h
  -#include jk_env.h
  +#include jk_env.h 
   
   #ifdef HAS_APR
   #include apr.h
  @@ -69,7 +71,7 @@
   
   /***
* Description: Worker list*
  - * Version: $Revision: 1.20 $   *
  + * Version: $Revision: 1.21 $   *
***/
   
   /** Static declarations for all 'hardcoded' modules. This is a hack, 
  @@ -128,7 +130,9 @@
 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,
  
  
  

--
To unsubscribe, e-mail:   mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]

cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_registry.c jk_registry.h

2002-04-12 Thread costin 

costin  02/04/12 16:09:19

  Modified:jk/native2/common jk_registry.c jk_registry.h
  Log:
  Correct registration for the jni worker.
  
  Revision  ChangesPath
  1.18  +3 -1  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.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- jk_registry.c 11 Apr 2002 05:45:56 -  1.17
  +++ jk_registry.c 12 Apr 2002 23:09:19 -  1.18
  @@ -69,7 +69,7 @@
   
   /***
* Description: Worker list*
  - * Version: $Revision: 1.17 $   *
  + * Version: $Revision: 1.18 $   *
***/
   
   /** Static declarations for all 'hardcoded' modules. This is a hack, 
  @@ -147,6 +147,8 @@
   
   #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 );
  
  
  
  1.12  +5 -1  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.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- jk_registry.h 10 Apr 2002 23:44:29 -  1.11
  +++ jk_registry.h 12 Apr 2002 23:09:19 -  1.12
  @@ -62,7 +62,7 @@
   
   /***
* Description: Worker list*
  - * Version: $Revision: 1.11 $   *
  + * Version: $Revision: 1.12 $   *
***/
   
   /** Static declarations for all 'hardcoded' modules. This is a hack, 
  @@ -95,6 +95,10 @@
   
   
   int JK_METHOD jk2_worker_jni_factory(jk_env_t *env, jk_pool_t *pool,
  + jk_bean_t *result,
  + const char *type, const char *name);
  +
  +int JK_METHOD jk2_vm_factory(jk_env_t *env, jk_pool_t *pool,
jk_bean_t *result,
const char *type, const char *name);
   
  
  
  

--
To unsubscribe, e-mail:   mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]

cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_registry.c

2002-04-10 Thread costin 

costin  02/04/10 22:45:56

  Modified:jk/native2/common jk_registry.c
  Log:
  Small fix
  
  Revision  ChangesPath
  1.17  +7 -1  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.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- jk_registry.c 10 Apr 2002 23:44:29 -  1.16
  +++ jk_registry.c 11 Apr 2002 05:45:56 -  1.17
  @@ -60,10 +60,16 @@
   #include jk_service.h
   #include jk_env.h
   
  +#ifdef HAS_APR
  +#include apr.h
  +#endif
  +
   #include jk_registry.h
  +
  +
   /***
* Description: Worker list*
  - * Version: $Revision: 1.16 $   *
  + * Version: $Revision: 1.17 $   *
***/
   
   /** Static declarations for all 'hardcoded' modules. This is a hack, 
  
  
  

--
To unsubscribe, e-mail:   mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]

cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_registry.c jk_registry.h jk_uriEnv.c

2002-03-23 Thread costin 

costin  02/03/23 09:25:11

  Modified:jk/native2/common jk_registry.c jk_registry.h jk_uriEnv.c
  Log:
  Add the endpoint to the registry.
  
  Allow the uri prefix ( used to identify URI objects ) to be separated by :
  I find it much cleaner to use
 uri:/path/*
  instead of
 uri./path/*
  Both are now supported.
  
  Revision  ChangesPath
  1.15  +2 -1  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.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- jk_registry.c 18 Mar 2002 18:39:05 -  1.14
  +++ jk_registry.c 23 Mar 2002 17:25:11 -  1.15
  @@ -63,7 +63,7 @@
   #include jk_registry.h
   /***
* Description: Worker list*
  - * Version: $Revision: 1.14 $   *
  + * Version: $Revision: 1.15 $   *
***/
   
   /** Static declarations for all 'hardcoded' modules. This is a hack, 
  @@ -109,6 +109,7 @@
 env-registerFactory( env, workerEnv, jk2_workerEnv_factory );
 env-registerFactory( env, uriMap, jk2_uriMap_factory );
 env-registerFactory( env, uriEnv, jk2_uriEnv_factory );
  +  env-registerFactory( env, endpoint, jk2_endpoint_factory );
 env-registerFactory( env, uri, jk2_uriEnv_factory );
 env-registerFactory( env, config, jk2_config_factory );
 
  
  
  
  1.10  +5 -1  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.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- jk_registry.h 18 Mar 2002 18:39:05 -  1.9
  +++ jk_registry.h 23 Mar 2002 17:25:11 -  1.10
  @@ -62,7 +62,7 @@
   
   /***
* Description: Worker list*
  - * Version: $Revision: 1.9 $   *
  + * Version: $Revision: 1.10 $   *
***/
   
   /** Static declarations for all 'hardcoded' modules. This is a hack, 
  @@ -107,6 +107,10 @@
   const char *type, const char *name);
   
   int JK_METHOD jk2_worker_run_factory(jk_env_t *env, jk_pool_t *pool,
  + jk_bean_t *result,
  + const char *type, const char *name);
  +
  +int JK_METHOD jk2_endpoint_factory(jk_env_t *env, jk_pool_t *pool,
jk_bean_t *result,
const char *type, const char *name);
   
  
  
  
  1.4   +2 -1  jakarta-tomcat-connectors/jk/native2/common/jk_uriEnv.c
  
  Index: jk_uriEnv.c
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_uriEnv.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- jk_uriEnv.c   20 Mar 2002 23:44:37 -  1.3
  +++ jk_uriEnv.c   23 Mar 2002 17:25:11 -  1.4
  @@ -84,7 +84,8 @@
   }
   
   /* Cut the uri. prefix, if any */
  -if( strncmp( name, uri., 4 ) == 0 ) {
  +if( (strncmp( name, uri., 4 ) == 0 )||
  +(strncmp( name, uri:, 4 ) == 0 )) {
   n=name+4;
   }
   /* Cut the  */
  
  
  

--
To unsubscribe, e-mail:   mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]

cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_registry.c jk_registry.h

2002-03-18 Thread costin 

costin  02/03/18 10:39:05

  Modified:jk/native2/common jk_registry.c jk_registry.h
  Log:
  Update method signatures
  
  Revision  ChangesPath
  1.14  +26 -18jakarta-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.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- jk_registry.c 2 Mar 2002 06:13:42 -   1.13
  +++ jk_registry.c 18 Mar 2002 18:39:05 -  1.14
  @@ -63,7 +63,7 @@
   #include jk_registry.h
   /***
* Description: Worker list*
  - * Version: $Revision: 1.13 $   *
  + * Version: $Revision: 1.14 $   *
***/
   
   /** Static declarations for all 'hardcoded' modules. This is a hack, 
  @@ -105,34 +105,42 @@
  * and because the MetroWerks compiler (used for NetWare) treats this as an
  * error, I'm casting the function pointers to (void *) - mmanders
  */
  -  env-registerFactory( env, logger, file,   jk2_logger_file_factory );
  -  env-registerFactory( env, workerEnv, default, jk2_workerEnv_factory );
  -  env-registerFactory( env, uriMap, default,jk2_uriMap_factory );
  -  env-registerFactory( env, worker, ajp13, jk2_worker_ajp14_factory );
  -  env-registerFactory( env, worker, ajp14, jk2_worker_ajp14_factory );
  -  env-registerFactory( env, worker, lb,jk2_worker_lb_factory );
  -  env-registerFactory( env, worker, status, jk2_worker_status_factory );
  -  env-registerFactory( env, worker, run, jk2_worker_run_factory );
  +  env-registerFactory( env, logger.file,   jk2_logger_file_factory );
  +  env-registerFactory( env, workerEnv, jk2_workerEnv_factory );
  +  env-registerFactory( env, uriMap, jk2_uriMap_factory );
  +  env-registerFactory( env, uriEnv, jk2_uriEnv_factory );
  +  env-registerFactory( env, uri, jk2_uriEnv_factory );
  +  env-registerFactory( env, config, jk2_config_factory );
  +  
  +  env-registerFactory( env, ajp13, jk2_worker_ajp14_factory );
  +  env-registerFactory( env, worker.ajp13, jk2_worker_ajp14_factory );
  +  env-registerFactory( env, ajp14, jk2_worker_ajp14_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 HAS_APR
  -  env-registerFactory( env, channel, apr,
  +  env-registerFactory( env, channel.apr,
   jk2_channel_apr_socket_factory );
   #endif
  -  env-registerFactory( env, channel, socket, jk2_channel_socket_factory );
  +  env-registerFactory( env, channel.socket, jk2_channel_socket_factory );
  +
 
  -  env-registerFactory( env, handler, response,
  +  env-registerFactory( env, handler.response,
   jk2_handler_response_factory );
  -  env-registerFactory( env, handler, logon,   jk2_handler_logon_factory );
  -  env-registerFactory( env, handler, discovery,
  -jk2_handler_discovery_factory );
  +  env-registerFactory( env, handler.logon,   jk2_handler_logon_factory );
 
 /* Optional objects */
   
   #ifdef HAVE_JNI
  -  env-registerFactory( env, worker, jni,   jk2_worker_jni_factory );
  -  env-registerFactory( env, channel,jni,   jk2_channel_jni_factory );
  +  env-registerFactory( env, channel.jni,   jk2_channel_jni_factory );
   #endif
   #ifdef AJP12
  -  env-registerFactory( env, worker, ajp12, jk2_worker_ajp12_factory );
  +  env-registerFactory( env, ajp12, jk2_worker_ajp12_factory );
  +  env-registerFactory( env, worker.ajp12, jk2_worker_ajp12_factory );
   #endif
   
   
  
  
  
  1.9   +20 -24jakarta-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.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- jk_registry.h 1 Mar 2002 00:45:58 -   1.8
  +++ jk_registry.h 18 Mar 2002 18:39:05 -  1.9
  @@ -62,7 +62,7 @@
   
   /***
* Description: Worker list*
  - * Version: $Revision: 1.8 $   *
  + * Version: $Revision: 1.9 $

cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_registry.c jk_worker_jni.c jk_worker_run.c jk_worker_status.c

2002-03-01 Thread costin 

costin  02/03/01 22:13:42

  Modified:jk/native2/common jk_registry.c jk_worker_jni.c
jk_worker_run.c jk_worker_status.c
  Log:
  More updates for setProperty()
  
  Revision  ChangesPath
  1.13  +2 -2  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.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- jk_registry.c 21 Feb 2002 11:12:11 -  1.12
  +++ jk_registry.c 2 Mar 2002 06:13:42 -   1.13
  @@ -63,7 +63,7 @@
   #include jk_registry.h
   /***
* Description: Worker list*
  - * Version: $Revision: 1.12 $   *
  + * Version: $Revision: 1.13 $   *
***/
   
   /** Static declarations for all 'hardcoded' modules. This is a hack, 
  @@ -124,7 +124,7 @@
 env-registerFactory( env, handler, logon,   jk2_handler_logon_factory );
 env-registerFactory( env, handler, discovery,
   jk2_handler_discovery_factory );
  -
  +  
 /* Optional objects */
   
   #ifdef HAVE_JNI
  
  
  
  1.4   +45 -40jakarta-tomcat-connectors/jk/native2/common/jk_worker_jni.c
  
  Index: jk_worker_jni.c
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_worker_jni.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- jk_worker_jni.c   21 Feb 2002 11:13:59 -  1.3
  +++ jk_worker_jni.c   2 Mar 2002 06:13:42 -   1.4
  @@ -123,12 +123,11 @@
   }
   
   
  -static int JK_METHOD jk2_jni_worker_validate(jk_env_t *env, jk_worker_t *pThis,
  - jk_map_t *props, jk_workerEnv_t *we)
  +static int JK_METHOD jk2_jni_worker_setProperty(jk_env_t *env, jk_worker_t *pThis,
  +char *name, char *value)
   {
   jni_worker_data_t *jniWorker;
   int mem_config = 0;
  -char *str_config = NULL;
   int rc;
   JNIEnv *jniEnv;
   char *prefix;
  @@ -141,31 +140,56 @@
   
   jniWorker = pThis-worker_private;
   
  -prefix=(char *)props-pool-alloc( env, props-pool,
  -   strlen( pThis-name ) + 10 );
  -strcpy( prefix, worker. );
  -strcat( prefix, pThis-name );
  -fprintf(stderr, Prefix= %s\n, prefix );
  +
  +return JK_TRUE;
  +}
  +
  +static int JK_METHOD jk2_jni_worker_init(jk_env_t *env, jk_worker_t *_this)
  +{
  +jni_worker_data_t *jniWorker;
  +JNIEnv *jniEnv;
  +jstring cmd_line = NULL;
  +jstring stdout_name = NULL;
  +jstring stderr_name = NULL;
  +jint rc = 0;
  +char *str_config = NULL;
  +jk_map_t *props=_this-workerEnv-initData;
   
  -rc=jniWorker-vm-init(env, jniWorker-vm, props, prefix );
  -if( rc!=JK_TRUE ) {
  -env-l-jkLog(env, env-l, JK_LOG_ERROR,
  -  jni.validate() failed to load vm init params\n);
  +if(! _this || ! _this-worker_private) {
  +env-l-jkLog(env, env-l, JK_LOG_EMERG,
  +  In init, assert failed - invalid parameters\n);
   return JK_FALSE;
   }
  +
  +jniWorker = _this-worker_private;
  +{
  +char *prefix=(char *)_this-pool-alloc( env, _this-pool,
  + strlen( _this-name ) + 10 );
  +strcpy( prefix, worker. );
  +strcat( prefix, _this-name );
  +fprintf(stderr, Prefix= %s\n, prefix );
  +
  +rc=jniWorker-vm-init(env, jniWorker-vm, _this-workerEnv-initData, 
prefix );
  +
  +if( rc!=JK_TRUE ) {
  +env-l-jkLog(env, env-l, JK_LOG_ERROR,
  +  jni.validate() failed to load vm init params\n);
  +return JK_FALSE;
  +}
  +}
   
   jniWorker-className = jk2_map_getStrProp( env, props, worker,
  -  pThis-name,
  -  class, JAVA_BRIDGE_CLASS_NAME);
  -
  +   _this-name,
  +   class, JAVA_BRIDGE_CLASS_NAME);
  +
   jniWorker-tomcat_cmd_line = jk2_map_getStrProp( env, props, worker,
  -pThis-name,
  +_this-name,
   cmd_line, NULL ); 
   
   jniWorker-stdout_name= jk2_map_getStrProp( env, props, worker,

cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_registry.c jk_registry.h

2002-01-11 Thread costin 

costin  02/01/11 21:09:50

  Modified:jk/native2/common jk_registry.c jk_registry.h
  Log:
  Added the new entries.
  
  Revision  ChangesPath
  1.9   +9 -5  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.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- jk_registry.c 31 Dec 2001 22:25:03 -  1.8
  +++ jk_registry.c 12 Jan 2002 05:09:50 -  1.9
  @@ -63,7 +63,7 @@
   #include jk_registry.h
   /***
* Description: Worker list*
  - * Version: $Revision: 1.8 $   *
  + * Version: $Revision: 1.9 $   *
***/
   
   /** Static declarations for all 'hardcoded' modules. This is a hack, 
  @@ -112,12 +112,15 @@
 env-registerFactory( env, worker, ajp14, jk_worker_ajp14_factory );
 env-registerFactory( env, worker, lb,jk_worker_lb_factory );
 env-registerFactory( env, worker, status, jk_worker_status_factory );
  +  env-registerFactory( env, worker, run, jk_worker_run_factory );
   #ifdef HAS_APR
  -  env-registerFactory( env, channel, socket, jk_channel_apr_socket_factory );
  -#else
  -  env-registerFactory( env, channel, socket, jk_channel_socket_factory );
  +  env-registerFactory( env, channel, apr,
  +jk_channel_apr_socket_factory );
   #endif
  -  env-registerFactory( env, handler, response, jk_handler_response_factory );
  +  env-registerFactory( env, channel, socket, jk_channel_socket_factory );
  +  
  +  env-registerFactory( env, handler, response,
  +jk_handler_response_factory );
 env-registerFactory( env, handler, logon,   jk_handler_logon_factory );
 env-registerFactory( env, handler, discovery,
   jk_handler_discovery_factory );
  @@ -126,6 +129,7 @@
   
   #ifdef HAVE_JNI
 env-registerFactory( env, worker, jni,   jk_worker_jni_factory );
  +  env-registerFactory( env, channel,jni,   jk_channel_jni_factory );
   #endif
   #ifdef AJP12
 env-registerFactory( env, worker, ajp12, jk_worker_ajp12_factory );
  
  
  
  1.4   +5 -1  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.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- jk_registry.h 31 Dec 2001 22:25:03 -  1.3
  +++ jk_registry.h 12 Jan 2002 05:09:50 -  1.4
  @@ -62,7 +62,7 @@
   
   /***
* Description: Worker list*
  - * Version: $Revision: 1.3 $   *
  + * Version: $Revision: 1.4 $   *
***/
   
   /** Static declarations for all 'hardcoded' modules. This is a hack, 
  @@ -99,6 +99,10 @@
   const char *type, const char *name);
   
   int JK_METHOD jk_worker_status_factory(jk_env_t *env, jk_pool_t *pool,
  +   void **result,
  +   const char *type, const char *name);
  +
  +int JK_METHOD jk_worker_run_factory(jk_env_t *env, jk_pool_t *pool,
  void **result,
  const char *type, const char *name);
   
  
  
  

--
To unsubscribe, e-mail:   mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]

cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_registry.c

2001-12-12 Thread costin 

costin  01/12/12 13:55:58

  Modified:jk/native2/common jk_registry.c
  Log:
  Added the new objects.
  
  Revision  ChangesPath
  1.5   +30 -7 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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- jk_registry.c 2001/12/06 23:04:46 1.4
  +++ jk_registry.c 2001/12/12 21:55:57 1.5
  @@ -62,7 +62,7 @@
   
   /***
* Description: Worker list*
  - * Version: $Revision: 1.4 $   *
  + * Version: $Revision: 1.5 $   *
***/
   
   /** Static declarations for all 'hardcoded' modules. This is a hack, 
  @@ -89,32 +89,51 @@
  const char *type, const char *name);
   
  
  -int JK_METHOD jk_worker_lb_factory(jk_env_t *env, jk_pool_t *pool, void **result,
  +int JK_METHOD jk_worker_lb_factory(jk_env_t *env, jk_pool_t *pool,
  +   void **result,
  const char *type, const char *name);
   
   
  -int JK_METHOD jk_worker_jni_factory(jk_env_t *env, jk_pool_t *pool, void **result,
  +int JK_METHOD jk_worker_jni_factory(jk_env_t *env, jk_pool_t *pool,
  +void **result,
   const char *type, const char *name);
   
  -int JK_METHOD jk_worker_ajp12_factory(jk_env_t *env, jk_pool_t *pool, void **result,
  +int JK_METHOD jk_worker_ajp12_factory(jk_env_t *env, jk_pool_t *pool,
  +  void **result,
 const char *type, const char *name);
   
   /* Factories for 'new' types. We use the new factory interface,
*  workers will be updated later 
*/
  -int JK_METHOD jk_channel_socket_factory(jk_env_t *env, jk_pool_t *pool, void 
**result,
  +int JK_METHOD jk_channel_socket_factory(jk_env_t *env, jk_pool_t *pool,
  +void **result,
const char *type, const char *name);
   
  -int JK_METHOD jk_workerEnv_factory(jk_env_t *env, jk_pool_t *pool, void **result,
  +int JK_METHOD jk_workerEnv_factory(jk_env_t *env, jk_pool_t *pool,
  +   void **result,
  const char *type, const char *name);
   
   int JK_METHOD jk_uriMap_factory(jk_env_t *env, jk_pool_t *pool, void **result,
   const char *type, const char *name);
   
  -int JK_METHOD jk_logger_file_factory(jk_env_t *env, jk_pool_t *pool, void **result,
  +int JK_METHOD jk_logger_file_factory(jk_env_t *env, jk_pool_t *pool,
  + void **result,
const char *type, const char *name);
   
   
  +int JK_METHOD jk_handler_logon_factory( jk_env_t *env, jk_pool_t *pool,
  +void **result,
  +const char *type, const char *name);
  +
  +int JK_METHOD jk_handler_discovery_factory( jk_env_t *env, jk_pool_t *pool,
  +void **result,
  +const char *type, const char *name);
  +
  +int JK_METHOD jk_handler_response_factory( jk_env_t *env, jk_pool_t *pool,
  +   void **result,
  +   const char *type, const char *name);
  +
  +
   /**
*   Init the components that we compile in by default. 
*   In future we should have a more flexible mechanism that would allow 
  @@ -142,6 +161,10 @@
 env-registerFactory( env, worker, ajp14, jk_worker_ajp14_factory );
 env-registerFactory( env, worker, lb,jk_worker_lb_factory );
 env-registerFactory( env, channel, socket, jk_channel_socket_factory );
  +  env-registerFactory( env, handler, response, jk_handler_response_factory );
  +  env-registerFactory( env, handler, logon,   jk_handler_logon_factory );
  +  env-registerFactory( env, handler, discovery,
  +jk_handler_discovery_factory );
   
 /* Optional objects */
   
  
  
  

--
To unsubscribe, e-mail:   mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]

cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_registry.c

2001-12-06 Thread costin 

costin  01/12/06 15:04:47

  Modified:jk/native2/common jk_registry.c
  Log:
  Updates.
  
  Revision  ChangesPath
  1.4   +10 -9 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.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- jk_registry.c 2001/12/05 20:48:20 1.3
  +++ jk_registry.c 2001/12/06 23:04:46 1.4
  @@ -62,7 +62,7 @@
   
   /***
* Description: Worker list*
  - * Version: $Revision: 1.3 $   *
  + * Version: $Revision: 1.4 $   *
***/
   
   /** Static declarations for all 'hardcoded' modules. This is a hack, 
  @@ -84,33 +84,34 @@
*  
*/
   
  -int JK_METHOD jk_worker_ajp14_factory( jk_env_t *env, void **result,
  +int JK_METHOD jk_worker_ajp14_factory( jk_env_t *env, jk_pool_t *pool,
  +   void **result,
  const char *type, const char *name);
   
  
  -int JK_METHOD jk_worker_lb_factory(jk_env_t *env, void **result,
  +int JK_METHOD jk_worker_lb_factory(jk_env_t *env, jk_pool_t *pool, void **result,
  const char *type, const char *name);
   
   
  -int JK_METHOD jk_worker_jni_factory(jk_env_t *env, void **result,
  +int JK_METHOD jk_worker_jni_factory(jk_env_t *env, jk_pool_t *pool, void **result,
   const char *type, const char *name);
   
  -int JK_METHOD jk_worker_ajp12_factory(jk_env_t *env, void **result,
  +int JK_METHOD jk_worker_ajp12_factory(jk_env_t *env, jk_pool_t *pool, void **result,
 const char *type, const char *name);
   
   /* Factories for 'new' types. We use the new factory interface,
*  workers will be updated later 
*/
  -int JK_METHOD jk_channel_socket_factory(jk_env_t *env, void **result,
  +int JK_METHOD jk_channel_socket_factory(jk_env_t *env, jk_pool_t *pool, void 
**result,
const char *type, const char *name);
   
  -int JK_METHOD jk_workerEnv_factory(jk_env_t *env, void **result,
  +int JK_METHOD jk_workerEnv_factory(jk_env_t *env, jk_pool_t *pool, void **result,
  const char *type, const char *name);
   
  -int JK_METHOD jk_uriMap_factory(jk_env_t *env, void **result,
  +int JK_METHOD jk_uriMap_factory(jk_env_t *env, jk_pool_t *pool, void **result,
   const char *type, const char *name);
   
  -int JK_METHOD jk_logger_file_factory(jk_env_t *env, void **result,
  +int JK_METHOD jk_logger_file_factory(jk_env_t *env, jk_pool_t *pool, void **result,
const char *type, const char *name);
   
   
  
  
  

--
To unsubscribe, e-mail:   mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]