costin 02/04/29 23:42:35
Modified: jk/native2/include jk_uriMap.h
Log:
Changed the struct - now uriMap only has a table with the vhosts and
the default vhost - the uriEnv representing each host will have a table
of contexts, etc.
We use the jk_map object instead of char[][].
Probably a bit less efficient but cleaner.
Revision Changes Path
1.12 +6 -10 jakarta-tomcat-connectors/jk/native2/include/jk_uriMap.h
Index: jk_uriMap.h
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/include/jk_uriMap.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- jk_uriMap.h 29 Apr 2002 19:14:25 -0000 1.11
+++ jk_uriMap.h 30 Apr 2002 06:42:35 -0000 1.12
@@ -99,10 +99,9 @@
struct jk_uriMap {
struct jk_bean *mbean;
- /* map URI->WORKER */
- struct jk_uriEnv **maps;
- int size;
- int capacity;
+ /* All mappings */
+ struct jk_map *maps;
+
struct jk_workerEnv *workerEnv;
int debug;
@@ -111,11 +110,8 @@
* level.
*/
struct jk_map *vhosts;
-
- /** Managed webapps. Key is VHOST/CONTEXT, value is the
- * uriEnv that corresponds to the top level of the webapp.
- */
- struct jk_map *webapps;
+ struct jk_uriEnv *defaultVhost;
+
/* ---------- Methods ---------- */
/** Initialize the map. This should be called after all workers
@@ -124,7 +120,7 @@
int (*init)( struct jk_env *env, jk_uriMap_t *_this);
void (*destroy)( struct jk_env *env, jk_uriMap_t *_this );
-
+
int (*addUriEnv)(struct jk_env *env,
struct jk_uriMap *uriMap,
struct jk_uriEnv *uriEnv);
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
