costin 2002/06/07 16:42:19
Modified: jk/native2/jni jk_jni_aprImpl.c org_apache_jk_apr_AprImpl.h
Log:
Another patch from Mladen Turk, cleaning up the singatures.
Revision Changes Path
1.31 +3 -3 jakarta-tomcat-connectors/jk/native2/jni/jk_jni_aprImpl.c
Index: jk_jni_aprImpl.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/jni/jk_jni_aprImpl.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- jk_jni_aprImpl.c 31 May 2002 19:19:45 -0000 1.30
+++ jk_jni_aprImpl.c 7 Jun 2002 23:42:19 -0000 1.31
@@ -255,11 +255,11 @@
return 0;
}
-JNIEXPORT jint JNICALL
+JNIEXPORT void JNICALL
Java_org_apache_jk_apr_AprImpl_sendSignal(JNIEnv *jniEnv, jobject _jthis, jint
signo,
- jlong target)
+ jint target)
{
- return 0;
+
}
#endif
1.5 +56 -49
jakarta-tomcat-connectors/jk/native2/jni/org_apache_jk_apr_AprImpl.h
Index: org_apache_jk_apr_AprImpl.h
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/jni/org_apache_jk_apr_AprImpl.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- org_apache_jk_apr_AprImpl.h 28 May 2002 22:34:59 -0000 1.4
+++ org_apache_jk_apr_AprImpl.h 7 Jun 2002 23:42:19 -0000 1.5
@@ -17,6 +17,8 @@
#define org_apache_jk_apr_AprImpl_HANDLE_RECEIVE_PACKET 10L
#undef org_apache_jk_apr_AprImpl_HANDLE_SEND_PACKET
#define org_apache_jk_apr_AprImpl_HANDLE_SEND_PACKET 11L
+#undef org_apache_jk_apr_AprImpl_HANDLE_FLUSH
+#define org_apache_jk_apr_AprImpl_HANDLE_FLUSH 12L
/* Inaccessible static: aprSingleton */
/* Inaccessible static: ok */
/* Inaccessible static: jniMode */
@@ -36,70 +38,77 @@
JNIEXPORT jint JNICALL Java_org_apache_jk_apr_AprImpl_terminate
(JNIEnv *, jobject);
+/*
+ * Class: org_apache_jk_apr_AprImpl
+ * Method: getJkEnv
+ * Signature: ()J
+ */
+JNIEXPORT jlong JNICALL Java_org_apache_jk_apr_AprImpl_getJkEnv
+ (JNIEnv *, jobject);
/*
* Class: org_apache_jk_apr_AprImpl
- * Method: unSocketClose
- * Signature: (JJI)J
+ * Method: releaseJkEnv
+ * Signature: (J)V
*/
-JNIEXPORT jlong JNICALL Java_org_apache_jk_apr_AprImpl_unSocketClose
- (JNIEnv *, jobject, jlong, jint);
+JNIEXPORT void JNICALL Java_org_apache_jk_apr_AprImpl_releaseJkEnv
+ (JNIEnv *, jobject, jlong);
/*
* Class: org_apache_jk_apr_AprImpl
- * Method: unSocketListen
- * Signature: (JLjava/lang/String;I)J
+ * Method: getJkHandler
+ * Signature: (JLjava/lang/String;)J
*/
-JNIEXPORT jlong JNICALL Java_org_apache_jk_apr_AprImpl_unSocketListen
- (JNIEnv *, jobject, jstring, jint);
+JNIEXPORT jlong JNICALL Java_org_apache_jk_apr_AprImpl_getJkHandler
+ (JNIEnv *, jobject, jlong, jstring);
/*
* Class: org_apache_jk_apr_AprImpl
- * Method: unSocketConnect
+ * Method: createJkHandler
* Signature: (JLjava/lang/String;)J
*/
-JNIEXPORT jlong JNICALL Java_org_apache_jk_apr_AprImpl_unSocketConnect
- (JNIEnv *, jobject, jstring);
+JNIEXPORT jlong JNICALL Java_org_apache_jk_apr_AprImpl_createJkHandler
+ (JNIEnv *, jobject, jlong, jstring);
/*
* Class: org_apache_jk_apr_AprImpl
- * Method: unAccept
- * Signature: (JJ)J
+ * Method: jkSetAttribute
+ * Signature: (JJLjava/lang/String;Ljava/lang/String;)I
*/
-JNIEXPORT jlong JNICALL Java_org_apache_jk_apr_AprImpl_unAccept
- (JNIEnv *, jobject, jlong);
+JNIEXPORT jint JNICALL Java_org_apache_jk_apr_AprImpl_jkSetAttribute
+ (JNIEnv *, jobject, jlong, jlong, jstring, jstring);
/*
* Class: org_apache_jk_apr_AprImpl
- * Method: unRead
- * Signature: (JJ[BII)I
+ * Method: jkGetAttribute
+ * Signature: (JJLjava/lang/String;)Ljava/lang/String;
*/
-JNIEXPORT jint JNICALL Java_org_apache_jk_apr_AprImpl_unRead
- (JNIEnv *, jobject, jlong, jbyteArray, jint, jint);
+JNIEXPORT jstring JNICALL Java_org_apache_jk_apr_AprImpl_jkGetAttribute
+ (JNIEnv *, jobject, jlong, jlong, jstring);
/*
* Class: org_apache_jk_apr_AprImpl
- * Method: unWrite
- * Signature: (JJ[BII)I
+ * Method: jkInit
+ * Signature: (JJ)I
*/
-JNIEXPORT jint JNICALL Java_org_apache_jk_apr_AprImpl_unWrite
- (JNIEnv *, jobject, jlong, jbyteArray, jint, jint);
+JNIEXPORT jint JNICALL Java_org_apache_jk_apr_AprImpl_jkInit
+ (JNIEnv *, jobject, jlong, jlong);
/*
* Class: org_apache_jk_apr_AprImpl
- * Method: getJkEnv
- * Signature: ()J
+ * Method: jkDestroy
+ * Signature: (JJ)I
*/
-JNIEXPORT jlong JNICALL Java_org_apache_jk_apr_AprImpl_getJkEnv
- (JNIEnv *, jobject);
+JNIEXPORT jint JNICALL Java_org_apache_jk_apr_AprImpl_jkDestroy
+ (JNIEnv *, jobject, jlong, jlong);
/*
* Class: org_apache_jk_apr_AprImpl
- * Method: releaseJkEnv
- * Signature: (J)V
+ * Method: jkInvoke
+ * Signature: (JJJI[BIII)I
*/
-JNIEXPORT void JNICALL Java_org_apache_jk_apr_AprImpl_releaseJkEnv
- (JNIEnv *, jobject, jlong);
+JNIEXPORT jint JNICALL Java_org_apache_jk_apr_AprImpl_jkInvoke
+ (JNIEnv *, jclass, jlong, jlong, jlong, jint, jbyteArray, jint, jint, jint);
/*
* Class: org_apache_jk_apr_AprImpl
@@ -111,37 +120,35 @@
/*
* Class: org_apache_jk_apr_AprImpl
- * Method: getJkHandler
- * Signature: (JLjava/lang/String;)J
+ * Method: setUser
+ * Signature: (Ljava/lang/String;Ljava/lang/String;)I
*/
-JNIEXPORT jlong JNICALL Java_org_apache_jk_apr_AprImpl_getJkHandler
- (JNIEnv *, jobject, jlong, jstring);
+JNIEXPORT jint JNICALL Java_org_apache_jk_apr_AprImpl_setUser
+ (JNIEnv *, jobject, jstring, jstring);
/*
* Class: org_apache_jk_apr_AprImpl
- * Method: createJkHandler
- * Signature: (JLjava/lang/String;)J
+ * Method: setPid
+ * Signature: ()I
*/
-JNIEXPORT jlong JNICALL Java_org_apache_jk_apr_AprImpl_createJkHandler
- (JNIEnv *, jobject, jlong, jstring);
+JNIEXPORT jint JNICALL Java_org_apache_jk_apr_AprImpl_setPid
+ (JNIEnv *, jobject);
/*
* Class: org_apache_jk_apr_AprImpl
- * Method: jkGetId
- * Signature: (JLjava/lang/String;Ljava/lang/String;)I
+ * Method: signal
+ * Signature: (I)I
*/
-JNIEXPORT jint JNICALL Java_org_apache_jk_apr_AprImpl_jkGetId
- (JNIEnv *, jobject, jlong, jstring, jstring);
+JNIEXPORT jint JNICALL Java_org_apache_jk_apr_AprImpl_signal
+ (JNIEnv *, jobject, jint);
/*
* Class: org_apache_jk_apr_AprImpl
- * Method: jkInvoke
- * Signature: (JJJI[BI)I
+ * Method: sendSignal
+ * Signature: (II)V
*/
-JNIEXPORT jint JNICALL Java_org_apache_jk_apr_AprImpl_jkInvoke
- (JNIEnv *jniEnv, jobject o, jlong envJ, jlong componentP, jlong endpointP, jint
code,
- jbyteArray data, jint off, jint len,
- jint raw);
+JNIEXPORT void JNICALL Java_org_apache_jk_apr_AprImpl_sendSignal
+ (JNIEnv *, jobject, jint, jint);
#ifdef __cplusplus
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
