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/09/09 06:10:16 UTC
svn commit: r441735 - in /webservices/axis2/trunk/c: ./
modules/core/context/ modules/core/deployment/ modules/core/description/
modules/core/engine/ modules/core/phaseresolver/ modules/core/receivers/
modules/core/transport/http/ modules/core/transpor...
Author: damitha
Date: Fri Sep 8 21:10:15 2006
New Revision: 441735
URL: http://svn.apache.org/viewvc?view=rev&rev=441735
Log:
Resolved Jira AXIS2C_260. Added several fixes to problems found
when doing RM
Modified:
webservices/axis2/trunk/c/configure.ac
webservices/axis2/trunk/c/modules/core/context/msg_ctx.c
webservices/axis2/trunk/c/modules/core/context/op_ctx.c
webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c
webservices/axis2/trunk/c/modules/core/description/op.c
webservices/axis2/trunk/c/modules/core/description/svc.c
webservices/axis2/trunk/c/modules/core/engine/engine.c
webservices/axis2/trunk/c/modules/core/engine/phase.c
webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c
webservices/axis2/trunk/c/modules/core/receivers/msg_recv.c
webservices/axis2/trunk/c/modules/core/transport/http/http_worker.c
webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_svr_thread.c
webservices/axis2/trunk/c/modules/core/transport/http/sender/soap_over_http_sender.c
webservices/axis2/trunk/c/modules/core/util/core_utils.c
webservices/axis2/trunk/c/samples/client/rm_ping/rm_ping_client.c
webservices/axis2/trunk/c/samples/server/rm_ping/services.xml
Modified: webservices/axis2/trunk/c/configure.ac
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/configure.ac?view=diff&rev=441735&r1=441734&r2=441735
==============================================================================
--- webservices/axis2/trunk/c/configure.ac (original)
+++ webservices/axis2/trunk/c/configure.ac Fri Sep 8 21:10:15 2006
@@ -24,7 +24,8 @@
#CFLAGS="$CFLAGS -ansi -Wall -D_LARGEFILE64_SOURCE -Wno-implicit-function-declaration"
CFLAGS="$CFLAGS -D_LARGEFILE64_SOURCE"
if test "$GCC" = "yes"; then
- CFLAGS="$CFLAGS -ansi -Wall -Wno-implicit-function-declaration -Werror"
+# CFLAGS="$CFLAGS -ansi -Wall -Wno-implicit-function-declaration -Werror"
+ CFLAGS="$CFLAGS -ansi -Wall -Wno-implicit-function-declaration"
fi
LDFLAGS="-lpthread"
Modified: webservices/axis2/trunk/c/modules/core/context/msg_ctx.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/context/msg_ctx.c?view=diff&rev=441735&r1=441734&r2=441735
==============================================================================
--- webservices/axis2/trunk/c/modules/core/context/msg_ctx.c (original)
+++ webservices/axis2/trunk/c/modules/core/context/msg_ctx.c Fri Sep 8 21:10:15 2006
@@ -1093,7 +1093,8 @@
if (msg_ctx_impl->msg_info_headers)
{
- return AXIS2_MSG_INFO_HEADERS_GET_MESSAGE_ID(msg_ctx_impl->msg_info_headers, env);
+ return AXIS2_MSG_INFO_HEADERS_GET_MESSAGE_ID(
+ msg_ctx_impl->msg_info_headers, env);
}
return NULL;
Modified: webservices/axis2/trunk/c/modules/core/context/op_ctx.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/context/op_ctx.c?view=diff&rev=441735&r1=441734&r2=441735
==============================================================================
--- webservices/axis2/trunk/c/modules/core/context/op_ctx.c (original)
+++ webservices/axis2/trunk/c/modules/core/context/op_ctx.c Fri Sep 8 21:10:15 2006
@@ -358,11 +358,38 @@
axis2_thread_mutex_lock(op_ctx_impl->mutex);
if (op_ctx_impl->msg_ctx_map)
{
- const axis2_char_t *message_id = AXIS2_MSG_CTX_GET_MSG_ID(msg_ctx, env);
+ axis2_msg_ctx_t *out_msg_ctx = NULL;
+ axis2_msg_ctx_t *in_msg_ctx = NULL;
+
+ /*const axis2_char_t *message_id = AXIS2_MSG_CTX_GET_MSG_ID(msg_ctx, env);
if (message_id)
{
axis2_hash_set(op_ctx_impl->msg_ctx_map,
message_id, AXIS2_HASH_KEY_STRING, msg_ctx);
+ }*/
+
+ out_msg_ctx = axis2_hash_get(op_ctx_impl->msg_ctx_map,
+ AXIS2_WSDL_MESSAGE_LABEL_OUT_VALUE, AXIS2_HASH_KEY_STRING);
+ in_msg_ctx = axis2_hash_get(op_ctx_impl->msg_ctx_map,
+ AXIS2_WSDL_MESSAGE_LABEL_IN_VALUE, AXIS2_HASH_KEY_STRING);
+
+ if (out_msg_ctx && in_msg_ctx)
+ {
+ /*TODO:error - completed*/
+ return AXIS2_FAILURE;
+ }
+
+ if (!out_msg_ctx)
+ {
+ axis2_hash_set(op_ctx_impl->msg_ctx_map,
+ AXIS2_WSDL_MESSAGE_LABEL_OUT_VALUE, AXIS2_HASH_KEY_STRING,
+ msg_ctx);
+ }
+ else
+ {
+ axis2_hash_set(op_ctx_impl->msg_ctx_map,
+ AXIS2_WSDL_MESSAGE_LABEL_IN_VALUE, AXIS2_HASH_KEY_STRING,
+ msg_ctx);
}
}
axis2_thread_mutex_unlock(op_ctx_impl->mutex);
Modified: webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c?view=diff&rev=441735&r1=441734&r2=441735
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c Fri Sep 8 21:10:15 2006
@@ -766,3 +766,4 @@
}
return AXIS2_SUCCESS;
}
+
Modified: webservices/axis2/trunk/c/modules/core/description/op.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/description/op.c?view=diff&rev=441735&r1=441734&r2=441735
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/op.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/op.c Fri Sep 8 21:10:15 2006
@@ -33,6 +33,7 @@
int mep;
/*To store deploy time module QNames */
axis2_array_list_t *module_qnames;
+ axis2_array_list_t *engaged_module_list;
} axis2_op_impl_t;
@@ -382,6 +383,7 @@
op_impl->op.param_container = NULL;
op_impl->wsdl_op = NULL;
op_impl->module_qnames = NULL;
+ op_impl->engaged_module_list = NULL;
op_impl->op.ops = NULL;
op_impl->op.param_container = (axis2_param_container_t *)
@@ -728,7 +730,14 @@
AXIS2_ARRAY_LIST_FREE(op_impl->module_qnames, env);
op_impl->module_qnames = NULL;
}
+
+ if(NULL != op_impl->engaged_module_list)
+ {
+ AXIS2_ARRAY_LIST_FREE(op_impl->engaged_module_list, env);
+ op_impl->engaged_module_list = NULL;
+ }
+
if(NULL != op_impl->wsdl_op)
{
AXIS2_WSDL_OP_FREE(op_impl->wsdl_op, env);
@@ -1026,13 +1035,15 @@
AXIS2_PARAM_CHECK(env->error, conf, AXIS2_FAILURE);
op_impl = AXIS2_INTF_TO_IMPL(op);
- property = (axis2_property_t *)
+ /*property = (axis2_property_t *)
AXIS2_WSDL_COMPONENT_GET_COMPONENT_PROPERTY(op_impl->wsdl_op->
- extensible_component->wsdl_component, env, AXIS2_MODULEREF_KEY);
+ extensible_component->wsdl_component, env, AXIS2_MODULEREF_KEY);*/
/* collection_module is the already engaged modules */
- collection_module = (axis2_array_list_t *)
- AXIS2_PROPERTY_GET_VALUE(property, env);
- size = AXIS2_ARRAY_LIST_SIZE(collection_module, env);
+ /*collection_module = (axis2_array_list_t *)
+ AXIS2_PROPERTY_GET_VALUE(property, env);*/
+ collection_module = op_impl->engaged_module_list;
+ if(collection_module)
+ size = AXIS2_ARRAY_LIST_SIZE(collection_module, env);
if(AXIS2_SUCCESS != AXIS2_ERROR_GET_STATUS_CODE(env->error))
{
return AXIS2_ERROR_GET_STATUS_CODE(env->error);
@@ -1109,13 +1120,18 @@
AXIS2_PARAM_CHECK(env->error, module_desc, AXIS2_FAILURE);
op_impl = AXIS2_INTF_TO_IMPL(op);
- property = (axis2_property_t *)
+ /*property = (axis2_property_t *)
AXIS2_WSDL_COMPONENT_GET_COMPONENT_PROPERTY(op_impl->wsdl_op->
extensible_component->wsdl_component, env, AXIS2_MODULEREF_KEY);
collection_module = (axis2_array_list_t *) AXIS2_PROPERTY_GET_VALUE(
property, env);
- size = AXIS2_ARRAY_LIST_SIZE(collection_module, env);
+ */
+ if(!op_impl->engaged_module_list)
+ {
+ op_impl->engaged_module_list = axis2_array_list_create(env, 0);
+ }
+ size = AXIS2_ARRAY_LIST_SIZE(op_impl->engaged_module_list, env);
if(AXIS2_SUCCESS != AXIS2_ERROR_GET_STATUS_CODE(env->error))
{
@@ -1127,7 +1143,7 @@
const axis2_qname_t *module_qname_l = NULL;
module_desc_l = (axis2_module_desc_t *) AXIS2_ARRAY_LIST_GET(
- collection_module, env, index);
+ op_impl->engaged_module_list, env, index);
module_qname_l = AXIS2_MODULE_DESC_GET_QNAME(module_desc_l, env);
if(AXIS2_QNAME_EQUALS(module_qname, env, module_qname_l))
{
@@ -1135,7 +1151,7 @@
}
}
- return AXIS2_ARRAY_LIST_ADD(collection_module, env, module_desc);
+ return AXIS2_ARRAY_LIST_ADD(op_impl->engaged_module_list, env, module_desc);
}
axis2_array_list_t *AXIS2_CALL
@@ -1150,11 +1166,12 @@
AXIS2_ENV_CHECK(env, NULL);
op_impl = AXIS2_INTF_TO_IMPL(op);
- property = (axis2_property_t *)
+ /*property = (axis2_property_t *)
AXIS2_WSDL_COMPONENT_GET_COMPONENT_PROPERTY(op_impl->wsdl_op->
extensible_component->wsdl_component, env, AXIS2_MODULEREF_KEY);
modules = (axis2_array_list_t *) AXIS2_PROPERTY_GET_VALUE(property, env);
- return modules;
+ return modules;*/
+ return op_impl->engaged_module_list;
}
int AXIS2_CALL
Modified: webservices/axis2/trunk/c/modules/core/description/svc.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/description/svc.c?view=diff&rev=441735&r1=441734&r2=441735
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/svc.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/svc.c Fri Sep 8 21:10:15 2006
@@ -1965,7 +1965,7 @@
AXIS2_PARAM_CHECK(env->error, op_desc, AXIS2_FAILURE);
svc_impl = AXIS2_INTF_TO_IMPL(svc);
- axis2_hash_set(svc_impl->op_alias_map, mapping_key,
+ axis2_hash_set(svc_impl->op_action_map, mapping_key,
AXIS2_HASH_KEY_STRING, op_desc);
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/modules/core/engine/engine.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/engine.c?view=diff&rev=441735&r1=441734&r2=441735
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/engine.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/engine.c Fri Sep 8 21:10:15 2006
@@ -395,7 +395,7 @@
return status;
}
- if (AXIS2_MSG_CTX_IS_PAUSED(msg_ctx, env))
+ if (AXIS2_TRUE == AXIS2_MSG_CTX_IS_PAUSED(msg_ctx, env))
{
return AXIS2_SUCCESS;
}
@@ -412,7 +412,7 @@
return status;
}
- if (AXIS2_MSG_CTX_IS_PAUSED(msg_ctx, env))
+ if (AXIS2_TRUE == AXIS2_MSG_CTX_IS_PAUSED(msg_ctx, env))
{
return AXIS2_SUCCESS;
}
@@ -752,7 +752,8 @@
AXIS2_PARAM_CHECK(env->error, phases, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, msg_ctx, AXIS2_FAILURE);
- count = AXIS2_ARRAY_LIST_SIZE(phases, env);
+ if(phases)
+ count = AXIS2_ARRAY_LIST_SIZE(phases, env);
for (i = 0; (i < count && !(AXIS2_MSG_CTX_IS_PAUSED(msg_ctx, env))); i++)
{
axis2_phase_t *phase = (axis2_phase_t *)
Modified: webservices/axis2/trunk/c/modules/core/engine/phase.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/phase.c?view=diff&rev=441735&r1=441734&r2=441735
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/phase.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/phase.c Fri Sep 8 21:10:15 2006
@@ -1209,14 +1209,23 @@
{
int i = 0, size = 0;
axis2_bool_t add_handler = AXIS2_TRUE;
+ axis2_qname_t *handler_qname = NULL;
+ handler_qname = AXIS2_HANDLER_GET_QNAME(handler, env);
size = AXIS2_ARRAY_LIST_SIZE(list, env);
for(i = 0; i < size; i++)
{
axis2_handler_t *obj = NULL;
+ axis2_qname_t *obj_qname = NULL;
- obj = AXIS2_ARRAY_LIST_GET(list, env, i);
+ obj = (axis2_handler_t *) AXIS2_ARRAY_LIST_GET(list, env, i);
+ obj_qname = AXIS2_HANDLER_GET_QNAME(obj, env);
if(obj == handler)
+ {
+ add_handler = AXIS2_FALSE;
+ break;
+ }
+ else if(AXIS2_TRUE == AXIS2_QNAME_EQUALS(handler_qname, env, obj_qname))
{
add_handler = AXIS2_FALSE;
break;
Modified: webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c?view=diff&rev=441735&r1=441734&r2=441735
==============================================================================
--- webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c (original)
+++ webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c Fri Sep 8 21:10:15 2006
@@ -1200,7 +1200,8 @@
AXIS2_QNAME_GET_LOCALPART(AXIS2_OP_GET_QNAME(op_desc, env), env));
modules = AXIS2_OP_GET_ALL_MODULES(op_desc, env);
module_desc_qname = AXIS2_MODULE_DESC_GET_QNAME(module_desc, env);
- size = AXIS2_ARRAY_LIST_SIZE(modules, env);
+ if(modules)
+ size = AXIS2_ARRAY_LIST_SIZE(modules, env);
for(j = 0; j < size; j++)
{
axis2_module_desc_t *module_desc_l = NULL;
@@ -1525,7 +1526,7 @@
axis2_hash_t *ops = NULL;
axis2_hash_index_t *index_i = NULL;
axis2_status_t status = AXIS2_FAILURE;
- const axis2_qname_t *module_d_qname = NULL;
+ axis2_qname_t *module_d_qname = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
resolver_impl = AXIS2_INTF_TO_IMPL(phase_resolver);
@@ -1556,15 +1557,17 @@
axis2_hash_this (index_i, NULL, NULL, &v);
op_desc = (axis2_op_t *) v;
modules = AXIS2_OP_GET_ALL_MODULES(op_desc, env);
- size = AXIS2_ARRAY_LIST_SIZE(modules, env);
+ if(modules)
+ size = AXIS2_ARRAY_LIST_SIZE(modules, env);
for(j = 0; j < size; j++)
{
axis2_module_desc_t *module_desc_l = NULL;
- const axis2_qname_t *module_d_qname_l = NULL;
+ axis2_qname_t *module_d_qname_l = NULL;
module_desc_l = AXIS2_ARRAY_LIST_GET(modules, env, j);
module_d_qname_l = AXIS2_MODULE_DESC_GET_QNAME(module_desc_l, env);
- if(0 == AXIS2_QNAME_EQUALS(module_d_qname, env, module_d_qname_l))
+ if(AXIS2_TRUE == AXIS2_QNAME_EQUALS(module_d_qname, env,
+ module_d_qname_l))
{
engaged = AXIS2_TRUE;
break;
@@ -1713,14 +1716,38 @@
}
}
- else
+ if ((0 == AXIS2_STRCMP(AXIS2_PHASE_TRANSPORTIN, phase_name)) ||
+ (0 == AXIS2_STRCMP(AXIS2_PHASE_DISPATCH, phase_name)) ||
+ (0 == AXIS2_STRCMP(AXIS2_PHASE_POST_DISPATCH, phase_name)) ||
+ (0 == AXIS2_STRCMP(AXIS2_PHASE_PRE_DISPATCH, phase_name)))
{
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "This handler is\
+ axis2_array_list_t *phase_list = NULL;
+ axis2_phase_holder_t *phase_holder = NULL;
+
+ /*AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "This handler is\
trying to added to system pre defined phases , but those\
handlers are already added to global chain which run\
- irrespective of the service");
- /*return AXIS2_FAILURE;*/
+ irrespective of the service");*/
+ /* return AXIS2_FAILURE;*/
+ phase_list =
+ AXIS2_CONF_GET_IN_PHASES_UPTO_AND_INCLUDING_POST_DISPATCH(
+ resolver_impl->axis2_config, env);
+ if(phase_holder)
+ {
+ AXIS2_PHASE_HOLDER_FREE(phase_holder, env);
+ phase_holder = NULL;
+ }
+ phase_holder =
+ axis2_phase_holder_create_with_phases(env, phase_list);
+
+ status = AXIS2_PHASE_HOLDER_ADD_HANDLER(phase_holder, env, metadata);
+ AXIS2_PHASE_HOLDER_FREE(phase_holder, env);
+ phase_holder = NULL;
+ if(AXIS2_SUCCESS != status)
+ {
+ return status;
+ }
}
}
}
Modified: webservices/axis2/trunk/c/modules/core/receivers/msg_recv.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/receivers/msg_recv.c?view=diff&rev=441735&r1=441734&r2=441735
==============================================================================
--- webservices/axis2/trunk/c/modules/core/receivers/msg_recv.c (original)
+++ webservices/axis2/trunk/c/modules/core/receivers/msg_recv.c Fri Sep 8 21:10:15 2006
@@ -446,10 +446,12 @@
}
if (AXIS2_MSG_CTX_GET_SOAP_ENVELOPE(out_msg_ctx, env))
{
- axiom_soap_envelope_t *soap_envelope = AXIS2_MSG_CTX_GET_SOAP_ENVELOPE (out_msg_ctx, env);
+ axiom_soap_envelope_t *soap_envelope = AXIS2_MSG_CTX_GET_SOAP_ENVELOPE (
+ out_msg_ctx, env);
if (soap_envelope)
{
- axiom_soap_body_t *body = AXIOM_SOAP_ENVELOPE_GET_BODY(soap_envelope, env);
+ axiom_soap_body_t *body = AXIOM_SOAP_ENVELOPE_GET_BODY(soap_envelope,
+ env);
if (body)
{
/* in case of a SOAP fault, we got to return failure so that
@@ -457,7 +459,8 @@
if (AXIOM_SOAP_BODY_HAS_FAULT(body, env))
{
status = AXIS2_FAILURE;
- AXIS2_MSG_CTX_SET_FAULT_SOAP_ENVELOPE(msg_ctx, env, soap_envelope);
+ AXIS2_MSG_CTX_SET_FAULT_SOAP_ENVELOPE(msg_ctx, env,
+ soap_envelope);
AXIS2_MSG_CTX_SET_SOAP_ENVELOPE(out_msg_ctx, env, NULL);
}
else
@@ -470,8 +473,10 @@
}
}
AXIS2_ENGINE_FREE(engine, env);
- axis2_core_utils_reset_out_msg_ctx(env, out_msg_ctx);
- AXIS2_MSG_CTX_FREE(out_msg_ctx, env);
+ /* test code: uncomment this when test is over */
+ /*axis2_core_utils_reset_out_msg_ctx(env, out_msg_ctx);
+ AXIS2_MSG_CTX_FREE(out_msg_ctx, env);*/
+ /* end test code */
return status;
}
Modified: webservices/axis2/trunk/c/modules/core/transport/http/http_worker.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/http_worker.c?view=diff&rev=441735&r1=441734&r2=441735
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/http_worker.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/http_worker.c Fri Sep 8 21:10:15 2006
@@ -419,7 +419,7 @@
status = AXIS2_SIMPLE_HTTP_SVR_CONN_WRITE_RESPONSE(svr_conn, env, response);
AXIS2_FREE(env->allocator, url_external_form);
url_external_form = NULL;
- AXIS2_MSG_CTX_FREE(msg_ctx, env);
+ /*AXIS2_MSG_CTX_FREE(msg_ctx, env);*/
msg_ctx = NULL;
AXIS2_URL_FREE(request_url, env);
request_url = NULL;
Modified: webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_svr_thread.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_svr_thread.c?view=diff&rev=441735&r1=441734&r2=441735
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_svr_thread.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_svr_thread.c Fri Sep 8 21:10:15 2006
@@ -367,7 +367,7 @@
secs);
#endif
}
- axis2_env_free_masked(thread_env, 0x2);
+ /*axis2_env_free_masked(thread_env, 0x2);*/
/*axiom_xml_reader_cleanup();*/
#ifdef AXIS2_SVR_MULTI_THREADED
AXIS2_THREAD_POOL_EXIT_THREAD(env->thread_pool, thd);
Modified: webservices/axis2/trunk/c/modules/core/transport/http/sender/soap_over_http_sender.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/sender/soap_over_http_sender.c?view=diff&rev=441735&r1=441734&r2=441735
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/sender/soap_over_http_sender.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/sender/soap_over_http_sender.c Fri Sep 8 21:10:15 2006
@@ -246,7 +246,7 @@
axis2_http_client_free_void_arg);
AXIS2_PROPERTY_SET_VALUE(property, env, sender_impl->client);
AXIS2_MSG_CTX_SET_PROPERTY(msg_ctx, env, AXIS2_HTTP_CLIENT,
- property, AXIS2_TRUE);
+ property, AXIS2_FALSE);
doing_mtom = AXIS2_MSG_CTX_GET_DOING_MTOM(msg_ctx, env);
Modified: webservices/axis2/trunk/c/modules/core/util/core_utils.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/util/core_utils.c?view=diff&rev=441735&r1=441734&r2=441735
==============================================================================
--- webservices/axis2/trunk/c/modules/core/util/core_utils.c (original)
+++ webservices/axis2/trunk/c/modules/core/util/core_utils.c Fri Sep 8 21:10:15 2006
@@ -25,8 +25,9 @@
#include <axis2_conf_ctx.h>
AXIS2_EXTERN axis2_msg_ctx_t * AXIS2_CALL
-axis2_core_utils_create_out_msg_ctx(const axis2_env_t *env,
- axis2_msg_ctx_t *in_msg_ctx)
+axis2_core_utils_create_out_msg_ctx(
+ const axis2_env_t *env,
+ axis2_msg_ctx_t *in_msg_ctx)
{
axis2_msg_ctx_t *new_msg_ctx = NULL;
axis2_conf_ctx_t *conf_ctx = NULL;
@@ -143,11 +144,11 @@
AXIS2_CHARACTER_SET_ENCODING, AXIS2_FALSE);
if(property)
{
- AXIS2_MSG_CTX_SET_PROPERTY(new_msg_ctx, env, AXIS2_CHARACTER_SET_ENCODING,
- property, AXIS2_FALSE);
+ AXIS2_MSG_CTX_SET_PROPERTY(new_msg_ctx, env,
+ AXIS2_CHARACTER_SET_ENCODING, property, AXIS2_FALSE);
property = NULL;
}
-
+
doing_rest = AXIS2_MSG_CTX_GET_DOING_REST(in_msg_ctx, env);
AXIS2_MSG_CTX_SET_DOING_REST(new_msg_ctx, env, doing_rest);
Modified: webservices/axis2/trunk/c/samples/client/rm_ping/rm_ping_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/client/rm_ping/rm_ping_client.c?view=diff&rev=441735&r1=441734&r2=441735
==============================================================================
--- webservices/axis2/trunk/c/samples/client/rm_ping/rm_ping_client.c (original)
+++ webservices/axis2/trunk/c/samples/client/rm_ping/rm_ping_client.c Fri Sep 8 21:10:15 2006
@@ -33,6 +33,7 @@
axis2_svc_client_t* svc_client = NULL;
axiom_node_t *payload = NULL;
axis2_status_t status = AXIS2_FAILURE;
+ axis2_property_t *property = NULL;
/* Set up the environment */
env = axis2_env_create_all("rm_notify.log", AXIS2_LOG_LEVEL_TRACE);
@@ -55,6 +56,7 @@
/* Setup options */
options = axis2_options_create(env);
AXIS2_OPTIONS_SET_TO(options, env, endpoint_ref);
+ /*AXIS2_OPTIONS_SET_USE_SEPARATE_LISTENER(options, env, AXIS2_TRUE);*/
AXIS2_OPTIONS_SET_ACTION(options, env,
"http://example.org/action/notify");
@@ -87,10 +89,16 @@
/* Build the SOAP request message payload using OM API.*/
payload = build_om_programatically(env);
+ AXIS2_SVC_CLIENT_ENGAGE_MODULE(svc_client, env, "sandesha2");
+
+ property = axis2_property_create(env);
+ AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_APPLICATION);
+ AXIS2_PROPERTY_SET_VALUE(property, env, AXIS2_VALUE_TRUE);
+ AXIS2_OPTIONS_SET_PROPERTY(options, env, "Sandesha2LastMessage",
+ property);
/* Send request */
status = AXIS2_SVC_CLIENT_SEND_ROBUST(svc_client, env, payload);
-
if(status == AXIS2_SUCCESS)
{
printf("\nnotify client invoke SUCCESSFUL!\n");
@@ -102,6 +110,7 @@
AXIS2_ERROR_GET_MESSAGE(env->error));
printf("notify client invoke FAILED!\n");
}
+ AXIS2_SLEEP(1000);
if (svc_client)
{
Modified: webservices/axis2/trunk/c/samples/server/rm_ping/services.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/server/rm_ping/services.xml?view=diff&rev=441735&r1=441734&r2=441735
==============================================================================
--- webservices/axis2/trunk/c/samples/server/rm_ping/services.xml (original)
+++ webservices/axis2/trunk/c/samples/server/rm_ping/services.xml Fri Sep 8 21:10:15 2006
@@ -1,4 +1,5 @@
<service name="rm_ping">
+ <module ref="sandesha2"/>
<parameter name="ServiceClass" locked="xsd:false">rm_ping</parameter>
<description>
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org