Author: damitha
Date: Wed Jan 31 04:07:50 2007
New Revision: 501821
URL: http://svn.apache.org/viewvc?view=rev&rev=501821
Log:
Updated with the current changes of axis2c. This just compiles.
rm_ping breaks
Modified:
webservices/sandesha/trunk/c/include/sandesha2_msg_ctx.h
webservices/sandesha/trunk/c/include/sandesha2_msg_store_bean.h
webservices/sandesha/trunk/c/src/client/client.c
webservices/sandesha/trunk/c/src/core/sandesha2_msg_ctx.c
webservices/sandesha/trunk/c/src/handlers/sandesha2_in_handler.c
webservices/sandesha/trunk/c/src/handlers/sandesha2_out_handler.c
webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c
webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c
webservices/sandesha/trunk/c/src/storage/permanent/msg_store_bean.c
webservices/sandesha/trunk/c/src/storage/permanent/permanent_bean_mgr.c
webservices/sandesha/trunk/c/src/storage/permanent/permanent_storage_mgr.c
webservices/sandesha/trunk/c/src/util/fault_mgr.c
webservices/sandesha/trunk/c/src/util/msg_creator.c
webservices/sandesha/trunk/c/src/util/sandesha2_utils.c
webservices/sandesha/trunk/c/src/util/seq_mgr.c
webservices/sandesha/trunk/c/src/util/terminate_mgr.c
Modified: webservices/sandesha/trunk/c/include/sandesha2_msg_ctx.h
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/include/sandesha2_msg_ctx.h?view=diff&rev=501821&r1=501820&r2=501821
==============================================================================
--- webservices/sandesha/trunk/c/include/sandesha2_msg_ctx.h (original)
+++ webservices/sandesha/trunk/c/include/sandesha2_msg_ctx.h Wed Jan 31
04:07:50 2007
@@ -193,7 +193,7 @@
sandesha2_msg_ctx_set_soap_action(
sandesha2_msg_ctx_t *rm_msg_ctx,
const axis2_env_t *env,
- axis2_char_t *soap_action);
+ axis2_string_t *soap_action);
axis2_status_t AXIS2_CALL
sandesha2_msg_ctx_set_paused(
Modified: webservices/sandesha/trunk/c/include/sandesha2_msg_store_bean.h
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/include/sandesha2_msg_store_bean.h?view=diff&rev=501821&r1=501820&r2=501821
==============================================================================
--- webservices/sandesha/trunk/c/include/sandesha2_msg_store_bean.h (original)
+++ webservices/sandesha/trunk/c/include/sandesha2_msg_store_bean.h Wed Jan 31
04:07:50 2007
@@ -18,6 +18,7 @@
#define SANDESHA2_MSG_STORE_BEAN_H
#include <axis2_utils_defines.h>
+#include <axis2_const.h>
#include <axis2_env.h>
#ifdef __cplusplus
@@ -83,7 +84,7 @@
const axis2_env_t *env,
int soap_version);
-axis2_char_t *AXIS2_CALL
+AXIS2_TRANSPORT_ENUMS AXIS2_CALL
sandesha2_msg_store_bean_get_transport_out(
sandesha2_msg_store_bean_t *msg_store_bean,
const axis2_env_t *env);
@@ -92,7 +93,7 @@
sandesha2_msg_store_bean_set_transport_out(
sandesha2_msg_store_bean_t *msg_store_bean,
const axis2_env_t *env,
- axis2_char_t * transport_sender);
+ AXIS2_TRANSPORT_ENUMS transport_sender);
axis2_char_t *AXIS2_CALL
sandesha2_msg_store_bean_get_op(
Modified: webservices/sandesha/trunk/c/src/client/client.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/client/client.c?view=diff&rev=501821&r1=501820&r2=501821
==============================================================================
--- webservices/sandesha/trunk/c/src/client/client.c (original)
+++ webservices/sandesha/trunk/c/src/client/client.c Wed Jan 31 04:07:50 2007
@@ -1772,7 +1772,7 @@
axis2_svc_t *svc = NULL;
axis2_op_t *op = NULL;
axis2_callback_recv_t *callback_recv = NULL;
- const axis2_char_t *transport_in_protocol = NULL;
+ AXIS2_TRANSPORT_ENUMS transport_in_protocol = -1;
if(!op_qname)
op_qname = axis2_qname_create(env, AXIS2_ANON_OUT_IN_OP, NULL, NULL);
@@ -1792,9 +1792,7 @@
AXIS2_OP_CLIENT_SET_CALLBACK(op_client, env, callback);
AXIS2_OP_CLIENT_ADD_OUT_MSG_CTX(op_client, env, msg_ctx);
transport_in_protocol = AXIS2_OPTIONS_GET_TRANSPORT_IN_PROTOCOL(
- options, env);
- if (!transport_in_protocol)
- transport_in_protocol = AXIS2_TRANSPORT_HTTP;
+ options, env);
AXIS2_LISTNER_MANAGER_MAKE_SURE_STARTED(listener_manager, env,
transport_in_protocol, conf_ctx);
callback_recv = axis2_callback_recv_create(env);
@@ -1827,7 +1825,7 @@
axis2_svc_t *svc = NULL;
axis2_op_t *op = NULL;
axis2_callback_recv_t *callback_recv = NULL;
- const axis2_char_t *transport_in_protocol = NULL;
+ AXIS2_TRANSPORT_ENUMS transport_in_protocol = -1;
axis2_bool_t block = AXIS2_TRUE;
if (!op_qname)
@@ -1854,8 +1852,6 @@
/*AXIS2_OP_CLIENT_ADD_OUT_MSG_CTX(op_client, env, msg_ctx);*/
transport_in_protocol = AXIS2_OPTIONS_GET_TRANSPORT_IN_PROTOCOL(
options, env);
- if (!transport_in_protocol)
- transport_in_protocol = AXIS2_TRANSPORT_HTTP;
AXIS2_LISTNER_MANAGER_MAKE_SURE_STARTED(listener_manager, env,
transport_in_protocol, conf_ctx);
callback_recv = axis2_callback_recv_create(env);
Modified: webservices/sandesha/trunk/c/src/core/sandesha2_msg_ctx.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/core/sandesha2_msg_ctx.c?view=diff&rev=501821&r1=501820&r2=501821
==============================================================================
--- webservices/sandesha/trunk/c/src/core/sandesha2_msg_ctx.c (original)
+++ webservices/sandesha/trunk/c/src/core/sandesha2_msg_ctx.c Wed Jan 31
04:07:50 2007
@@ -407,7 +407,8 @@
axis2_status_t AXIS2_CALL
sandesha2_msg_ctx_set_soap_action(
sandesha2_msg_ctx_t *rm_msg_ctx,
- const axis2_env_t *env, axis2_char_t *soap_action)
+ const axis2_env_t *env,
+ axis2_string_t *soap_action)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, soap_action, AXIS2_FAILURE);
@@ -415,8 +416,8 @@
if(NULL == rm_msg_ctx->msg_ctx)
return AXIS2_FAILURE;
- return AXIS2_MSG_CTX_SET_SOAP_ACTION(rm_msg_ctx->msg_ctx, env,
- soap_action);
+ return axis2_msg_ctx_set_soap_action(rm_msg_ctx->msg_ctx, env,
+ soap_action);
}
axis2_status_t AXIS2_CALL
Modified: webservices/sandesha/trunk/c/src/handlers/sandesha2_in_handler.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/handlers/sandesha2_in_handler.c?view=diff&rev=501821&r1=501820&r2=501821
==============================================================================
--- webservices/sandesha/trunk/c/src/handlers/sandesha2_in_handler.c (original)
+++ webservices/sandesha/trunk/c/src/handlers/sandesha2_in_handler.c Wed Jan 31
04:07:50 2007
@@ -33,8 +33,8 @@
#include <sandesha2_seq_ack.h>
#include <sandesha2_ack_requested.h>
-static const axis2_qname_t *AXIS2_CALL
-sandesha2_in_handler_get_qname(
+static const axis2_string_t *AXIS2_CALL
+sandesha2_in_handler_get_name(
const struct axis2_handler *handler,
const axis2_env_t *env);
@@ -67,7 +67,7 @@
if (handler->ops)
handler->ops->invoke = sandesha2_in_handler_invoke;
if (handler->ops)
- handler->ops->get_qname = sandesha2_in_handler_get_qname;
+ handler->ops->get_name = sandesha2_in_handler_get_name;
return handler;
}
@@ -246,12 +246,11 @@
return AXIS2_SUCCESS;
}
-static const axis2_qname_t *AXIS2_CALL
-sandesha2_in_handler_get_qname(
+static const axis2_string_t *AXIS2_CALL
+sandesha2_in_handler_get_name(
const struct axis2_handler *handler,
const axis2_env_t *env)
{
- return (axis2_qname_t *) axis2_qname_create(env,
SANDESHA2_IN_HANDLER_NAME,
- NULL, NULL);
+ return axis2_string_create(env, SANDESHA2_IN_HANDLER_NAME);
}
Modified: webservices/sandesha/trunk/c/src/handlers/sandesha2_out_handler.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/handlers/sandesha2_out_handler.c?view=diff&rev=501821&r1=501820&r2=501821
==============================================================================
--- webservices/sandesha/trunk/c/src/handlers/sandesha2_out_handler.c (original)
+++ webservices/sandesha/trunk/c/src/handlers/sandesha2_out_handler.c Wed Jan
31 04:07:50 2007
@@ -32,8 +32,8 @@
#include <sandesha2_app_msg_processor.h>
#include <sandesha2_client_constants.h>
-axis2_qname_t *AXIS2_CALL
-sandesha2_out_handler_get_qname(
+axis2_string_t *AXIS2_CALL
+sandesha2_out_handler_get_name(
struct axis2_handler *handler,
const axis2_env_t *env);
@@ -241,12 +241,11 @@
return AXIS2_SUCCESS;
}
-axis2_qname_t *AXIS2_CALL
-sandesha2_out_handler_get_qname(
+axis2_string_t *AXIS2_CALL
+sandesha2_out_handler_get_name(
struct axis2_handler *handler,
const axis2_env_t *env)
{
- return (axis2_qname_t *) axis2_qname_create(env,
SANDESHA2_OUT_HANDLER_NAME,
- NULL, NULL);
+ return axis2_string_create(env, SANDESHA2_OUT_HANDLER_NAME);
}
Modified: webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c?view=diff&rev=501821&r1=501820&r2=501821
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c
(original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c Wed Jan
31 04:07:50 2007
@@ -878,11 +878,14 @@
"/", op_name, NULL));*/
if(!AXIS2_MSG_CTX_GET_WSA_ACTION(msg_ctx, env))
AXIS2_MSG_CTX_SET_WSA_ACTION(msg_ctx, env, to_addr);
- /*if(!AXIS2_MSG_CTX_GET_SOAP_ACTION(msg_ctx, env))
- AXIS2_MSG_CTX_SET_SOAP_ACTION(msg_ctx, env, axis2_strcat(env, "\"",
+ /*if(!axis2_msg_ctx_get_soap_action(msg_ctx, env))
+ axis2_msg_ctx_set_soap_action(msg_ctx, env, axis2_strcat(env, "\"",
to_addr, "/", op_name, "\"", NULL));*/
- if(!AXIS2_MSG_CTX_GET_SOAP_ACTION(msg_ctx, env))
- AXIS2_MSG_CTX_SET_SOAP_ACTION(msg_ctx, env, to_addr);
+ if(!axis2_msg_ctx_get_soap_action(msg_ctx, env))
+ {
+ axis2_string_t *soap_action = axis2_string_create(env, to_addr);
+ axis2_msg_ctx_set_soap_action(msg_ctx, env, soap_action);
+ }
/* end test code */
if(!dummy_msg)
Modified:
webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c?view=diff&rev=501821&r1=501820&r2=501821
==============================================================================
---
webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c
(original)
+++
webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c
Wed Jan 31 04:07:50 2007
@@ -499,6 +499,8 @@
axis2_transport_out_desc_t *sandesha2_out_desc = NULL;
axis2_engine_t *engine = NULL;
axis2_transport_sender_t *transport_sender = NULL;
+ axis2_char_t *temp_action = NULL;
+ axis2_string_t *soap_action = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, rm_msg_ctx, AXIS2_FAILURE);
@@ -571,9 +573,10 @@
AXIS2_MSG_CTX_SET_WSA_ACTION(msg_ctx, env,
sandesha2_spec_specific_consts_get_terminate_seq_action(
env, rm_version));
- AXIS2_MSG_CTX_SET_SOAP_ACTION(msg_ctx, env,
-
sandesha2_spec_specific_consts_get_terminate_seq_soap_action
- (env, rm_version));
+ temp_action = sandesha2_spec_specific_consts_get_terminate_seq_soap_action
+ (env, rm_version);
+ soap_action = axis2_string_create(env, temp_action);
+ axis2_msg_ctx_set_soap_action(msg_ctx, env, soap_action);
transport_to = sandesha2_utils_get_seq_property(env, int_seq_id,
SANDESHA2_SEQ_PROP_TRANSPORT_TO, storage_mgr);
Modified: webservices/sandesha/trunk/c/src/storage/permanent/msg_store_bean.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/permanent/msg_store_bean.c?view=diff&rev=501821&r1=501820&r2=501821
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/permanent/msg_store_bean.c
(original)
+++ webservices/sandesha/trunk/c/src/storage/permanent/msg_store_bean.c Wed Jan
31 04:07:50 2007
@@ -17,6 +17,7 @@
#include <sandesha2_msg_store_bean.h>
#include <axis2_string.h>
#include <axis2_utils.h>
+#include <axis2_const.h>
/**
* Defines a set of properties which extracted from a Message Context
@@ -34,7 +35,7 @@
int soap_version;
- axis2_char_t * transport_out;
+ AXIS2_TRANSPORT_ENUMS transport_out;
axis2_char_t * op;
@@ -83,7 +84,7 @@
msg_store_bean->msg_id = NULL;
msg_store_bean->soap_env_str = NULL;
msg_store_bean->soap_version = -1;
- msg_store_bean->transport_out = NULL;
+ msg_store_bean->transport_out = -1;
msg_store_bean->op = NULL;
msg_store_bean->svc = NULL;
msg_store_bean->svc_grp = NULL;
@@ -182,7 +183,7 @@
msg_store_bean->soap_version = soap_version;
}
-axis2_char_t *AXIS2_CALL
+AXIS2_TRANSPORT_ENUMS AXIS2_CALL
sandesha2_msg_store_bean_get_transport_out(
sandesha2_msg_store_bean_t *msg_store_bean,
const axis2_env_t *env)
@@ -194,9 +195,9 @@
sandesha2_msg_store_bean_set_transport_out(
sandesha2_msg_store_bean_t *msg_store_bean,
const axis2_env_t *env,
- axis2_char_t * transport_sender)
+ AXIS2_TRANSPORT_ENUMS transport_sender)
{
- msg_store_bean->transport_out = AXIS2_STRDUP(transport_sender, env);
+ msg_store_bean->transport_out = transport_sender;
}
axis2_char_t *AXIS2_CALL
Modified:
webservices/sandesha/trunk/c/src/storage/permanent/permanent_bean_mgr.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/permanent/permanent_bean_mgr.c?view=diff&rev=501821&r1=501820&r2=501821
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/permanent/permanent_bean_mgr.c
(original)
+++ webservices/sandesha/trunk/c/src/storage/permanent/permanent_bean_mgr.c Wed
Jan 31 04:07:50 2007
@@ -85,7 +85,7 @@
sandesha2_msg_store_bean_set_soap_version(bean, env,
AXIS2_ATOI(argv[i]));
if(0 == AXIS2_STRCMP(col_name[i], "transport_out"))
if(argv[i])
- sandesha2_msg_store_bean_set_transport_out(bean, env, argv[i]);
+ sandesha2_msg_store_bean_set_transport_out(bean, env,
AXIS2_ATOI(argv[i]));
if(0 == AXIS2_STRCMP(col_name[i], "op"))
if(argv[i])
sandesha2_msg_store_bean_set_op(bean, env, argv[i]);
@@ -735,7 +735,7 @@
axis2_char_t *svc_grp = NULL;
axis2_char_t *svc = NULL;
axis2_char_t *op = NULL;
- axis2_char_t *transport_out = NULL;
+ AXIS2_TRANSPORT_ENUMS transport_out = -1;
axis2_char_t *op_mep = NULL;
axis2_char_t *to_url = NULL;
axis2_char_t *reply_to = NULL;
@@ -773,7 +773,7 @@
AXIS2_LOG_INFO(env->log,
"[sandesha2]Entry:sandesha2_permanent_bean_mgr_insert_msg_store_bean");
sql_size = AXIS2_STRLEN(msg_id) + AXIS2_STRLEN(stored_key) +
- AXIS2_STRLEN(soap_env_str) + sizeof(int) + AXIS2_STRLEN(transport_out)
+
+ AXIS2_STRLEN(soap_env_str) + sizeof(int) + sizeof(int) +
AXIS2_STRLEN(op) + AXIS2_STRLEN(svc) + AXIS2_STRLEN(svc_grp) +
AXIS2_STRLEN(op_mep) + AXIS2_STRLEN(to_url) + AXIS2_STRLEN(reply_to) +
AXIS2_STRLEN(transport_to) + AXIS2_STRLEN(execution_chain_str) +
sizeof(int) +
@@ -818,7 +818,7 @@
{
sql_stmt_update = AXIS2_MALLOC(env->allocator, sql_size);
sprintf(sql_stmt_update, "update msg set msg_id='%s',"\
- "soap_env_str='%s', soap_version=%d, transport_out='%s', op='%s',"\
+ "soap_env_str='%s', soap_version=%d, transport_out='%d', op='%s',"\
"svc='%s', svc_grp='%s', op_mep='%s', to_url='%s',"\
"transport_to='%s', reply_to='%s', execution_chain_str='%s',"\
"flow=%d, msg_recv_str='%s', svr_side='%d',
in_msg_store_key='%s',"\
@@ -852,7 +852,7 @@
"soap_env_str, soap_version, transport_out, op, svc, svc_grp, op_mep,"\
"to_url, reply_to,transport_to, execution_chain_str, flow,"\
"msg_recv_str, svr_side, in_msg_store_key, prop_str, action) "\
- "values('%s', '%s', '%s', %d, '%s', '%s', '%s', '%s', '%s', '%s',"\
+ "values('%s', '%s', '%s', %d, '%d', '%s', '%s', '%s', '%s', '%s',"\
"'%s', '%s', '%s', %d, '%s', %d, '%s', '%s', '%s')", stored_key,
msg_id,
soap_env_str, soap_version, transport_out, op, svc, svc_grp, op_mep,
to_url, reply_to, transport_to, execution_chain_str, flow,
msg_recv_str,
Modified:
webservices/sandesha/trunk/c/src/storage/permanent/permanent_storage_mgr.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/permanent/permanent_storage_mgr.c?view=diff&rev=501821&r1=501820&r2=501821
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/permanent/permanent_storage_mgr.c
(original)
+++ webservices/sandesha/trunk/c/src/storage/permanent/permanent_storage_mgr.c
Wed Jan 31 04:07:50 2007
@@ -43,6 +43,7 @@
#include <axis2_msg_ctx.h>
#include <axis2_uuid_gen.h>
#include <axis2_conf_ctx.h>
+#include <axis2_const.h>
#include <axis2_svc_ctx.h>
#include <axis2_options.h>
#include <axis2_addr.h>
@@ -659,10 +660,9 @@
op = AXIS2_MSG_CTX_GET_OP(msg_ctx, env);
if(transport_out_desc)
{
- axis2_qname_t *qname = (axis2_qname_t *)
AXIS2_TRANSPORT_OUT_DESC_GET_QNAME(
+ AXIS2_TRANSPORT_ENUMS transport_out =
AXIS2_TRANSPORT_OUT_DESC_GET_ENUM(
transport_out_desc, env);
- axis2_char_t *str_qname = axis2_qname_to_string(qname, env);
- sandesha2_msg_store_bean_set_transport_out(bean, env, str_qname);
+ sandesha2_msg_store_bean_set_transport_out(bean, env, transport_out);
}
if(svc_grp)
{
@@ -768,7 +768,7 @@
axis2_conf_t *conf = NULL;
axis2_svc_grp_t *svc_grp = NULL;
axis2_svc_t *svc = NULL;
- axis2_char_t *transport_out_str = NULL;
+ AXIS2_TRANSPORT_ENUMS transport_out = -1;
axis2_char_t *soap_env_str = NULL;
axis2_char_t *svc_grp_name_str = NULL;
axis2_char_t *svc_name_str = NULL;
@@ -778,6 +778,7 @@
axis2_char_t *reply_to_str = NULL;
axis2_char_t *transport_to_str = NULL;
axis2_char_t *persistent_prop_str = NULL;
+ axis2_transport_out_desc_t *transport_out_desc = NULL;
axis2_endpoint_ref_t *endpoint_ref = NULL;
axis2_op_t *op = NULL;
axis2_property_t *property = NULL;
@@ -831,16 +832,10 @@
* axis2_msg_ctx_set_msg_id(msg_ctx, env, axis2_uuid_gen(env));*/
conf = AXIS2_CONF_CTX_GET_CONF(conf_ctx, env);
- transport_out_str = sandesha2_msg_store_bean_get_transport_out(
- msg_store_bean, env);
- if (transport_out_str != NULL)
- {
- axis2_transport_out_desc_t *transport_out = NULL;
- axis2_qname_t *transport_out_qname =
axis2_qname_create_from_string(env,
- transport_out_str);
- transport_out = AXIS2_CONF_GET_TRANSPORT_OUT(conf, env,
transport_out_qname);
- AXIS2_MSG_CTX_SET_TRANSPORT_OUT_DESC(msg_ctx, env, transport_out);
- }
+ transport_out = sandesha2_msg_store_bean_get_transport_out(msg_store_bean,
+ env);
+ transport_out_desc = AXIS2_CONF_GET_TRANSPORT_OUT(conf, env,
transport_out);
+ AXIS2_MSG_CTX_SET_TRANSPORT_OUT_DESC(msg_ctx, env, transport_out_desc);
svc_grp_name_str = sandesha2_msg_store_bean_get_svc_grp(msg_store_bean,
env);
if(svc_grp_name_str)
{
Modified: webservices/sandesha/trunk/c/src/util/fault_mgr.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/fault_mgr.c?view=diff&rev=501821&r1=501820&r2=501821
==============================================================================
--- webservices/sandesha/trunk/c/src/util/fault_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/util/fault_mgr.c Wed Jan 31 04:07:50 2007
@@ -402,6 +402,7 @@
axis2_op_ctx_t *op_ctx = NULL;
axis2_char_t *acks_to_str = NULL;
axis2_char_t *anon_uri = NULL;
+ axis2_string_t *grp_ctx_id = NULL;
int soap_ver = -1;
sandesha2_msg_ctx_t *fault_rm_msg = NULL;
@@ -424,8 +425,9 @@
AXIS2_MSG_CTX_GET_SVC_GRP_CTX(ref_msg, env));
AXIS2_MSG_CTX_SET_SVC_CTX(fault_msg_ctx, env, AXIS2_MSG_CTX_GET_SVC_CTX(
ref_msg, env));
- AXIS2_MSG_CTX_SET_SVC_GRP_CTX_ID(fault_msg_ctx, env,
- AXIS2_MSG_CTX_GET_SVC_GRP_CTX_ID(ref_msg, env));
+ grp_ctx_id = (axis2_string_t *) axis2_msg_ctx_get_svc_grp_ctx_id(ref_msg,
+ env);
+ axis2_msg_ctx_set_svc_grp_ctx_id(fault_msg_ctx, env, grp_ctx_id);
AXIS2_MSG_CTX_SET_SVC_CTX_ID(fault_msg_ctx, env,
AXIS2_MSG_CTX_GET_SVC_CTX_ID(ref_msg, env));
op = axis2_op_create(env);
Modified: webservices/sandesha/trunk/c/src/util/msg_creator.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/msg_creator.c?view=diff&rev=501821&r1=501820&r2=501821
==============================================================================
--- webservices/sandesha/trunk/c/src/util/msg_creator.c (original)
+++ webservices/sandesha/trunk/c/src/util/msg_creator.c Wed Jan 31 04:07:50 2007
@@ -94,7 +94,7 @@
axis2_char_t *anonymous_uri = NULL;
axis2_char_t *temp_value = NULL;
axis2_char_t *temp_action = NULL;
- axis2_char_t *temp_soap_action = NULL;
+ axis2_string_t *temp_soap_action = NULL;
axis2_endpoint_ref_t *to_epr = NULL;
axis2_endpoint_ref_t *temp_to = NULL;
axis2_endpoint_ref_t *reply_to_epr = NULL;
@@ -267,8 +267,9 @@
temp_action = sandesha2_spec_specific_consts_get_create_seq_action(env,
rm_version);
sandesha2_msg_ctx_set_wsa_action(create_seq_rm_msg, env, temp_action);
- temp_soap_action =
sandesha2_spec_specific_consts_get_create_seq_action(env,
- rm_version);
+ /*temp_soap_action =
sandesha2_spec_specific_consts_get_create_seq_action(env,
+ rm_version);*/
+ temp_soap_action = axis2_string_create(env, temp_action);
sandesha2_msg_ctx_set_soap_action(create_seq_rm_msg, env,
temp_soap_action);
sandesha2_msg_creator_finalize_creation(env, application_msg_ctx,
create_seq_msg_ctx);
@@ -299,6 +300,7 @@
axis2_char_t *addressing_ns_value = NULL;
axis2_char_t *new_msg_id = NULL;
axis2_char_t *temp_action = NULL;
+ axis2_string_t *soap_action = NULL;
axiom_soap_envelope_t *envelope = NULL;
axiom_soap_envelope_t *temp_envelope = NULL;
axiom_soap_body_t *temp_soap_body = NULL;
@@ -366,11 +368,12 @@
sandesha2_iom_rm_element_t *) response, env, temp_om_node);
temp_action = sandesha2_spec_specific_consts_get_create_seq_res_action(
env, rm_version);
- AXIS2_MSG_CTX_SET_WSA_ACTION(out_msg, env, temp_action);
- temp_action =
+ axis2_msg_ctx_set_wsa_action(out_msg, env, temp_action);
+ /*temp_action =
sandesha2_spec_specific_consts_get_create_seq_res_action(env,
- rm_version);
- AXIS2_MSG_CTX_SET_SOAP_ACTION(out_msg, env, temp_action);
+ rm_version);*/
+ soap_action = axis2_string_create(env, temp_action);
+ axis2_msg_ctx_set_soap_action(out_msg, env, soap_action);
ctx = AXIS2_MSG_CTX_GET_BASE(out_msg, env);
prop = AXIS2_CTX_GET_PROPERTY(ctx, env, AXIS2_WSA_VERSION, AXIS2_FALSE);
if(prop)
@@ -416,6 +419,7 @@
axis2_char_t *rm_version = NULL;
axis2_char_t *ns = NULL;
axis2_char_t *temp_action = NULL;
+ axis2_string_t *soap_action = NULL;
axis2_char_t *seq_id = NULL;
axiom_soap_envelope_t *envelope = NULL;
axiom_soap_envelope_t *temp_envelope = NULL;
@@ -448,11 +452,12 @@
rm_version = sandesha2_utils_get_rm_version(env, seq_id, storage_mgr);
temp_action = sandesha2_spec_specific_consts_get_close_seq_res_action(
env, rm_version);
- AXIS2_MSG_CTX_SET_WSA_ACTION(out_msg, env, temp_action);
+ axis2_msg_ctx_set_wsa_action(out_msg, env, temp_action);
temp_action =
sandesha2_spec_specific_consts_get_close_seq_res_action(env,
rm_version);
- AXIS2_MSG_CTX_SET_SOAP_ACTION(out_msg, env, temp_action);
+ soap_action = axis2_string_create(env, temp_action);
+ axis2_msg_ctx_set_soap_action(out_msg, env, soap_action);
temp_msg_ctx = sandesha2_msg_ctx_get_msg_ctx(close_seq_msg, env);
@@ -624,6 +629,8 @@
sandesha2_identifier_t *identifier = NULL;
axiom_soap_envelope_t *soap_envelope = NULL;
axis2_char_t *rm_version = NULL;
+ axis2_char_t *temp_action = NULL;
+ axis2_string_t *soap_action = NULL;
res_rm_msg = sandesha2_msg_ctx_create(env, out_msg);
terminate_seq = (sandesha2_terminate_seq_t*)sandesha2_msg_ctx_get_msg_part(
@@ -648,12 +655,13 @@
(sandesha2_iom_rm_part_t*)terminate_seq_res);
rm_version = sandesha2_utils_get_rm_version(env, seq_id, storage_mgr);
- AXIS2_MSG_CTX_SET_WSA_ACTION(out_msg, env,
-
sandesha2_spec_specific_consts_get_teminate_seq_res_action(
- env, rm_version));
- AXIS2_MSG_CTX_SET_SOAP_ACTION(out_msg, env,
+ axis2_msg_ctx_set_wsa_action(out_msg, env,
sandesha2_spec_specific_consts_get_teminate_seq_res_action(
env, rm_version));
+ temp_action = sandesha2_spec_specific_consts_get_teminate_seq_res_action(
+ env, rm_version);
+ soap_action = axis2_string_create(env, temp_action);
+ axis2_msg_ctx_set_soap_action(out_msg, env, soap_action);
sandesha2_msg_creator_init_creation(env, sandesha2_msg_ctx_get_msg_ctx(
ref_rm_msg, env), out_msg);
sandesha2_msg_ctx_add_soap_envelope(ref_rm_msg, env);
@@ -869,7 +877,8 @@
axis2_char_t *rm_ns_value = NULL;
axis2_char_t *msg_no_list = NULL;
axis2_char_t *ack_req_action = NULL;
- axis2_char_t *ack_req_soap_action = NULL;
+ axis2_char_t *temp_action = NULL;
+ axis2_string_t *ack_req_soap_action = NULL;
axis2_char_t *str_value = NULL;
axis2_char_t *uuid = NULL;
sandesha2_identifier_t *id = NULL;
@@ -949,9 +958,10 @@
ack_req_action = sandesha2_spec_specific_consts_get_seq_ack_action(env,
rm_version);
sandesha2_msg_ctx_set_wsa_action(app_msg, env, ack_req_action);
- ack_req_soap_action =
+ temp_action =
sandesha2_spec_specific_consts_get_seq_ack_soap_action(env,
rm_version);
+ ack_req_soap_action = axis2_string_create(env, temp_action);
sandesha2_msg_ctx_set_soap_action(app_msg, env, ack_req_soap_action);
uuid = axis2_uuid_gen(env);
sandesha2_msg_ctx_set_msg_id(app_msg, env, uuid);
Modified: webservices/sandesha/trunk/c/src/util/sandesha2_utils.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/sandesha2_utils.c?view=diff&rev=501821&r1=501820&r2=501821
==============================================================================
--- webservices/sandesha/trunk/c/src/util/sandesha2_utils.c (original)
+++ webservices/sandesha/trunk/c/src/util/sandesha2_utils.c Wed Jan 31 04:07:50
2007
@@ -452,13 +452,11 @@
{
axis2_transport_out_desc_t *out_desc = NULL;
axis2_transport_sender_t *transport_sender = NULL;
- axis2_qname_t *qname = NULL;
AXIS2_ENV_CHECK(env, NULL);
transport_sender = sandesha2_transport_sender_create(env);
- qname = axis2_qname_create(env, "Sandesha2TransportOutDesc", NULL, NULL);
- out_desc = axis2_transport_out_desc_create_with_qname(env, qname);
+ out_desc = axis2_transport_out_desc_create(env, AXIS2_TRANSPORT_ENUM_HTTP);
AXIS2_TRANSPORT_OUT_DESC_SET_SENDER(out_desc, env, transport_sender);
return out_desc;
}
Modified: webservices/sandesha/trunk/c/src/util/seq_mgr.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/seq_mgr.c?view=diff&rev=501821&r1=501820&r2=501821
==============================================================================
--- webservices/sandesha/trunk/c/src/util/seq_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/util/seq_mgr.c Wed Jan 31 04:07:50 2007
@@ -324,7 +324,7 @@
sandesha2_seq_property_bean_t *acks_to_bean = NULL;
axis2_ctx_t *ctx = NULL;
/*axis2_options_t *options = NULL;*/
- axis2_char_t *transport_in_protocol = NULL;
+ AXIS2_TRANSPORT_ENUMS transport_in_protocol = -1;
axis2_listener_manager_t *listener_manager = NULL;
sandesha2_seq_property_bean_t *msgs_bean = NULL;
axis2_char_t *transport_to = NULL;
@@ -447,8 +447,7 @@
*/
/*options = AXIS2_CTX_GET_OPTIONS(ctx, env);
transport_in_protocol =
AXIS2_OPTIONS_GET_TRANSPORT_IN_PROTOCOL(options, env);*/
- if (!transport_in_protocol)
- transport_in_protocol = AXIS2_TRANSPORT_HTTP;
+ transport_in_protocol = AXIS2_TRANSPORT_ENUM_HTTP;
AXIS2_LISTNER_MANAGER_MAKE_SURE_STARTED(listener_manager, env,
transport_in_protocol, conf_ctx);
Modified: webservices/sandesha/trunk/c/src/util/terminate_mgr.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/terminate_mgr.c?view=diff&rev=501821&r1=501820&r2=501821
==============================================================================
--- webservices/sandesha/trunk/c/src/util/terminate_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/util/terminate_mgr.c Wed Jan 31 04:07:50
2007
@@ -606,6 +606,8 @@
axis2_transport_out_desc_t *transport_out = NULL;
axis2_msg_ctx_t *msg_ctx1 = NULL;
axis2_engine_t *engine = NULL;
+ axis2_char_t *temp_action = NULL;
+ axis2_string_t *soap_action = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, rm_msg_ctx, AXIS2_FAILURE);
@@ -655,9 +657,10 @@
sandesha2_msg_ctx_set_wsa_action(terminate_rm_msg, env,
sandesha2_spec_specific_consts_get_terminate_seq_action(
env, rm_ver));
- sandesha2_msg_ctx_set_soap_action(terminate_rm_msg, env,
-
sandesha2_spec_specific_consts_get_terminate_seq_soap_action
- (env, rm_ver));
+ temp_action = sandesha2_spec_specific_consts_get_terminate_seq_soap_action
+ (env, rm_ver);
+ soap_action = axis2_string_create(env, temp_action);
+ sandesha2_msg_ctx_set_soap_action(terminate_rm_msg, env, soap_action);
transport_to_bean = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr, env,
int_seq_id, SANDESHA2_SEQ_PROP_TRANSPORT_TO);
if(transport_to_bean)
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
