hgomez 02/02/21 03:10:12
Modified: jk/native2/common jk_env.c jk_handler_discovery.c
jk_handler_logon.c jk_handler_response.c
Log:
Second batch of jk2 renaming
Revision Changes Path
1.10 +17 -17 jakarta-tomcat-connectors/jk/native2/common/jk_env.c
Index: jk_env.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_env.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- jk_env.c 6 Feb 2002 19:20:41 -0000 1.9
+++ jk_env.c 21 Feb 2002 11:10:12 -0000 1.10
@@ -62,37 +62,37 @@
/* Private methods
*/
-static void jk_env_initEnv( jk_env_t *env, char *id );
+static void jk2_env_initEnv( jk_env_t *env, char *id );
/* XXX We should have one env per thread to avoid sync problems.
The env will provide access to pools, etc
*/
-jk_env_t* JK_METHOD jk_env_getEnv( char *id, jk_pool_t *pool ) {
+jk_env_t* JK_METHOD jk2_env_getEnv( char *id, jk_pool_t *pool ) {
if( jk_env_globalEnv == NULL ) {
jk_env_globalEnv=(jk_env_t *)pool->calloc( NULL, pool, sizeof( jk_env_t ));
jk_env_globalEnv->globalPool = pool;
- jk_env_initEnv( (jk_env_t *)jk_env_globalEnv, id );
+ jk2_env_initEnv( (jk_env_t *)jk_env_globalEnv, id );
}
return jk_env_globalEnv;
}
/* ==================== Implementation ==================== */
-static jk_env_t * JK_METHOD jk_env_get( jk_env_t *env )
+static jk_env_t * JK_METHOD jk2_env_get( jk_env_t *env )
{
return NULL;
}
-static int JK_METHOD jk_env_put( jk_env_t *parent, jk_env_t *chld )
+static int JK_METHOD jk2_env_put( jk_env_t *parent, jk_env_t *chld )
{
return JK_TRUE;
}
-static jk_env_objectFactory_t JK_METHOD jk_env_getFactory(jk_env_t *env,
- const char *type,
- const char *name )
+static jk_env_objectFactory_t JK_METHOD jk2_env_getFactory(jk_env_t *env,
+ const char *type,
+ const char *name)
{
jk_env_objectFactory_t result;
/* malloc/free: this is really temporary, and is executed only at setup
@@ -117,8 +117,8 @@
return result;
}
-static void *jk_env_getInstance( jk_env_t *_this, jk_pool_t *pool,
- const char *type, const char *name )
+static void *jk2_env_getInstance(jk_env_t *_this, jk_pool_t *pool,
+ const char *type, const char *name)
{
jk_env_objectFactory_t fac;
void *result;
@@ -147,7 +147,7 @@
}
-static void JK_METHOD jk_env_registerFactory(jk_env_t *env,
+static void JK_METHOD jk2_env_registerFactory(jk_env_t *env,
const char *type,
const char *name,
jk_env_objectFactory_t fact)
@@ -165,14 +165,14 @@
env->_registry->put( env, env->_registry, typeName, fact, &old );
}
-static void jk_env_initEnv( jk_env_t *env, char *id ) {
+static void jk2_env_initEnv( jk_env_t *env, char *id ) {
/* env->logger=NULL; */
/* map_alloc( & env->properties ); */
- env->getFactory= jk_env_getFactory;
- env->registerFactory= jk_env_registerFactory;
- env->getInstance= jk_env_getInstance;
- jk_map_default_create( env, & env->_registry, env->globalPool );
- jk_registry_init(env);
+ env->getFactory= jk2_env_getFactory;
+ env->registerFactory= jk2_env_registerFactory;
+ env->getInstance= jk2_env_getInstance;
+ jk2_map_default_create( env, & env->_registry, env->globalPool );
+ jk2_registry_init(env);
}
1.11 +8 -8
jakarta-tomcat-connectors/jk/native2/common/jk_handler_discovery.c
Index: jk_handler_discovery.c
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_handler_discovery.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- jk_handler_discovery.c 16 Dec 2001 23:18:11 -0000 1.10
+++ jk_handler_discovery.c 21 Feb 2002 11:10:12 -0000 1.11
@@ -58,7 +58,7 @@
/**
* Description: AJP14 Discovery handler
* Author: Henri Gomez <[EMAIL PROTECTED]>
- * Version: $Revision: 1.10 $
+ * Version: $Revision: 1.11 $
*/
#include "jk_global.h"
@@ -72,7 +72,7 @@
#include "jk_workerEnv.h"
#include "jk_registry.h"
-int JK_METHOD jk_handler_discovery_factory( jk_env_t *env, jk_pool_t *pool,
+int JK_METHOD jk2_handler_discovery_factory( jk_env_t *env, jk_pool_t *pool,
void **result,
const char *type, const char *name);
@@ -119,7 +119,7 @@
*CONTEXT NAME (CString (*)) | URL1 [\n] URL2 [\n] URL3 [\n] | NEXT CTX. |
*-------------------+-------------------------------+-----------+
*/
-static int jk_handler_contextList(jk_env_t *env, jk_msg_t *msg,
+static int jk2_handler_contextList(jk_env_t *env, jk_msg_t *msg,
jk_ws_service_t *s,
jk_endpoint_t *ae )
{
@@ -202,7 +202,7 @@
*CONTEXT NAME (CString (*)) | UP/DOWN (1 byte) | .. |
* ------------------------+------------------+----+
*/
-static int jk_handler_contextState(jk_env_t *env, jk_msg_t *msg,
+static int jk2_handler_contextState(jk_env_t *env, jk_msg_t *msg,
jk_ws_service_t *s,
jk_endpoint_t *ae)
{
@@ -239,26 +239,26 @@
}
-int JK_METHOD jk_handler_discovery_factory( jk_env_t *env, jk_pool_t *pool,
+int JK_METHOD jk2_handler_discovery_factory( jk_env_t *env, jk_pool_t *pool,
void **result,
const char *type, const char *name)
{
jk_map_t *map;
jk_handler_t *h;
- jk_map_default_create( env, &map, pool );
+ jk2_map_default_create( env, &map, pool );
*result=map;
h=(jk_handler_t *)pool->calloc( env, pool, sizeof( jk_handler_t));
h->name="contextInfo";
h->messageId=AJP14_CONTEXT_INFO_CMD;
- h->callback=jk_handler_contextList;
+ h->callback=jk2_handler_contextList;
map->put( env, map, h->name, h, NULL );
h=(jk_handler_t *)pool->calloc( env, pool, sizeof( jk_handler_t));
h->name="contextState";
h->messageId=AJP14_CONTEXT_STATE_REP_CMD;
- h->callback=jk_handler_contextState;
+ h->callback=jk2_handler_contextState;
map->put( env, map, h->name, h, NULL );
return JK_TRUE;
1.11 +10 -10 jakarta-tomcat-connectors/jk/native2/common/jk_handler_logon.c
Index: jk_handler_logon.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_handler_logon.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- jk_handler_logon.c 16 Dec 2001 23:18:11 -0000 1.10
+++ jk_handler_logon.c 21 Feb 2002 11:10:12 -0000 1.11
@@ -58,7 +58,7 @@
/**
* Description: AJP14 Login handler
* Author: Henri Gomez <[EMAIL PROTECTED]>
- * Version: $Revision: 1.10 $
+ * Version: $Revision: 1.11 $
*/
#include "jk_global.h"
@@ -119,7 +119,7 @@
* String serverName
*
*/
-static int jk_handler_login(jk_env_t *env, jk_msg_t *msg,
+static int jk2_handler_login(jk_env_t *env, jk_msg_t *msg,
jk_ws_service_t *s, jk_endpoint_t *ae)
{
int rc;
@@ -137,7 +137,7 @@
env->l->jkLog(env, env->l, JK_LOG_INFO,
"handle.logseed() received entropy %s\n", entropy);
- jk_md5((const unsigned char *)entropy,
+ jk2_md5((const unsigned char *)entropy,
(const unsigned char *)secret, computedKey);
env->l->jkLog(env, env->l, JK_LOG_DEBUG,
@@ -182,7 +182,7 @@
* +--------------------+------------------------+---------------------------
*
*/
-static int jk_handler_logok(jk_env_t *env, jk_msg_t *msg,
+static int jk2_handler_logok(jk_env_t *env, jk_msg_t *msg,
jk_ws_service_t *s, jk_endpoint_t *ae )
{
unsigned long nego;
@@ -229,7 +229,7 @@
* +---------------------+-----------------------+
*
*/
-static int jk_handler_lognok(jk_env_t *env, jk_msg_t *msg,
+static int jk2_handler_lognok(jk_env_t *env, jk_msg_t *msg,
jk_ws_service_t *s, jk_endpoint_t *ae )
{
unsigned long status;
@@ -246,32 +246,32 @@
/** Register handlers
*/
-int JK_METHOD jk_handler_logon_factory( jk_env_t *env, jk_pool_t *pool,
+int JK_METHOD jk2_handler_logon_factory( jk_env_t *env, jk_pool_t *pool,
void **result,
const char *type, const char *name)
{
jk_map_t *map;
jk_handler_t *h;
- jk_map_default_create( env, &map, pool );
+ jk2_map_default_create( env, &map, pool );
*result=map;
h=(jk_handler_t *)pool->calloc( env, pool, sizeof( jk_handler_t));
h->name="login";
h->messageId=AJP14_LOGSEED_CMD;
- h->callback=jk_handler_login;
+ h->callback=jk2_handler_login;
map->put( env, map, h->name, h, NULL );
h=(jk_handler_t *)pool->calloc( env, pool, sizeof( jk_handler_t));
h->name="logOk";
h->messageId=AJP14_LOGOK_CMD;
- h->callback=jk_handler_logok;
+ h->callback=jk2_handler_logok;
map->put( env, map, h->name, h, NULL );
h=(jk_handler_t *)pool->calloc( env, pool, sizeof( jk_handler_t));
h->name="logNok";
h->messageId=AJP14_LOGNOK_CMD;
- h->callback=jk_handler_lognok;
+ h->callback=jk2_handler_lognok;
map->put( env, map, h->name, h, NULL );
return JK_TRUE;
1.13 +11 -11
jakarta-tomcat-connectors/jk/native2/common/jk_handler_response.c
Index: jk_handler_response.c
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_handler_response.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- jk_handler_response.c 6 Jan 2002 09:06:02 -0000 1.12
+++ jk_handler_response.c 21 Feb 2002 11:10:12 -0000 1.13
@@ -111,7 +111,7 @@
body length*(var binary)
*/
-static int jk_handler_startResponse(jk_env_t *env, jk_msg_t *msg,
+static int jk2_handler_startResponse(jk_env_t *env, jk_msg_t *msg,
jk_ws_service_t *s, jk_endpoint_t *ae )
{
int err=JK_FALSE;
@@ -140,7 +140,7 @@
msg->getInt(env, msg);
name = name & 0X00FF;
if (name <= SC_RES_HEADERS_NUM) {
- nameS = (char *)jk_requtil_getHeaderById(env, name);
+ nameS = (char *)jk2_requtil_getHeaderById(env, name);
} else {
env->l->jkLog(env, env->l, JK_LOG_ERROR,
"handler.response() Invalid header id (%d)\n",
@@ -197,7 +197,7 @@
/** SEND_BODY_CHUNK handler
*/
-static int jk_handler_sendChunk(jk_env_t *env, jk_msg_t *msg,
+static int jk2_handler_sendChunk(jk_env_t *env, jk_msg_t *msg,
jk_ws_service_t *r, jk_endpoint_t *ae)
{
int err;
@@ -215,7 +215,7 @@
return JK_HANDLER_OK;
}
-static int jk_handler_endResponse(jk_env_t *env, jk_msg_t *msg,
+static int jk2_handler_endResponse(jk_env_t *env, jk_msg_t *msg,
jk_ws_service_t *r,jk_endpoint_t *ae)
{
ae->reuse = (int)msg->getByte(env, msg);
@@ -231,7 +231,7 @@
/** SEND_BODY_CHUNK handler
*/
-static int jk_handler_getChunk(jk_env_t *env, jk_msg_t *msg,
+static int jk2_handler_getChunk(jk_env_t *env, jk_msg_t *msg,
jk_ws_service_t *r, jk_endpoint_t *ae)
{
int len = msg->getInt(env, msg);
@@ -258,38 +258,38 @@
return JK_HANDLER_FATAL;
}
-int JK_METHOD jk_handler_response_factory( jk_env_t *env, jk_pool_t *pool,
+int JK_METHOD jk2_handler_response_factory( jk_env_t *env, jk_pool_t *pool,
void **result,
const char *type, const char *name)
{
jk_map_t *map;
jk_handler_t *h;
- jk_map_default_create( env, &map, pool );
+ jk2_map_default_create( env, &map, pool );
*result=map;
h=(jk_handler_t *)pool->calloc( env, pool, sizeof( jk_handler_t));
h->name="sendHeaders";
h->messageId=JK_AJP13_SEND_HEADERS;
- h->callback=jk_handler_startResponse;
+ h->callback=jk2_handler_startResponse;
map->put( env, map, h->name, h, NULL );
h=(jk_handler_t *)pool->calloc( env, pool, sizeof( jk_handler_t));
h->name="sendChunk";
h->messageId=JK_AJP13_SEND_BODY_CHUNK;
- h->callback=jk_handler_sendChunk;
+ h->callback=jk2_handler_sendChunk;
map->put( env, map, h->name, h, NULL );
h=(jk_handler_t *)pool->calloc( env, pool, sizeof( jk_handler_t));
h->name="endResponse";
h->messageId=JK_AJP13_END_RESPONSE;
- h->callback=jk_handler_endResponse;
+ h->callback=jk2_handler_endResponse;
map->put( env, map, h->name, h, NULL );
h=(jk_handler_t *)pool->calloc( env, pool, sizeof( jk_handler_t));
h->name="getChunk";
h->messageId=JK_AJP13_GET_BODY_CHUNK;
- h->callback=jk_handler_getChunk;
+ h->callback=jk2_handler_getChunk;
map->put( env, map, h->name, h, NULL );
return JK_TRUE;
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
