You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by co...@apache.org on 2002/05/29 00:37:12 UTC
cvs commit: jakarta-tomcat-connectors/jk/native2/include jk_bean.h jk_channel.h jk_msg.h
costin 02/05/28 15:37:12
Modified: jk/native2/include jk_bean.h jk_channel.h jk_msg.h
Log:
Add invoke() method to jk_bean.
Added 'serverSide' option to channel and msg ( since now the same object can
be used on apache side or tomcat side - see jk_channel_un for example )
Revision Changes Path
1.4 +7 -0 jakarta-tomcat-connectors/jk/native2/include/jk_bean.h
Index: jk_bean.h
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/include/jk_bean.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- jk_bean.h 16 May 2002 20:49:53 -0000 1.3
+++ jk_bean.h 28 May 2002 22:37:11 -0000 1.4
@@ -214,6 +214,13 @@
int (JK_METHOD *destroy)(struct jk_env *env, struct jk_bean *bean );
+ /** Called by the RPC-like protocol or the JNI bridge. Will unmarshal the arguments
+ * and dispatch to the real method. This is similar with 'dynamic invocation'/introspection/
+ * 'scripting support', etc.
+ */
+ int (JK_METHOD *invoke)(struct jk_env *env, struct jk_bean *target,
+ struct jk_endpoint *ae, int code, struct jk_msg *msg, int raw);
+
};
1.13 +12 -1 jakarta-tomcat-connectors/jk/native2/include/jk_channel.h
Index: jk_channel.h
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/include/jk_channel.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- jk_channel.h 26 May 2002 07:31:12 -0000 1.12
+++ jk_channel.h 28 May 2002 22:37:11 -0000 1.13
@@ -74,6 +74,11 @@
struct jk_endpoint;
struct jk_channel;
+#define CH_OPEN 4
+#define CH_CLOSE 5
+#define CH_READ 6
+#define CH_WRITE 7
+
typedef struct jk_channel jk_channel_t;
/**
@@ -116,8 +121,10 @@
struct jk_workerEnv *workerEnv;
struct jk_worker *worker;
- char *workerName;
+ char *workerName;
+ int serverSide;
+
/** Open the communication channel
*/
int (JK_METHOD *open)(struct jk_env *env, jk_channel_t *_this,
@@ -157,6 +164,10 @@
void *_privatePtr;
};
+
+int JK_METHOD jk2_channel_invoke(struct jk_env *env, struct jk_bean *bean, struct jk_endpoint *ep, int code,
+ struct jk_msg *msg, int raw);
+
#ifdef __cplusplus
}
1.10 +3 -0 jakarta-tomcat-connectors/jk/native2/include/jk_msg.h
Index: jk_msg.h
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/include/jk_msg.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- jk_msg.h 23 May 2002 23:33:19 -0000 1.9
+++ jk_msg.h 28 May 2002 22:37:11 -0000 1.10
@@ -203,6 +203,9 @@
int len;
int maxlen;
+ /* JK_TRUE if the message is sent/received by the server ( tomcat ).
+ */
+ int serverSide;
};
/* Temp */
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>