costin 02/03/18 10:39:05
Modified: jk/native2/common jk_registry.c jk_registry.h
Log:
Update method signatures
Revision Changes Path
1.14 +26 -18 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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- jk_registry.c 2 Mar 2002 06:13:42 -0000 1.13
+++ jk_registry.c 18 Mar 2002 18:39:05 -0000 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 -24 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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- jk_registry.h 1 Mar 2002 00:45:58 -0000 1.8
+++ jk_registry.h 18 Mar 2002 18:39:05 -0000 1.9
@@ -62,7 +62,7 @@
/***************************************************************************
* Description: Worker list *
- * Version: $Revision: 1.8 $ *
+ * Version: $Revision: 1.9 $ *
***************************************************************************/
/** Static declarations for all 'hardcoded' modules. This is a hack,
@@ -85,33 +85,33 @@
*/
int JK_METHOD jk2_worker_ajp14_factory(jk_env_t *env, jk_pool_t *pool,
- void **result,
+ jk_bean_t *result,
const char *type, const char *name);
int JK_METHOD jk2_worker_lb_factory(jk_env_t *env, jk_pool_t *pool,
- void **result,
+ jk_bean_t *result,
const char *type, const char *name);
int JK_METHOD jk2_worker_jni_factory(jk_env_t *env, jk_pool_t *pool,
- void **result,
+ jk_bean_t *result,
const char *type, const char *name);
int JK_METHOD jk2_channel_jni_factory(jk_env_t *env, jk_pool_t *pool,
- void **result,
+ jk_bean_t *result,
const char *type, const char *name);
int JK_METHOD jk2_worker_status_factory(jk_env_t *env, jk_pool_t *pool,
- void **result,
+ jk_bean_t *result,
const char *type, const char *name);
int JK_METHOD jk2_worker_run_factory(jk_env_t *env, jk_pool_t *pool,
- void **result,
+ jk_bean_t *result,
const char *type, const char *name);
int JK_METHOD jk2_worker_ajp12_factory(jk_env_t *env, jk_pool_t *pool,
- void **result,
+ jk_bean_t *result,
const char *type, const char *name);
/* Factories for 'new' types. We use the new factory interface,
@@ -119,45 +119,41 @@
*/
#ifdef HAS_APR
int JK_METHOD jk2_channel_apr_socket_factory(jk_env_t *env, jk_pool_t *pool,
- void **result,
+ 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,
- void **result,
+ jk_bean_t *result,
const char *type, const char *name);
int JK_METHOD jk2_channel_socket_factory(jk_env_t *env, jk_pool_t *pool,
- void **result,
+ jk_bean_t *result,
const char *type, const
char *name);
int JK_METHOD jk2_workerEnv_factory(jk_env_t *env, jk_pool_t *pool,
- void **result,
+ jk_bean_t *result,
const char *type, const char *name);
-int JK_METHOD jk2_uriMap_factory(jk_env_t *env, jk_pool_t *pool, void **result,
- const char *type, const char *name);
-
int JK_METHOD jk2_logger_file_factory(jk_env_t *env, jk_pool_t *pool,
- void **result,
+ jk_bean_t *result,
const char *type, const char *name);
int JK_METHOD jk2_handler_logon_factory(jk_env_t *env, jk_pool_t *pool,
- void **result,
+ jk_bean_t *result,
const char *type, const char *name);
-int JK_METHOD jk2_handler_discovery_factory(jk_env_t *env, jk_pool_t *pool,
- void **result,
- const char *type, const char *name);
-
int JK_METHOD jk2_handler_response_factory(jk_env_t *env, jk_pool_t *pool,
- void **result,
+ jk_bean_t *result,
const char *type, const char *name);
-int JK_METHOD jk2_uriMap_factory(jk_env_t *env, jk_pool_t *pool, void **result,
+int JK_METHOD jk2_uriMap_factory(jk_env_t *env, jk_pool_t *pool, jk_bean_t *result,
+ const char *type, const char *name);
+
+int JK_METHOD jk2_uriEnv_factory(jk_env_t *env, jk_pool_t *pool, jk_bean_t *result,
const char *type, const char *name);
-int JK_METHOD jk2_uriEnv_factory(jk_env_t *env, jk_pool_t *pool, void **result,
+int JK_METHOD jk2_config_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]>
