costin 01/12/04 10:33:50
Modified: jk/native2/include jk_global.h jk_uriMap.h
Log:
Few comments and a 'local debug' field in uriMap.
The version info is now in jk_global.h
Revision Changes Path
1.2 +31 -3 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jk_global.h 2001/12/01 22:30:57 1.1
+++ jk_global.h 2001/12/04 18:33:50 1.2
@@ -59,14 +59,12 @@
* Description: Global definitions and include files that should exist *
* anywhere *
* Author: Gal Shachor <[EMAIL PROTECTED]> *
- * Version: $Revision: 1.1 $ *
+ * Version: $Revision: 1.2 $ *
***************************************************************************/
#ifndef JK_GLOBAL_H
#define JK_GLOBAL_H
-#include "jk_version.h"
-
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -77,6 +75,36 @@
#include <sys/types.h>
#include <sys/stat.h>
+
+/************** START OF AREA TO MODIFY BEFORE RELEASING *************/
+#define JK_VERMAJOR 1
+#define JK_VERMINOR 2
+#define JK_VERFIX 0
+#define JK_VERSTRING "1.2.0"
+
+/* Beta number */
+#define JK_VERBETA 1
+#define JK_BETASTRING "1"
+/* set JK_VERISRELEASE to 1 when release (do not forget to commit!) */
+#define JK_VERISRELEASE 1
+/************** END OF AREA TO MODIFY BEFORE RELEASING *************/
+
+#define PACKAGE "mod_jk/"
+/* Build JK_EXPOSED_VERSION and JK_VERSION */
+#define JK_EXPOSED_VERSION_INT PACKAGE JK_VERSTRING
+
+#if ( JK_VERISRELEASE == 1 )
+#define JK_EXPOSED_VERSION JK_EXPOSED_VERSION_INT
+#undef JK_VERBETA
+#define JK_VERBETA 255
+#else
+#define JK_EXPOSED_VERSION JK_EXPOSED_VERSION_INT "-beta-" JK_BETASTRING
+#endif
+
+#define JK_MAKEVERSION(major, minor, fix, beta) (((major) << 24) + ((minor) << 16)
+ ((fix) << 8) + (beta))
+
+#define JK_VERSION JK_MAKEVERSION(JK_VERMAJOR, JK_VERMINOR, JK_VERFIX, JK_VERBETA)
+
#ifdef WIN32
#include <windows.h>
1.2 +6 -0 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jk_uriMap.h 2001/12/01 22:06:29 1.1
+++ jk_uriMap.h 2001/12/04 18:33:50 1.2
@@ -96,15 +96,21 @@
unsigned int size;
unsigned int capacity;
struct jk_workerEnv *workerEnv;
+ int debug;
/* ---------- Methods ---------- */
+ /** Initialize the map. This should be called after all workers
+ were added. It'll check if mappings have valid workers.
+ */
int (*init)( jk_uriMap_t *_this,
struct jk_workerEnv *workerEnv,
jk_map_t *init_data );
void (*destroy)( jk_uriMap_t *_this );
+ /** Add a servlet mapping. Can be done before init()
+ */
jk_uriEnv_t *(*addMapping)( jk_uriMap_t *_this,
const char *vhost,
const char *uri,
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
