costin 01/08/24 17:55:40
Modified: jk/native/jni jk_jnicb.exp jk_jnicb.h jni_connect.dsp
Log:
Merge changes from 3.3 ( Mike's fixes )
Revision Changes Path
1.2 +6 -6 jakarta-tomcat-connectors/jk/native/jni/jk_jnicb.exp
Index: jk_jnicb.exp
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/jni/jk_jnicb.exp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jk_jnicb.exp 2001/05/14 09:50:02 1.1
+++ jk_jnicb.exp 2001/08/25 00:55:40 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-connectors/jk/native/jni/jk_jnicb.h
Index: jk_jnicb.h
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/jni/jk_jnicb.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jk_jnicb.h 2001/05/14 09:50:02 1.1
+++ jk_jnicb.h 2001/08/25 00:55:40 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
1.2 +1 -1 jakarta-tomcat-connectors/jk/native/jni/jni_connect.dsp
Index: jni_connect.dsp
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/jni/jni_connect.dsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jni_connect.dsp 2001/05/14 09:50:44 1.1
+++ jni_connect.dsp 2001/08/25 00:55:40 1.2
@@ -69,7 +69,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D
"_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "JNI_CONNECT_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "$(JAVA_HOME)\include" /I
"$(JAVA_HOME)\include\win32" /I "..\jk" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D
"_MBCS" /D "_USRDLL" /D "JNI_CONNECT_EXPORTS" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "$(JAVA_HOME)\include" /I
"$(JAVA_HOME)\include\win32" /I "..\common" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D
"_MBCS" /D "_USRDLL" /D "JNI_CONNECT_EXPORTS" /YX /FD /GZ /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
