costin 02/05/09 13:52:54
Modified: jk/native2/include jk_config.h jk_uriEnv.h jk_uriMap.h
Log:
- removed old 'pull' apis from config, now everything works using the 'push' model
( i.e. setters ).
- removed unused stuff from config.
- removed duplicated 'debug' from uriEnv, uriMap
Revision Changes Path
1.5 +1 -53 jakarta-tomcat-connectors/jk/native2/include/jk_config.h
Index: jk_config.h
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/include/jk_config.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- jk_config.h 8 May 2002 23:47:27 -0000 1.4
+++ jk_config.h 9 May 2002 20:52:54 -0000 1.5
@@ -90,7 +90,7 @@
/* Set an attribute for a jk object. This should be the
* only method called to configure objects. The implementation
- * should update the underlying repository in addition to setting
+ * will update the underlying repository in addition to setting
* the runtime value. Calling setAttribute on the object directly
* will only set the runtime value.
*/
@@ -104,51 +104,6 @@
char *targetFile);
- /** Read the properties from the file, doing $(prop) substitution
- * The source can be a file ( or uri ).
- */
- /* int (*read)(struct jk_env *env, jk_config_t *m, const char *source); */
-
- /** Write the properties, preserving the original format. Is it possible ?
- */
- /* int (*write)(struct jk_env *env, jk_config_t *m, const char *dest); */
-
-
- /* ========== Utilities and 'pull' access ========== */
-
- /** For multi-value properties, return the concatenation
- * of all values.
- *
- * @param sep Separators used to separate multi-values and
- * when concatenating the values, NULL for none. The first
- * char will be used on the result, the other will be
- * used to split. ( i.e. the map may either have multiple
- * values or values separated by one of the sep's chars )
- *
- */
- /* char *(*getValuesString)(struct jk_env *env, struct jk_map *m, */
- /* struct jk_pool *resultPool, */
- /* char *name, char *sep ); */
-
-
- /** For multi-value properties, return the array containing
- * all values.
- *
- * @param sep Optional separator, it'll be used to split existing values.
- * Curently only single-char separators are supported.
- */
- /* char **(*getValues)(struct jk_env *env, struct jk_map *m, */
- /* struct jk_pool *resultPool, */
- /* char *name, char *sep, int *count); */
-
- /**
- * Replace $(property) and ${property} in value.
- */
- /* char *(*replaceProperties)(struct jk_env *env, jk_config_t *m, */
- /* char *value, struct jk_pool *resultPool ); */
-
-
-
/* Private data */
struct jk_pool *pool;
void *_private;
@@ -159,13 +114,6 @@
char *section;
};
-
-/** Util: Split a string in components. */
-char **jk2_config_split(struct jk_env *env, struct jk_pool *pool,
- const char *listStr, const char *sep,
- unsigned *list_len );
-
-int jk2_config_str2int(struct jk_env *env, char *val );
char *jk2_config_replaceProperties(struct jk_env *env, struct jk_map *m,
struct jk_pool *resultPool,
1.13 +0 -4 jakarta-tomcat-connectors/jk/native2/include/jk_uriEnv.h
Index: jk_uriEnv.h
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/include/jk_uriEnv.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- jk_uriEnv.h 8 May 2002 23:47:27 -0000 1.12
+++ jk_uriEnv.h 9 May 2002 20:52:54 -0000 1.13
@@ -153,10 +153,6 @@
char *workerName;
struct jk_worker *worker;
- /** Debug for that location. Set with 'debug'
- */
- int debug;
-
/** For MATCH_TYPE_HOST, the list of aliases for the virtual host.
* Set using (multi-value ) 'alias' attribute on vhost uris.
*/
1.13 +0 -1 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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- jk_uriMap.h 30 Apr 2002 06:42:35 -0000 1.12
+++ jk_uriMap.h 9 May 2002 20:52:54 -0000 1.13
@@ -103,7 +103,6 @@
struct jk_map *maps;
struct jk_workerEnv *workerEnv;
- int debug;
/* Virtual host map. For each host and alias there is one
* entry, the value is a uriEnv that corresponds to the vhost top
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
