You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by da...@apache.org on 2006/01/27 05:30:39 UTC
svn commit: r372725 - in /webservices/axis2/trunk/c: include/axis2_call.h
include/axis2_stub.h modules/core/deployment/svc_builder.c
modules/core/description/svc.c modules/wsdl/wsdl_interface.c
test/core/deployment/test_deployment.c
Author: damitha
Date: Thu Jan 26 20:30:27 2006
New Revision: 372725
URL: http://svn.apache.org/viewcvs?rev=372725&view=rev
Log:
Fixed Jira AXIS2C-35
Modified:
webservices/axis2/trunk/c/include/axis2_call.h
webservices/axis2/trunk/c/include/axis2_stub.h
webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c
webservices/axis2/trunk/c/modules/core/description/svc.c
webservices/axis2/trunk/c/modules/wsdl/wsdl_interface.c
webservices/axis2/trunk/c/test/core/deployment/test_deployment.c
Modified: webservices/axis2/trunk/c/include/axis2_call.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_call.h?rev=372725&r1=372724&r2=372725&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_call.h (original)
+++ webservices/axis2/trunk/c/include/axis2_call.h Thu Jan 26 20:30:27 2006
@@ -237,7 +237,7 @@
#define AXIS2_CALL_CLOSE(call, env) ((call)->ops->close(call, env))
#define AXIS2_CALL_SET_TIME(call, env, time_out_ms) ((call)->ops->set_time(call, env, time_out_ms))
#define AXIS2_CALL_INVOKE_BLOCKING_WITH_OM ((call)->ops->invoke_blocking_with_om(call, env, op_name, om_node_to_send))
-#define AXIS2_CALL_INVOKE_BLOCKING_WITH_SOAP(call, env, op_name, om_node_to_send) ((call)->ops->invoke_blocking_with_soap(call, env, op_name, envelope))
+#define AXIS2_CALL_INVOKE_BLOCKING_WITH_SOAP(call, env, op_name, envelope) ((call)->ops->invoke_blocking_with_soap(call, env, op_name, envelope))
#define AXIS2_CALL_INVOKE_NON_BLOCKING_WITH_OM(call, env, op_name, om_node_to_send, callback) ((call)->ops->invoke_non_blocking_with_om(call, env, op_name, om_node_to_send, callback))
#define AXIS2_CALL_INVOKE_NON_BLOCKING_WITH_SOAP(call, env, op_name, envelope, callback) ((call)->ops->invoke_non_blocking_with_soap(call, env, op_name, envelope, callback))
#define AXIS2_CALL_CREATE_OP_FILL_FLOW(call, env, op_name) ((call)->ops->create_op_fill_flow(call, env, op_name))
Modified: webservices/axis2/trunk/c/include/axis2_stub.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_stub.h?rev=372725&r1=372724&r2=372725&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_stub.h (original)
+++ webservices/axis2/trunk/c/include/axis2_stub.h Thu Jan 26 20:30:27 2006
@@ -65,8 +65,63 @@
axis2_env_t **env,
axis2_msg_ctx_t *msg_ctx,
axis2_callback_t *callback);
+
+ /**
+ * Invoke the blocking/Synchronous call
+ *
+ * @param op - this will be used to identify the operation in the client
+ * side, without dispatching
+ * @param toSend - This should be OM Element (payload)
+ * @return
+ */
+ axis2_om_node_t* (AXIS2_CALL *
+ invoke_blocking_with_om)(struct axis2_stub *stub,
+ axis2_env_t **env,
+ axis2_char_t *op_name,
+ axis2_om_node_t *om_node_to_send);
+ /**
+ * Invoke the blocking/Synchronous call
+ *
+ * @param op_name - this will be used to identify the operation in the client
+ * side, without dispatching
+ * @param envelope - This should be SOAPEnvelope
+ * @return
+ */
+ axis2_soap_envelope_t* (AXIS2_CALL *
+ invoke_blocking_with_soap)(struct axis2_stub *stub,
+ axis2_env_t **env,
+ axis2_char_t *op_name,
+ axis2_soap_envelope_t *envelope);
-
+ /**
+ * Invoke the nonblocking/Asynchronous call
+ *
+ * @param op_name
+ * @param om_node_to_send - This should be OM Element (payload)
+ * invocation behaves accordingly
+ * @param callback
+ */
+ axis2_status_t (AXIS2_CALL *
+ invoke_non_blocking_with_om)(struct axis2_stub *stub,
+ axis2_env_t **env,
+ axis2_char_t *op_name,
+ axis2_om_node_t *om_node_to_send,
+ axis2_callback_t *callback);
+ /**
+ * Invoke the nonblocking/Asynchronous call
+ *
+ * @param op_name
+ * @param envelope - This should be a SOAP Envelope
+ * invocation behaves accordingly
+ * @param callback
+ */
+
+ axis2_status_t (AXIS2_CALL *
+ invoke_non_blocking_with_soap)(struct axis2_stub *call,
+ axis2_env_t **env,
+ axis2_char_t *op_name,
+ axis2_soap_envelope_t *envelope,
+ axis2_callback_t * callback);
} ;
AXIS2_DECLARE_DATA struct axis2_stub
@@ -110,7 +165,18 @@
#define AXIS2_STUB_INVOKE_NON_BLOCKING(stub, env, msg_ctx, callback) \
((stub)->ops->invoke_non_blocking (stub, env, msg_ctx, callback))
+#define AXIS2_STUB_INVOKE_BLOCKING_WITH_OM(stub, env, op_name, om_node_to_send) \
+ ((stub)->ops->invoke_blocking_with_om (stub, env, op_name, om_node_to_send))
+#define AXIS2_STUB_INVOKE_NON_BLOCKING_WITH_OM(stub, env, op_name, om_node_to_send, callback) \
+ ((stub)->ops->invoke_non_blocking_with_om (stub, env, op_name, om_node_to_send, callback))
+
+#define AXIS2_STUB_INVOKE_BLOCKING_WITH_SOAP(stub, env, op_name, envelope) \
+ ((stub)->ops->invoke_blocking_with_soap (stub, env, op_name, envelope))
+
+#define AXIS2_STUB_INVOKE_NON_BLOCKING_WITH_SOAP(stub, env, op_name, envelope, callback) \
+ ((stub)->ops->invoke_non_blocking_with_soap (stub, env, op_name, envelope, callback))
+
/** @} */
#ifdef __cplusplus
Modified: webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c?rev=372725&r1=372724&r2=372725&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c Thu Jan 26 20:30:27 2006
@@ -473,7 +473,7 @@
op_desc = (axis2_op_t *) AXIS2_ARRAY_LIST_GET(ops, env, i);
params = AXIS2_OP_GET_PARAMS(op_desc, env);
/* Adding wsa-mapping into service */
- size = AXIS2_ARRAY_LIST_SIZE(params, env);
+ sizej = AXIS2_ARRAY_LIST_SIZE(params, env);
for(j = 0; j < sizej; j++)
{
axis2_param_t *param = NULL;
Modified: webservices/axis2/trunk/c/modules/core/description/svc.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/description/svc.c?rev=372725&r1=372724&r2=372725&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/svc.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/svc.c Thu Jan 26 20:30:27 2006
@@ -589,21 +589,21 @@
axis2_status_t AXIS2_CALL
axis2_svc_add_op (axis2_svc_t *svc,
- axis2_env_t **env,
- struct axis2_op *axis2_opt)
+ axis2_env_t **env,
+ axis2_op_t *op)
{
axis2_status_t status = AXIS2_FAILURE;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, axis2_opt, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK((*env)->error, op, AXIS2_FAILURE);
- status = AXIS2_OP_SET_PARENT(axis2_opt, env, svc);
+ status = AXIS2_OP_SET_PARENT(op, env, svc);
if(AXIS2_SUCCESS == status)
{
axis2_wsdl_interface_t *wsdl_interface = NULL;
wsdl_interface = axis2_svc_get_svc_interface(svc, env);
- status = AXIS2_WSDL_INTERFACE_SET_OP(wsdl_interface, env, axis2_opt,
+ status = AXIS2_WSDL_INTERFACE_SET_OP(wsdl_interface, env, op,
AXIS2_OP_T);
}
return status;
Modified: webservices/axis2/trunk/c/modules/wsdl/wsdl_interface.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/wsdl/wsdl_interface.c?rev=372725&r1=372724&r2=372725&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/wsdl/wsdl_interface.c (original)
+++ webservices/axis2/trunk/c/modules/wsdl/wsdl_interface.c Thu Jan 26 20:30:27 2006
@@ -473,14 +473,14 @@
axis2_wsdl_interface_impl_t *interface_impl = NULL;
axis2_qname_t *wsdl_op_name = NULL;
axis2_char_t *op_name = NULL;
- struct axis2_op *op_l = NULL;
+ axis2_op_t *op_l = NULL;
AXIS2_FUNC_PARAM_CHECK(wsdl_interface, env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, op, AXIS2_FAILURE);
interface_impl = AXIS2_INTF_TO_IMPL(wsdl_interface);
- op_l = (struct axis2_op *) op;
+ op_l = (axis2_op_t *) op;
wsdl_op_name = AXIS2_WSDL_OP_GET_QNAME(op_l->wsdl_op, env);
if (!wsdl_op_name)
Modified: webservices/axis2/trunk/c/test/core/deployment/test_deployment.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/test/core/deployment/test_deployment.c?rev=372725&r1=372724&r2=372725&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/core/deployment/test_deployment.c (original)
+++ webservices/axis2/trunk/c/test/core/deployment/test_deployment.c Thu Jan 26 20:30:27 2006
@@ -187,8 +187,8 @@
int main()
{
- axis2_test_transport_receiver_load();
- axis2_test_transport_sender_load();
+ /*axis2_test_transport_receiver_load();
+ axis2_test_transport_sender_load();*/
axis2_test_dep_engine_load();
return 0;
}