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 Changes Path
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 -0000 1.14
+++ jk_registry.c 23 Mar 2002 17:25:11 -0000 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 -0000 1.9
+++ jk_registry.h 23 Mar 2002 17:25:11 -0000 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 -0000 1.3
+++ jk_uriEnv.c 23 Mar 2002 17:25:11 -0000 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]>
