hgomez 02/02/21 03:15:05
Modified: jk/native2/include jk_env.h jk_global.h jk_map.h jk_md5.h
Log:
Seventh Batch of jk2 renaming
Revision Changes Path
1.6 +4 -4 jakarta-tomcat-connectors/jk/native2/include/jk_env.h
Index: jk_env.h
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/include/jk_env.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- jk_env.h 6 Feb 2002 19:18:21 -0000 1.5
+++ jk_env.h 21 Feb 2002 11:15:04 -0000 1.6
@@ -88,8 +88,8 @@
/**
* Factory used to create all jk objects. Factories are registered with
- * jk_env_registerFactory ( or automatically - LATER ), and created
- * with jk_env_getFactory.
+ * jk2_env_registerFactory ( or automatically - LATER ), and created
+ * with jk2_env_getFactory.
*
* Essentially, an abstract base class (or factory class) with a single
* method -- think of it as createWorker() or the Factory Method Design
@@ -112,7 +112,7 @@
/** Get a pointer to the jk_env. We could support multiple
* env 'instances' in future - for now it's a singleton.
*/
-jk_env_t* JK_METHOD jk_env_getEnv( char *id, struct jk_pool *pool );
+jk_env_t* JK_METHOD jk2_env_getEnv( char *id, struct jk_pool *pool );
#define JK_LINE __FILE__,__LINE__
@@ -216,7 +216,7 @@
struct jk_exception *lastException;
};
-void JK_METHOD jk_registry_init(jk_env_t *env);
+void JK_METHOD jk2_registry_init(jk_env_t *env);
#ifdef __cplusplus
1.4 +4 -4 jakarta-tomcat-connectors/jk/native2/include/jk_global.h
Index: jk_global.h
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/include/jk_global.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- jk_global.h 12 Jan 2002 04:43:04 -0000 1.3
+++ jk_global.h 21 Feb 2002 11:15:04 -0000 1.4
@@ -59,7 +59,7 @@
* Description: Global definitions and include files that should exist *
* anywhere *
* Author: Gal Shachor <[EMAIL PROTECTED]> *
- * Version: $Revision: 1.3 $ *
+ * Version: $Revision: 1.4 $ *
***************************************************************************/
#ifndef JK_GLOBAL_H
@@ -77,10 +77,10 @@
#include <sys/stat.h>
/************** START OF AREA TO MODIFY BEFORE RELEASING *************/
-#define JK_VERMAJOR 1
-#define JK_VERMINOR 2
+#define JK_VERMAJOR 2
+#define JK_VERMINOR 0
#define JK_VERFIX 0
-#define JK_VERSTRING "1.2.0"
+#define JK_VERSTRING "2.0.0"
/* Beta number */
#define JK_VERBETA 1
1.9 +13 -13 jakarta-tomcat-connectors/jk/native2/include/jk_map.h
Index: jk_map.h
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/include/jk_map.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- jk_map.h 12 Jan 2002 04:43:46 -0000 1.8
+++ jk_map.h 21 Feb 2002 11:15:04 -0000 1.9
@@ -58,7 +58,7 @@
/***************************************************************************
* Description: Map object header file *
* Author: Gal Shachor <[EMAIL PROTECTED]> *
- * Version: $Revision: 1.8 $ *
+ * Version: $Revision: 1.9 $ *
***************************************************************************/
#ifndef JK_MAP_H
@@ -118,7 +118,7 @@
void *_private;
};
-int jk_map_default_create(struct jk_env *env, jk_map_t **m,
+int jk2_map_default_create(struct jk_env *env, jk_map_t **m,
struct jk_pool *pool);
/* int map_open(jk_env *env, jk_map_t *m); */
@@ -130,10 +130,10 @@
* on any map.
*/
-char *jk_map_getString(struct jk_env *env, struct jk_map *m,
+char *jk2_map_getString(struct jk_env *env, struct jk_map *m,
const char *name, char *def);
-int jk_map_getBool(struct jk_env *env, struct jk_map *m,
+int jk2_map_getBool(struct jk_env *env, struct jk_map *m,
const char *prop, const char *def);
/** Get a string property, using the worker's style
@@ -141,18 +141,18 @@
will be used.
Example worker.ajp13.host=localhost.
*/
-char *jk_map_getStrProp(struct jk_env *env, jk_map_t *m,
+char *jk2_map_getStrProp(struct jk_env *env, jk_map_t *m,
const char *objType, const char *objName,
const char *pname, char *def);
-int jk_map_getIntProp(struct jk_env *env, jk_map_t *m,
+int jk2_map_getIntProp(struct jk_env *env, jk_map_t *m,
const char *objType, const char *objName,
const char *pname,
int def);
/** Add all the values from src into dst. Use dst's pool
*/
-int jk_map_append(struct jk_env *env, jk_map_t * dst,
+int jk2_map_append(struct jk_env *env, jk_map_t * dst,
jk_map_t * src );
/* ========== Manipulating values ========== */
@@ -164,11 +164,11 @@
* @param pool Pool on which the result will be allocated. Defaults
* to the map's pool XXX Use the env's tmp pool.
*/
-char **jk_map_split(struct jk_env *env, jk_map_t *m,
+char **jk2_map_split(struct jk_env *env, jk_map_t *m,
struct jk_pool *pool, /* XXX will be removed */
const char *listStr, const char *sep,unsigned *list_len );
-int jk_map_str2int(struct jk_env *env, char *value);
+int jk2_map_str2int(struct jk_env *env, char *value);
/* Just atof...
double jk_map_getDouble(jk_env *env, jk_map_t *m, */
@@ -180,14 +180,14 @@
/** Read the properties from the file, doing $(prop) substitution
*/
-int jk_map_readFileProperties(struct jk_env *env, jk_map_t *m,
+int jk2_map_readFileProperties(struct jk_env *env, jk_map_t *m,
const char *f);
/**
* Replace $(property) in value.
*
*/
-char *jk_map_replaceProperties(struct jk_env *env, jk_map_t *m,
+char *jk2_map_replaceProperties(struct jk_env *env, jk_map_t *m,
struct jk_pool *resultPool,
char *value);
@@ -202,7 +202,7 @@
* values or values separated by one of the sep's chars )
*
*/
-char *jk_map_getValuesString(struct jk_env *env, struct jk_map *m,
+char *jk2_map_getValuesString(struct jk_env *env, struct jk_map *m,
struct jk_pool *resultPool,
char *name, char *sep );
@@ -213,7 +213,7 @@
* @param sep Optional separator, it'll be used to split existing values.
* Curently only single-char separators are supported.
*/
-char **jk_map_getValues(struct jk_env *env, struct jk_map *m,
+char **jk2_map_getValues(struct jk_env *env, struct jk_map *m,
struct jk_pool *resultPool,
char *name, char *sep, int *count);
1.2 +2 -2 jakarta-tomcat-connectors/jk/native2/include/jk_md5.h
Index: jk_md5.h
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/include/jk_md5.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jk_md5.h 4 Dec 2001 18:29:11 -0000 1.1
+++ jk_md5.h 21 Feb 2002 11:15:04 -0000 1.2
@@ -114,8 +114,8 @@
#define JK_MD5PW_ID "$apr1$"
#define JK_MD5PW_IDLEN 6
-char * JK_METHOD jk_hextocstr(unsigned char *org, char * dst, int n);
-char * JK_METHOD jk_md5(const unsigned char *org, const unsigned char *org2, char
*dst);
+char * JK_METHOD jk2_hextocstr(unsigned char *org, char * dst, int n);
+char * JK_METHOD jk2_md5(const unsigned char *org, const unsigned char *org2, char
*dst);
#ifdef __cplusplus
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
