costin 02/03/18 10:46:27 Modified: jk/native2/server/apache2 jk_apache2.h jk_logger_apache2.c jk_map_aprtable.c jk_pool_apr.c jk_service_apache2.c mod_jk2.c Log: Update for the new config mechansim and signatures. Revision Changes Path 1.5 +6 -7 jakarta-tomcat-connectors/jk/native2/server/apache2/jk_apache2.h Index: jk_apache2.h =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/jk_apache2.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- jk_apache2.h 21 Feb 2002 11:18:05 -0000 1.4 +++ jk_apache2.h 18 Mar 2002 18:46:27 -0000 1.5 @@ -59,7 +59,7 @@ * Description: Apache 2 plugin for Jakarta/Tomcat * Author: Gal Shachor <[EMAIL PROTECTED]> * Henri Gomez <[EMAIL PROTECTED]> - * Version: $Revision: 1.4 $ + * Version: $Revision: 1.5 $ */ #include "jk_global.h" @@ -73,22 +73,21 @@ #include "jk_requtil.h" -int jk2_service_apache2_factory(jk_env_t *env, jk_pool_t *pool, - void **result, char *type, char *name); +int jk2_service_apache2_init(jk_env_t *env, jk_ws_service_t *s); int jk2_logger_apache2_factory(jk_env_t *env, jk_pool_t *pool, - void **result, char *type, char *name); + jk_bean_t *result, char *type, char *name); int jk2_pool_apr_factory(jk_env_t *env, jk_pool_t *pool, - void **result, char *type, char *name); + jk_bean_t *result, char *type, char *name); int jk2_map_aprtable_factory(jk_env_t *env, jk_pool_t *pool, - void **result, + jk_bean_t *result, char *type, char *name); /* Temp. - we should use the factory ( we may need few changes ) */ int jk2_pool_apr_create( jk_env_t *env, jk_pool_t **newPool, jk_pool_t *parent, - apr_pool_t *aprPool); + apr_pool_t *aprPool); 1.14 +6 -13 jakarta-tomcat-connectors/jk/native2/server/apache2/jk_logger_apache2.c Index: jk_logger_apache2.c =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/jk_logger_apache2.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- jk_logger_apache2.c 21 Feb 2002 11:18:05 -0000 1.13 +++ jk_logger_apache2.c 18 Mar 2002 18:46:27 -0000 1.14 @@ -87,10 +87,6 @@ #define HUGE_BUFFER_SIZE (8*1024) -int JK_METHOD jk2_logger_apache2_factory(jk_env_t *env, jk_pool_t *pool, - void **result, - char *type, char *name); - static int jk2_logger_apache2_log(jk_env_t *env, jk_logger_t *l, int level, @@ -100,8 +96,7 @@ } -static int jk2_logger_apache2_open(jk_env_t *env, jk_logger_t *_this, - jk_map_t *properties ) +static int jk2_logger_apache2_init(jk_env_t *env, jk_logger_t *_this) { return JK_TRUE; } @@ -168,11 +163,8 @@ } -int jk2_logger_apache2_factory(jk_env_t *env, - jk_pool_t *pool, - void **result, - char *type, - char *name) +int jk2_logger_apache2_factory(jk_env_t *env, jk_pool_t *pool, jk_bean_t *result, + char *type, char *name) { jk_logger_t *l = (jk_logger_t *)pool->calloc(env, pool, sizeof(jk_logger_t)); @@ -183,12 +175,13 @@ l->log = jk2_logger_apache2_log; l->logger_private = NULL; - l->open =jk2_logger_apache2_open; + l->init =jk2_logger_apache2_init; l->jkLog = jk2_logger_apache2_jkLog; l->level=JK_LOG_ERROR_LEVEL; - *result=(void *)l; + result->object=(void *)l; + l->mbean=result; return JK_TRUE; } 1.7 +3 -3 jakarta-tomcat-connectors/jk/native2/server/apache2/jk_map_aprtable.c Index: jk_map_aprtable.c =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/jk_map_aprtable.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- jk_map_aprtable.c 21 Feb 2002 11:18:05 -0000 1.6 +++ jk_map_aprtable.c 18 Mar 2002 18:46:27 -0000 1.7 @@ -149,12 +149,12 @@ /* Not used yet */ int jk2_map_aprtable_factory(jk_env_t *env, jk_pool_t *pool, - void **result, - char *type, char *name) + jk_bean_t *result, + char *type, char *name) { jk_map_t *_this=(jk_map_t *)pool->calloc( env, pool, sizeof(jk_map_t)); - *result=_this; + result->object=_this; _this->get=jk2_map_aprtable_get; _this->put=jk2_map_aprtable_put; 1.10 +3 -9 jakarta-tomcat-connectors/jk/native2/server/apache2/jk_pool_apr.c Index: jk_pool_apr.c =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/jk_pool_apr.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- jk_pool_apr.c 21 Feb 2002 11:18:05 -0000 1.9 +++ jk_pool_apr.c 18 Mar 2002 18:46:27 -0000 1.10 @@ -80,12 +80,6 @@ int jk2_pool_apr_create( jk_env_t *env, jk_pool_t **newPool, jk_pool_t *parent, apr_pool_t *aprPool ); - -int JK_METHOD jk2_pool_apr_factory(jk_env_t *env, - jk_pool_t *pool, - void **result, - char *type, char *name); - /** Nothing - apache will take care ?? */ static void jk2_pool_apr_close(jk_env_t *env, jk_pool_t *p) @@ -205,12 +199,12 @@ /* Not used yet */ int jk2_pool_apr_factory(jk_env_t *env, jk_pool_t *pool, - void **result, - char *type, char *name) + jk_bean_t *result, + char *type, char *name) { jk_pool_t *_this=(jk_pool_t *)calloc( 1, sizeof(jk_pool_t)); - *result=_this; + result->object=_this; return JK_TRUE; } 1.12 +2 -13 jakarta-tomcat-connectors/jk/native2/server/apache2/jk_service_apache2.c Index: jk_service_apache2.c =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/jk_service_apache2.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- jk_service_apache2.c 2 Mar 2002 06:35:41 -0000 1.11 +++ jk_service_apache2.c 18 Mar 2002 18:46:27 -0000 1.12 @@ -59,7 +59,7 @@ * Description: Apache 2 plugin for Jakarta/Tomcat * Author: Gal Shachor <[EMAIL PROTECTED]> * Henri Gomez <[EMAIL PROTECTED]> - * Version: $Revision: 1.11 $ + * Version: $Revision: 1.12 $ */ #include "apu_compat.h" @@ -552,17 +552,8 @@ } } -int jk2_service_apache2_factory(jk_env_t *env, - jk_pool_t *pool, - void **result, - char *type, - char *name) +int jk2_service_apache2_init(jk_env_t *env, jk_ws_service_t *s) { - jk_ws_service_t *s = *result; - if( s==NULL ) { - s=(jk_ws_service_t *)pool->calloc(env, pool, sizeof(jk_ws_service_t)); - } - if(s==NULL ) { return JK_FALSE; } @@ -573,7 +564,5 @@ s->init = jk2_init_ws_service; s->afterRequest = jk2_service_apache2_afterRequest; - *result=(void *)s; - return JK_TRUE; } 1.4 +21 -20 jakarta-tomcat-connectors/jk/native2/server/apache2/mod_jk2.c Index: mod_jk2.c =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/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:46:27 -0000 1.4 @@ -59,7 +59,7 @@ * Description: Apache 2 plugin for Jakarta/Tomcat * * Author: Gal Shachor <[EMAIL PROTECTED]> * * Henri Gomez <[EMAIL PROTECTED]> * - * Version: $Revision: 1.3 $ * + * Version: $Revision: 1.4 $ * ***************************************************************************/ /* @@ -152,7 +152,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, @@ -161,7 +161,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 ); } @@ -198,7 +198,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 ); fprintf(stderr, "JkUriSet %s %s dir=%s args=%s\n", uriEnv->workerName, cmd->path, @@ -258,11 +258,14 @@ static void *jk2_create_dir_config(apr_pool_t *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; } @@ -306,21 +309,21 @@ env=jk2_env_getEnv( NULL, globalPool ); /* Optional. Register more factories ( or replace existing ones ) */ - /* Init the environment. */ /* Create the logger */ #ifdef NO_APACHE_LOGGER - l = env->getInstance( env, env->globalPool, "logger", "file"); + l = env->createInstance( env, env->globalPool, "logger.file", "logger"); #else - jk2_logger_apache2_factory( env, env->globalPool, (void *)&l, "logger", "file"); + env->registerFactory( env, "logger.apache2", jk2_logger_apache2_factory ); + l = env->createInstance( env, env->globalPool, "logger.apache2", "logger"); l->logger_private=s; #endif 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"); @@ -529,7 +532,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, @@ -537,8 +540,7 @@ worker, uriEnv->webapp ); 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 ); @@ -568,16 +570,15 @@ } /* XXX we should reuse the request itself !!! */ - jk2_service_apache2_factory( env, rPool, (void *)&s, - "service", "apache2"); + jk2_service_apache2_init( env, s ); s->pool = rPool; s->is_recoverable_error = JK_FALSE; 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]>