mmanders 01/08/14 19:28:56
Modified: src/native/mod_jk/jni jk_jnicb.c jk_jnicb.exp jk_jnicb.h
Log:
Fixed function names to match new classes.
Revision Changes Path
1.2 +13 -13 jakarta-tomcat/src/native/mod_jk/jni/jk_jnicb.c
Index: jk_jnicb.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/native/mod_jk/jni/jk_jnicb.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jk_jnicb.c 2000/08/26 02:03:52 1.1
+++ jk_jnicb.c 2001/08/15 02:28:56 1.2
@@ -56,7 +56,7 @@
/***************************************************************************
* Description: JNI callbacks implementation for the JNI in process adapter*
* Author: Gal Shachor <[EMAIL PROTECTED]> *
- * Version: $Revision: 1.1 $ *
+ * Version: $Revision: 1.2 $ *
***************************************************************************/
#include "jk_jnicb.h"
@@ -65,12 +65,12 @@
#include "jk_pool.h"
/*
- * Class: org_apache_tomcat_service_connector_JNIConnectionHandler
+ * Class: org_apache_tomcat_modules_server_JNIConnectionHandler
* Method: getNumberOfHeaders
* Signature: (JJ)I
*/
JNIEXPORT jint JNICALL
-Java_org_apache_tomcat_service_connector_JNIConnectionHandler_getNumberOfHeaders
+Java_org_apache_tomcat_modules_server_JNIConnectionHandler_getNumberOfHeaders
(JNIEnv *env, jobject o, jlong s, jlong l)
{
/* [V] Convert indirectly from jlong -> int -> pointer to shut up gcc */
@@ -94,12 +94,12 @@
}
/*
- * Class: org_apache_tomcat_service_connector_JNIConnectionHandler
+ * Class: org_apache_tomcat_modules_server_JNIConnectionHandler
* Method: read
* Signature: (JJ[BII)I
*/
JNIEXPORT jint JNICALL
-Java_org_apache_tomcat_service_connector_JNIConnectionHandler_read
+Java_org_apache_tomcat_modules_server_JNIConnectionHandler_read
(JNIEnv *env, jobject o, jlong s, jlong l, jbyteArray buf, jint from, jint cnt)
{
jk_ws_service_t *ps = (jk_ws_service_t *)(int)s;
@@ -141,12 +141,12 @@
}
/*
- * Class: org_apache_tomcat_service_connector_JNIConnectionHandler
+ * Class: org_apache_tomcat_modules_server_JNIConnectionHandler
* Method: readEnvironment
* Signature: (JJ[Ljava/lang/String;)I
*/
JNIEXPORT jint JNICALL
-Java_org_apache_tomcat_service_connector_JNIConnectionHandler_readEnvironment
+Java_org_apache_tomcat_modules_server_JNIConnectionHandler_readEnvironment
(JNIEnv *env, jobject o, jlong s, jlong l, jobjectArray envbuf)
{
jk_ws_service_t *ps = (jk_ws_service_t *)(int)s;
@@ -288,12 +288,12 @@
}
/*
- * Class: org_apache_tomcat_service_connector_JNIConnectionHandler
+ * Class: org_apache_tomcat_modules_server_JNIConnectionHandler
* Method: readHeaders
* Signature: (JJ[Ljava/lang/String;[Ljava/lang/String;)I
*/
JNIEXPORT jint JNICALL
-Java_org_apache_tomcat_service_connector_JNIConnectionHandler_readHeaders
+Java_org_apache_tomcat_modules_server_JNIConnectionHandler_readHeaders
(JNIEnv *env, jobject o, jlong s, jlong l, jobjectArray hnames, jobjectArray
hvalues)
{
jk_ws_service_t *ps = (jk_ws_service_t *)(int)s;
@@ -330,12 +330,12 @@
}
/*
- * Class: org_apache_tomcat_service_connector_JNIConnectionHandler
+ * Class: org_apache_tomcat_modules_server_JNIConnectionHandler
* Method: startReasponse
* Signature: (JJILjava/lang/String;[Ljava/lang/String;[Ljava/lang/String;I)I
*/
JNIEXPORT jint JNICALL
-Java_org_apache_tomcat_service_connector_JNIConnectionHandler_startReasponse
+Java_org_apache_tomcat_modules_server_JNIConnectionHandler_startReasponse
(JNIEnv *env, jobject o, jlong s, jlong l,
jint sc, jstring msg, jobjectArray hnames, jobjectArray hvalues, jint hcnt)
{
@@ -455,12 +455,12 @@
}
/*
- * Class: org_apache_tomcat_service_connector_JNIConnectionHandler
+ * Class: org_apache_tomcat_modules_server_JNIConnectionHandler
* Method: write
* Signature: (JJ[BII)I
*/
JNIEXPORT jint JNICALL
-Java_org_apache_tomcat_service_connector_JNIConnectionHandler_write
+Java_org_apache_tomcat_modules_server_JNIConnectionHandler_write
(JNIEnv *env, jobject o, jlong s, jlong l, jbyteArray buf, jint from, jint cnt)
{
jk_ws_service_t *ps = (jk_ws_service_t *)(int)s;
1.2 +6 -6 jakarta-tomcat/src/native/mod_jk/jni/jk_jnicb.exp
Index: jk_jnicb.exp
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/native/mod_jk/jni/jk_jnicb.exp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jk_jnicb.exp 2000/11/11 15:17:38 1.1
+++ jk_jnicb.exp 2001/08/15 02:28:56 1.2
@@ -1,7 +1,7 @@
-Java_org_apache_tomcat_service_connector_JNIConnectionHandler_getNumberOfHeaders,
-Java_org_apache_tomcat_service_connector_JNIConnectionHandler_read,
-Java_org_apache_tomcat_service_connector_JNIConnectionHandler_readEnvironment,
-Java_org_apache_tomcat_service_connector_JNIConnectionHandler_readHeaders,
-Java_org_apache_tomcat_service_connector_JNIConnectionHandler_startReasponse,
-Java_org_apache_tomcat_service_connector_JNIConnectionHandler_write
+Java_org_apache_tomcat_modules_server_JNIConnectionHandler_getNumberOfHeaders,
+Java_org_apache_tomcat_modules_server_JNIConnectionHandler_read,
+Java_org_apache_tomcat_modules_server_JNIConnectionHandler_readEnvironment,
+Java_org_apache_tomcat_modules_server_JNIConnectionHandler_readHeaders,
+Java_org_apache_tomcat_modules_server_JNIConnectionHandler_startReasponse,
+Java_org_apache_tomcat_modules_server_JNIConnectionHandler_write
1.2 +15 -15 jakarta-tomcat/src/native/mod_jk/jni/jk_jnicb.h
Index: jk_jnicb.h
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/native/mod_jk/jni/jk_jnicb.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jk_jnicb.h 2000/08/26 02:03:52 1.1
+++ jk_jnicb.h 2001/08/15 02:28:56 1.2
@@ -1,58 +1,58 @@
/* DO NOT EDIT THIS FILE - it is machine generated */
#include <jni.h>
-/* Header for class org_apache_tomcat_service_connector_JNIConnectionHandler */
+/* Header for class org_apache_tomcat_modules_server_JNIConnectionHandler */
-#ifndef _Included_org_apache_tomcat_service_connector_JNIConnectionHandler
-#define _Included_org_apache_tomcat_service_connector_JNIConnectionHandler
+#ifndef _Included_org_apache_tomcat_modules_server_JNIConnectionHandler
+#define _Included_org_apache_tomcat_modules_server_JNIConnectionHandler
#ifdef __cplusplus
extern "C" {
#endif
/*
- * Class: org_apache_tomcat_service_connector_JNIConnectionHandler
+ * Class: org_apache_tomcat_modules_server_JNIConnectionHandler
* Method: getNumberOfHeaders
* Signature: (JJ)I
*/
-JNIEXPORT jint JNICALL
Java_org_apache_tomcat_service_connector_JNIConnectionHandler_getNumberOfHeaders
+JNIEXPORT jint JNICALL
Java_org_apache_tomcat_modules_server_JNIConnectionHandler_getNumberOfHeaders
(JNIEnv *, jobject, jlong, jlong);
/*
- * Class: org_apache_tomcat_service_connector_JNIConnectionHandler
+ * Class: org_apache_tomcat_modules_server_JNIConnectionHandler
* Method: read
* Signature: (JJ[BII)I
*/
-JNIEXPORT jint JNICALL
Java_org_apache_tomcat_service_connector_JNIConnectionHandler_read
+JNIEXPORT jint JNICALL
Java_org_apache_tomcat_modules_server_JNIConnectionHandler_read
(JNIEnv *, jobject, jlong, jlong, jbyteArray, jint, jint);
/*
- * Class: org_apache_tomcat_service_connector_JNIConnectionHandler
+ * Class: org_apache_tomcat_modules_server_JNIConnectionHandler
* Method: readEnvironment
* Signature: (JJ[Ljava/lang/String;)I
*/
-JNIEXPORT jint JNICALL
Java_org_apache_tomcat_service_connector_JNIConnectionHandler_readEnvironment
+JNIEXPORT jint JNICALL
Java_org_apache_tomcat_modules_server_JNIConnectionHandler_readEnvironment
(JNIEnv *, jobject, jlong, jlong, jobjectArray);
/*
- * Class: org_apache_tomcat_service_connector_JNIConnectionHandler
+ * Class: org_apache_tomcat_modules_server_JNIConnectionHandler
* Method: readHeaders
* Signature: (JJ[Ljava/lang/String;[Ljava/lang/String;)I
*/
-JNIEXPORT jint JNICALL
Java_org_apache_tomcat_service_connector_JNIConnectionHandler_readHeaders
+JNIEXPORT jint JNICALL
Java_org_apache_tomcat_modules_server_JNIConnectionHandler_readHeaders
(JNIEnv *, jobject, jlong, jlong, jobjectArray, jobjectArray);
/*
- * Class: org_apache_tomcat_service_connector_JNIConnectionHandler
+ * Class: org_apache_tomcat_modules_server_JNIConnectionHandler
* Method: startReasponse
* Signature: (JJILjava/lang/String;[Ljava/lang/String;[Ljava/lang/String;I)I
*/
-JNIEXPORT jint JNICALL
Java_org_apache_tomcat_service_connector_JNIConnectionHandler_startReasponse
+JNIEXPORT jint JNICALL
Java_org_apache_tomcat_modules_server_JNIConnectionHandler_startReasponse
(JNIEnv *, jobject, jlong, jlong, jint, jstring, jobjectArray, jobjectArray,
jint);
/*
- * Class: org_apache_tomcat_service_connector_JNIConnectionHandler
+ * Class: org_apache_tomcat_modules_server_JNIConnectionHandler
* Method: write
* Signature: (JJ[BII)I
*/
-JNIEXPORT jint JNICALL
Java_org_apache_tomcat_service_connector_JNIConnectionHandler_write
+JNIEXPORT jint JNICALL
Java_org_apache_tomcat_modules_server_JNIConnectionHandler_write
(JNIEnv *, jobject, jlong, jlong, jbyteArray, jint, jint);
#ifdef __cplusplus
