costin 02/03/18 10:47:18
Modified: jk/native2/server/apache13 mod_jk2.c
Log:
Update for the new config and signatures.
It's still dumping core, but I fixed few more bugs, it's
getting close.
Revision Changes Path
1.4 +17 -15 jakarta-tomcat-connectors/jk/native2/server/apache13/mod_jk2.c
Index: mod_jk2.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache13/mod_jk2.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mod_jk2.c 1 Mar 2002 00:45:58 -0000 1.3
+++ mod_jk2.c 18 Mar 2002 18:47:18 -0000 1.4
@@ -59,7 +59,7 @@
* Description: Apache 1.3 plugin for Jakarta/Tomcat *
* Author: Gal Shachor <[EMAIL PROTECTED]> *
* Henri Gomez <[EMAIL PROTECTED]> *
- * Version: $Revision: 1.3 $ *
+ * Version: $Revision: 1.4 $ *
***************************************************************************/
/*
@@ -122,7 +122,7 @@
if( type==NULL || type[0]=='\0') {
/* Generic Jk2Set foo bar */
- workerEnv->setProperty( env, workerEnv, name, value );
+ workerEnv->config->setPropertyString( env, workerEnv->config, name, value );
} else if( strcmp(type, "env")==0) {
workerEnv->envvars_in_use = JK_TRUE;
workerEnv->envvars->put(env, workerEnv->envvars,
@@ -131,7 +131,7 @@
NULL);
} else if( strcmp(type, "mount")==0) {
if (name[0] !='/') return "Context must start with /";
- workerEnv->setProperty( env, workerEnv, name, value );
+ workerEnv->mbean->setAttribute( env, workerEnv->mbean, name, value );
} else {
fprintf( stderr, "set2 error %s %s %s ", type, name, value );
}
@@ -168,7 +168,7 @@
{
jk_uriEnv_t *uriEnv=(jk_uriEnv_t *)per_dir;
- uriEnv->setProperty( workerEnv->globalEnv, uriEnv, name, val );
+ uriEnv->mbean->setAttribute( workerEnv->globalEnv, uriEnv->mbean, name, val );
return NULL;
}
@@ -190,11 +190,14 @@
static void *jk2_create_dir_config(ap_pool *p, char *path)
{
- jk_uriEnv_t *new =
- workerEnv->uriMap->createUriEnv( workerEnv->globalEnv,
- workerEnv->uriMap, NULL, path );
-
- return new;
+ /* We don't know the vhost yet - so path is not
+ * unique. We'll have to generate a unique name
+ */
+ jk_uriEnv_t *newUri = workerEnv->globalEnv->createInstance(
workerEnv->globalEnv,
+ workerEnv->pool,
+ "uri", path );
+ newUri->mbean->setAttribute( workerEnv->globalEnv, newUri->mbean, "path", path
);
+ return newUri;
}
static void *jk2_merge_dir_config(ap_pool *p, void *basev, void *addv)
@@ -231,12 +234,12 @@
/* Init the environment. */
/* Create the logger */
- l = env->getInstance( env, env->globalPool, "logger", "file");
+ l = env->createInstance( env, env->globalPool, "logger.file", "logger");
env->l=l;
/* Create the workerEnv */
- workerEnv= env->getInstance( env, env->globalPool,"workerEnv", "default");
+ workerEnv= env->createInstance( env, env->globalPool,"workerEnv", "workerEnv");
if( workerEnv==NULL ) {
env->l->jkLog(env, env->l, JK_LOG_ERROR, "Error creating workerEnv\n");
@@ -417,7 +420,7 @@
worker = workerEnv->defaultWorker;
env->l->jkLog(env, env->l, JK_LOG_INFO,
"mod_jk.handler() Default worker for %s %s\n",
- r->uri, worker->name);
+ r->uri, worker->mbean->name);
} else {
worker=uriEnv->worker;
env->l->jkLog(env, env->l, JK_LOG_INFO,
@@ -425,8 +428,7 @@
worker, uriEnv );
if( worker==NULL && uriEnv->workerName != NULL ) {
- worker=workerEnv->getWorkerForName( env, workerEnv,
- uriEnv->workerName);
+ worker=env->getByName( env,uriEnv->workerName);
env->l->jkLog(env, env->l, JK_LOG_INFO,
"mod_jk.handler() finding worker for %p %p\n",
worker, uriEnv );
@@ -465,7 +467,7 @@
s->init( env, s, worker, r );
env->l->jkLog(env, env->l, JK_LOG_INFO,
- "modjk.handler() Calling %s\n", worker->name);
+ "modjk.handler() Calling %s\n", worker->mbean->name);
rc = worker->service(env, worker, s);
s->afterRequest(env, s);
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
