costin 02/01/11 21:09:50
Modified: jk/native2/common jk_registry.c jk_registry.h
Log:
Added the new entries.
Revision Changes Path
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 -0000 1.8
+++ jk_registry.c 12 Jan 2002 05:09:50 -0000 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 -0000 1.3
+++ jk_registry.h 12 Jan 2002 05:09:50 -0000 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]>
