You are viewing a plain text version of this content. The canonical link for it is here.
Posted to sandesha-dev@ws.apache.org by da...@apache.org on 2008/01/21 23:25:26 UTC
svn commit: r614032 [2/6] - in /webservices/sandesha/trunk/c: include/
src/client/ src/core/ src/handlers/ src/msgprocessors/ src/util/
src/workers/ src/wsrm/
Modified: webservices/sandesha/trunk/c/src/msgprocessors/close_seq_msg_processor.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/msgprocessors/close_seq_msg_processor.c?rev=614032&r1=614031&r2=614032&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/close_seq_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/close_seq_msg_processor.c Mon Jan 21 14:25:17 2008
@@ -168,8 +168,7 @@
next_msg_mgr = sandesha2_permanent_next_msg_mgr_create(env, dbname);
if(dbname)
AXIS2_FREE(env->allocator, dbname);
- close_seq = (sandesha2_close_seq_t*)sandesha2_msg_ctx_get_msg_part(
- rm_msg_ctx, env, SANDESHA2_MSG_PART_CLOSE_SEQ);
+ close_seq = sandesha2_msg_ctx_get_close_seq(rm_msg_ctx, env);
seq_id = sandesha2_identifier_get_identifier(
sandesha2_close_seq_get_identifier(close_seq, env), env);
@@ -217,16 +216,13 @@
axis2_msg_ctx_get_soap_envelope(msg_ctx, env)));
axis2_msg_ctx_set_soap_envelope(ack_msg_ctx, env, envelope);
- seq_ack = (sandesha2_seq_ack_t*)sandesha2_msg_ctx_get_msg_part(ack_rm_msg,
- env, SANDESHA2_MSG_PART_SEQ_ACKNOWLEDGEMENT);
+ seq_ack = sandesha2_msg_ctx_get_seq_ack(ack_rm_msg, env);
close_seq_res_msg = sandesha2_utils_create_out_msg_ctx(env, msg_ctx);
close_seq_res_rm_msg = sandesha2_msg_creator_create_close_seq_res_msg(env,
rm_msg_ctx, close_seq_res_msg, seq_prop_mgr);
- sandesha2_msg_ctx_set_msg_part(close_seq_res_rm_msg, env,
- SANDESHA2_MSG_PART_SEQ_ACKNOWLEDGEMENT,
- (sandesha2_iom_rm_part_t*)seq_ack);
+ sandesha2_msg_ctx_set_seq_ack(close_seq_res_rm_msg, env, seq_ack);
sandesha2_msg_ctx_set_flow(close_seq_res_rm_msg, env, AXIS2_OUT_FLOW);
property = axutil_property_create_with_args(env, 0, 0, 0,
AXIS2_VALUE_TRUE);
Modified: webservices/sandesha/trunk/c/src/msgprocessors/create_seq_msg_processor.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/msgprocessors/create_seq_msg_processor.c?rev=614032&r1=614031&r2=614032&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/create_seq_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/create_seq_msg_processor.c Mon Jan 21 14:25:17 2008
@@ -177,8 +177,7 @@
"[sandesha2] Start:sandesha2_create_seq_msg_processor_process_in_msg");
msg_ctx = sandesha2_msg_ctx_get_msg_ctx(rm_msg_ctx, env);
- create_seq_part = (sandesha2_create_seq_t*)sandesha2_msg_ctx_get_msg_part(
- rm_msg_ctx, env, SANDESHA2_MSG_PART_CREATE_SEQ);
+ create_seq_part = sandesha2_msg_ctx_get_create_seq(rm_msg_ctx, env);
if(!create_seq_part)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[sandesha2]create_seq_part"
@@ -243,9 +242,8 @@
sandesha2_msg_ctx_set_property(create_seq_res_msg, env,
SANDESHA2_APPLICATION_PROCESSING_DONE, property);
- create_seq_res_part = (sandesha2_create_seq_res_t*)
- sandesha2_msg_ctx_get_msg_part(create_seq_res_msg,
- env, SANDESHA2_MSG_PART_CREATE_SEQ_RESPONSE);
+ create_seq_res_part = sandesha2_msg_ctx_get_create_seq_res(
+ create_seq_res_msg, env);
seq_offer = sandesha2_create_seq_get_seq_offer(create_seq_part,
env);
/* Offer processing */
Modified: webservices/sandesha/trunk/c/src/msgprocessors/create_seq_res_msg_processor.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/msgprocessors/create_seq_res_msg_processor.c?rev=614032&r1=614031&r2=614032&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/create_seq_res_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/create_seq_res_msg_processor.c Mon Jan 21 14:25:17 2008
@@ -195,16 +195,14 @@
dbname = sandesha2_util_get_dbname(env, conf_ctx);
storage_mgr = sandesha2_utils_get_storage_mgr(env, dbname);
- seq_ack = (sandesha2_seq_ack_t*)sandesha2_msg_ctx_get_msg_part(rm_msg_ctx,
- env, SANDESHA2_MSG_PART_SEQ_ACKNOWLEDGEMENT);
+ seq_ack = sandesha2_msg_ctx_get_seq_ack(rm_msg_ctx, env);
if(seq_ack)
{
sandesha2_msg_processor_t *ack_processor = NULL;
ack_processor = sandesha2_ack_msg_processor_create(env);
sandesha2_msg_processor_process_in_msg(ack_processor, env, rm_msg_ctx);
}
- csr_part = (sandesha2_create_seq_res_t*)sandesha2_msg_ctx_get_msg_part(
- rm_msg_ctx, env, SANDESHA2_MSG_PART_CREATE_SEQ_RESPONSE);
+ csr_part = sandesha2_msg_ctx_get_create_seq_res(rm_msg_ctx, env);
if(!csr_part)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
@@ -537,8 +535,7 @@
if(rm_version)
AXIS2_FREE(env->allocator, rm_version);
app_rm_msg = sandesha2_msg_init_init_msg(env, app_msg_ctx);
- seq_part = (sandesha2_seq_t*)sandesha2_msg_ctx_get_msg_part(
- app_rm_msg, env, SANDESHA2_MSG_PART_SEQ);
+ seq_part = sandesha2_msg_ctx_get_sequence(app_rm_msg, env);
if(!seq_part)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
@@ -557,8 +554,7 @@
sandesha2_identifier_set_identifier(ident, env, new_out_seq_id);
sandesha2_seq_set_identifier(seq_part, env, ident);
- ack_req_part = (sandesha2_ack_requested_t*)sandesha2_msg_ctx_get_msg_part(
- app_rm_msg, env, SANDESHA2_MSG_PART_ACK_REQUEST);
+ ack_req_part = sandesha2_msg_ctx_get_ack_requested(app_rm_msg, env);
if(ack_req_part)
{
sandesha2_identifier_t *ident1 = NULL;
Modified: webservices/sandesha/trunk/c/src/msgprocessors/make_connection_msg_processor.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/msgprocessors/make_connection_msg_processor.c?rev=614032&r1=614031&r2=614032&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/make_connection_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/make_connection_msg_processor.c Mon Jan 21 14:25:17 2008
@@ -194,9 +194,7 @@
"[sandesha2]Entry:sandesha2_make_connection_msg_processor_process_in_msg");
AXIS2_PARAM_CHECK(env->error, rm_msg_ctx, AXIS2_FAILURE);
- make_conn = (sandesha2_make_connection_t*)
- sandesha2_msg_ctx_get_msg_part(rm_msg_ctx, env,
- SANDESHA2_MSG_PART_MAKE_CONNECTION);
+ make_conn = sandesha2_msg_ctx_get_make_connection(rm_msg_ctx, env);
if(!make_conn)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
@@ -446,8 +444,7 @@
axis2_char_t *seq_id = NULL;
sandesha2_identifier_t *identifier = NULL;
- seq = (sandesha2_seq_t*) sandesha2_msg_ctx_get_msg_part(return_rm_msg_ctx,
- env, SANDESHA2_MSG_PART_SEQ);
+ seq = sandesha2_msg_ctx_get_sequence(return_rm_msg_ctx, env);
identifier = sandesha2_seq_get_identifier(seq, env);
seq_id = sandesha2_identifier_get_identifier(identifier, env);
}
@@ -491,9 +488,8 @@
axis2_conf_ctx_t *conf_ctx = NULL;
axis2_char_t *int_seq_id = NULL;
- terminate_seq = (sandesha2_terminate_seq_t*)
- sandesha2_msg_ctx_get_msg_part(return_rm_msg_ctx, env,
- SANDESHA2_MSG_PART_TERMINATE_SEQ);
+ terminate_seq = sandesha2_msg_ctx_get_terminate_seq(return_rm_msg_ctx,
+ env);
seq_id = sandesha2_identifier_get_identifier(
sandesha2_terminate_seq_get_identifier(terminate_seq,
env), env);
@@ -539,8 +535,7 @@
if(msg_pending)
{
sandesha2_msg_pending_set_pending(msg_pending, env, pending);
- sandesha2_msg_pending_to_soap_envelope((sandesha2_iom_rm_part_t *)
- msg_pending, env, soap_env);
+ sandesha2_msg_pending_to_soap_envelope(msg_pending, env, soap_env);
}
}
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?rev=614032&r1=614031&r2=614032&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c Mon Jan 21 14:25:17 2008
@@ -186,8 +186,7 @@
"[sandesha2]Entry:sandesha2_terminate_seq_msg_processor_process_in_msg");
msg_ctx = sandesha2_msg_ctx_get_msg_ctx(rm_msg_ctx, env);
- seq_ack = (sandesha2_seq_ack_t*)sandesha2_msg_ctx_get_msg_part(
- rm_msg_ctx, env, SANDESHA2_MSG_PART_SEQ_ACKNOWLEDGEMENT);
+ seq_ack = sandesha2_msg_ctx_get_seq_ack(rm_msg_ctx, env);
if(seq_ack)
{
@@ -195,8 +194,7 @@
ack_processor = sandesha2_ack_msg_processor_create(env);
sandesha2_msg_processor_process_in_msg(ack_processor, env, rm_msg_ctx);
}
- term_seq = (sandesha2_terminate_seq_t*)sandesha2_msg_ctx_get_msg_part(
- rm_msg_ctx, env, SANDESHA2_MSG_PART_TERMINATE_SEQ);
+ term_seq = sandesha2_msg_ctx_get_terminate_seq(rm_msg_ctx, env);
if(!term_seq)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[sandesha2] Terminate "
@@ -440,11 +438,8 @@
seq_prop_mgr);
if(ack_rm_msg)
{
- seq_ack = (sandesha2_seq_ack_t*)sandesha2_msg_ctx_get_msg_part(ack_rm_msg,
- env, SANDESHA2_MSG_PART_SEQ_ACKNOWLEDGEMENT);
- sandesha2_msg_ctx_set_msg_part(out_rm_msg, env,
- SANDESHA2_MSG_PART_SEQ_ACKNOWLEDGEMENT,
- (sandesha2_iom_rm_part_t*)seq_ack);
+ seq_ack = sandesha2_msg_ctx_get_seq_ack(ack_rm_msg, env);
+ sandesha2_msg_ctx_set_seq_ack(out_rm_msg, env, seq_ack);
}
sandesha2_msg_ctx_add_soap_envelope(out_rm_msg, env);
sandesha2_msg_ctx_set_flow(out_rm_msg, env, AXIS2_OUT_FLOW);
@@ -546,7 +541,7 @@
axis2_op_t *old_op = NULL;
axis2_op_t *out_in_op = NULL;
axutil_qname_t *qname = NULL;
- axis2_op_ctx_t *op_ctx = NULL;
+ /*axis2_op_ctx_t *op_ctx = NULL;*/
sandesha2_terminate_seq_t *term_seq_part = NULL;
axis2_char_t *rm_version = NULL;
axis2_char_t *transport_to = NULL;
@@ -604,12 +599,12 @@
axis2_op_set_in_flow(out_in_op, env,
axis2_op_get_in_flow(old_op, env));
- axutil_allocator_switch_to_global_pool(env->allocator);
+ /*axutil_allocator_switch_to_global_pool(env->allocator);
op_ctx = axis2_op_ctx_create(env, out_in_op, NULL);
axis2_op_ctx_set_parent(op_ctx, env, axis2_msg_ctx_get_svc_ctx(msg_ctx, env));
axis2_conf_ctx_register_op_ctx(conf_ctx, env, sandesha2_msg_ctx_get_msg_id(
rm_msg_ctx, env), op_ctx);
- axutil_allocator_switch_to_local_pool(env->allocator);
+ axutil_allocator_switch_to_local_pool(env->allocator);*/
if(terminated && 0 == axutil_strcmp(terminated, AXIS2_VALUE_TRUE))
{
@@ -631,8 +626,7 @@
}
if(terminated)
AXIS2_FREE(env->allocator, terminated);
- term_seq_part = (sandesha2_terminate_seq_t*)sandesha2_msg_ctx_get_msg_part(
- rm_msg_ctx, env, SANDESHA2_MSG_PART_TERMINATE_SEQ);
+ term_seq_part = sandesha2_msg_ctx_get_terminate_seq(rm_msg_ctx, env);
sandesha2_identifier_set_identifier(sandesha2_terminate_seq_get_identifier(
term_seq_part, env), env, out_seq_id);
sandesha2_msg_ctx_set_flow(rm_msg_ctx, env, AXIS2_OUT_FLOW);
Modified: webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_res_msg_processor.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_res_msg_processor.c?rev=614032&r1=614031&r2=614032&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_res_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_res_msg_processor.c Mon Jan 21 14:25:17 2008
@@ -141,8 +141,7 @@
msg_ctx = sandesha2_msg_ctx_get_msg_ctx(rm_msg_ctx, env);
- term_seq_res = (sandesha2_terminate_seq_res_t*)sandesha2_msg_ctx_get_msg_part(
- rm_msg_ctx, env, SANDESHA2_MSG_PART_TERMINATE_SEQ_RESPONSE);
+ term_seq_res = sandesha2_msg_ctx_get_terminate_seq_res(rm_msg_ctx, env);
if(!term_seq_res)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[sandesha2] Terminate "
Modified: webservices/sandesha/trunk/c/src/util/ack_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/ack_mgr.c?rev=614032&r1=614031&r2=614032&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/util/ack_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/util/ack_mgr.c Mon Jan 21 14:25:17 2008
@@ -330,7 +330,7 @@
axis2_msg_ctx_t *msg_ctx1 = NULL;
axis2_char_t *to = NULL;
sandesha2_msg_ctx_t *ack_rm_msg = NULL;
- sandesha2_iom_rm_part_t *seq_ack = NULL;
+ sandesha2_seq_ack_t *seq_ack = NULL;
axis2_char_t *msg_ctx_ref_key = NULL;
axis2_endpoint_ref_t *to_ref = NULL;
@@ -357,10 +357,8 @@
" ack message entry");
return AXIS2_FAILURE;
}
- seq_ack = (sandesha2_iom_rm_part_t *)sandesha2_msg_ctx_get_msg_part(
- ack_rm_msg, env, SANDESHA2_MSG_PART_SEQ_ACKNOWLEDGEMENT);
- sandesha2_msg_ctx_set_msg_part(rm_msg_ctx, env,
- SANDESHA2_MSG_PART_SEQ_ACKNOWLEDGEMENT, seq_ack);
+ seq_ack = sandesha2_msg_ctx_get_seq_ack(ack_rm_msg, env);
+ sandesha2_msg_ctx_set_seq_ack(rm_msg_ctx, env, seq_ack);
sandesha2_msg_ctx_add_soap_envelope(rm_msg_ctx, env);
break;
}
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?rev=614032&r1=614031&r2=614032&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/util/fault_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/util/fault_mgr.c Mon Jan 21 14:25:17 2008
@@ -48,8 +48,7 @@
AXIS2_PARAM_CHECK(env->error, seq_prop_mgr, NULL);
rm_msg_ctx = sandesha2_msg_init_init_msg(env, create_seq_msg);
- create_seq = (sandesha2_create_seq_t*)sandesha2_msg_ctx_get_msg_part(
- rm_msg_ctx, env, SANDESHA2_MSG_PART_CREATE_SEQ);
+ create_seq = sandesha2_msg_ctx_get_create_seq(rm_msg_ctx, env);
if(NULL == create_seq)
{
@@ -95,10 +94,9 @@
AXIS2_PARAM_CHECK(env->error, app_rm_msg, NULL);
AXIS2_PARAM_CHECK(env->error, seq_prop_mgr, NULL);
- sequence = (sandesha2_seq_t*)sandesha2_msg_ctx_get_msg_part(
- app_rm_msg, env, SANDESHA2_MSG_PART_SEQ);
- msg_num = SANDESHA2_MSG_NUMBER_GET_MSG_NUM(sandesha2_seq_get_msg_num(
- sequence, env), env);
+ sequence = sandesha2_msg_ctx_get_sequence(app_rm_msg, env);
+ msg_num = sandesha2_msg_number_get_msg_num(sandesha2_seq_get_msg_num(
+ sequence, env), env);
seq_id = sandesha2_identifier_get_identifier(
sandesha2_seq_get_identifier(sequence, env), env);
@@ -279,8 +277,7 @@
if(SANDESHA2_MSG_TYPE_ACK != sandesha2_msg_ctx_get_msg_type(ack_rm_msg, env))
return NULL;
- seq_ack = (sandesha2_seq_ack_t*)sandesha2_msg_ctx_get_msg_part(ack_rm_msg,
- env, SANDESHA2_MSG_PART_SEQ_ACKNOWLEDGEMENT);
+ seq_ack = sandesha2_msg_ctx_get_seq_ack(ack_rm_msg, env);
ack_range_list = sandesha2_seq_ack_get_ack_range_list(seq_ack, env);
if(ack_range_list)
{
@@ -324,9 +321,9 @@
SANDESHA2_SOAP_FAULT_SUBCODE_INVALID_ACKNOWLEDGEMENT);
dummy_ele = axiom_element_create(env, NULL, "dummy_ele", NULL,
&dummy_node);
- sandesha2_iom_rm_element_to_om_node((sandesha2_iom_rm_element_t *)seq_ack, env, dummy_node);
+ sandesha2_seq_ack_to_om_node(seq_ack, env, dummy_node);
qname = axutil_qname_create(env, SANDESHA2_WSRM_COMMON_SEQ_ACK,
- NULL, NULL);
+ NULL, NULL);
detail_ele = axiom_element_get_first_child_with_qname(dummy_ele, env,
qname, dummy_node, &detail_node);
sandesha2_fault_data_set_detail(fault_data, env, detail_node);
@@ -433,8 +430,7 @@
sandesha2_create_seq_t *create_seq = NULL;
axis2_endpoint_ref_t *epr = NULL;
- create_seq = (sandesha2_create_seq_t *)sandesha2_msg_ctx_get_msg_part(
- rm_msg_ctx, env, SANDESHA2_MSG_PART_CREATE_SEQ);
+ create_seq = sandesha2_msg_ctx_get_create_seq(rm_msg_ctx, env);
epr = sandesha2_address_get_epr(sandesha2_acks_to_get_address(
sandesha2_create_seq_get_acks_to(create_seq, env),
env), 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?rev=614032&r1=614031&r2=614032&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/util/msg_creator.c (original)
+++ webservices/sandesha/trunk/c/src/util/msg_creator.c Mon Jan 21 14:25:17 2008
@@ -85,7 +85,7 @@
axis2_conf_ctx_t *ctx = NULL;
axis2_op_t *create_seq_op = NULL;
axis2_op_t *app_msg_op_desc = NULL;
- axis2_op_ctx_t *create_seq_op_ctx = NULL;
+ /*axis2_op_ctx_t *create_seq_op_ctx = NULL;*/
axis2_op_ctx_t *op_ctx = NULL;
axis2_char_t *create_seq_msg_id = NULL;
axis2_char_t *rm_version = NULL;
@@ -133,12 +133,12 @@
application_rm_msg, create_seq_op);
sandesha2_msg_creator_init_creation(env, application_msg_ctx,
create_seq_msg_ctx);
- create_seq_op_ctx = axis2_msg_ctx_get_op_ctx(create_seq_msg_ctx, env);
+ /*create_seq_op_ctx = axis2_msg_ctx_get_op_ctx(create_seq_msg_ctx, env);*/
create_seq_msg_id = axutil_uuid_gen(env);
axis2_msg_ctx_set_message_id(create_seq_msg_ctx, env, create_seq_msg_id);
- axutil_allocator_switch_to_global_pool(env->allocator);
+ /*axutil_allocator_switch_to_global_pool(env->allocator);
axis2_conf_ctx_register_op_ctx(ctx, env, create_seq_msg_id, create_seq_op_ctx);
- axutil_allocator_switch_to_local_pool(env->allocator);
+ axutil_allocator_switch_to_local_pool(env->allocator);*/
app_msg_op_desc = axis2_msg_ctx_get_op(application_msg_ctx, env);
create_seq_op = axis2_msg_ctx_get_op(create_seq_msg_ctx, env);
if(app_msg_op_desc)
@@ -205,7 +205,7 @@
addressing_ns_value = sandesha2_utils_get_seq_property(env, internal_seq_id,
SANDESHA2_SEQ_PROP_ADDRESSING_NAMESPACE_VALUE, seq_prop_mgr);
create_seq_part = sandesha2_create_seq_create(env, addressing_ns_value,
- rm_ns_value);
+ rm_ns_value);
/* Adding sequence offer - if present */
op_ctx = axis2_msg_ctx_get_op_ctx(application_msg_ctx, env);
if(op_ctx)
@@ -277,9 +277,7 @@
if(addressing_ns_value)
AXIS2_FREE(env->allocator, addressing_ns_value);
sandesha2_create_seq_set_acks_to(create_seq_part, env, temp_acks_to);
- sandesha2_msg_ctx_set_msg_part(create_seq_rm_msg, env,
- SANDESHA2_MSG_PART_CREATE_SEQ, (sandesha2_iom_rm_part_t *)
- create_seq_part);
+ sandesha2_msg_ctx_set_create_seq(create_seq_rm_msg, env, create_seq_part);
sandesha2_msg_ctx_add_soap_envelope(create_seq_rm_msg, env);
temp_action = sandesha2_spec_specific_consts_get_create_seq_action(env,
rm_version);
@@ -324,11 +322,10 @@
axiom_soap_envelope_t *temp_envelope = NULL;
axiom_soap_body_t *temp_soap_body = NULL;
axiom_node_t *temp_om_node = NULL;
- sandesha2_create_seq_res_t *response = NULL;
+ sandesha2_create_seq_res_t *create_seq_res = NULL;
sandesha2_identifier_t *identifier = NULL;
sandesha2_seq_offer_t *offer = NULL;
- sandesha2_msg_ctx_t *create_seq_response = NULL;
- sandesha2_iom_rm_element_t *msg_part = NULL;
+ sandesha2_msg_ctx_t *create_seq_res_rm_msg_ctx = NULL;
sandesha2_create_seq_t *cs = NULL;
int soap_version = -1;
@@ -336,9 +333,7 @@
"[sandesha2] Entry:sandesha2_msg_creator_create_create_seq_res_msg");
temp_msg_ctx = sandesha2_msg_ctx_get_msg_ctx(create_seq_msg, env);
conf_ctx = axis2_msg_ctx_get_conf_ctx(temp_msg_ctx, env);
- msg_part = (sandesha2_iom_rm_element_t *) sandesha2_msg_ctx_get_msg_part(
- create_seq_msg, env, SANDESHA2_MSG_PART_CREATE_SEQ);
- cs = (sandesha2_create_seq_t *) msg_part;
+ cs = sandesha2_msg_ctx_get_create_seq(create_seq_msg, env);
rm_version = sandesha2_utils_get_rm_version(env, new_seq_id, seq_prop_mgr);
if(!rm_version)
{
@@ -352,11 +347,11 @@
rm_ns_value = sandesha2_spec_specific_consts_get_rm_ns_val(env, rm_version);
addressing_ns_value = sandesha2_utils_get_seq_property(env, new_seq_id,
SANDESHA2_SEQ_PROP_ADDRESSING_NAMESPACE_VALUE, seq_prop_mgr);
- response = sandesha2_create_seq_res_create(env, rm_ns_value,
+ create_seq_res = sandesha2_create_seq_res_create(env, rm_ns_value,
addressing_ns_value);
identifier = sandesha2_identifier_create(env, rm_ns_value);
sandesha2_identifier_set_identifier(identifier, env, new_seq_id);
- sandesha2_create_seq_res_set_identifier(response, env, identifier);
+ sandesha2_create_seq_res_set_identifier(create_seq_res, env, identifier);
offer = sandesha2_create_seq_get_seq_offer(cs, env);
if(offer)
{
@@ -379,7 +374,7 @@
sandesha2_address_set_epr(address, env, acks_to_epr);
sandesha2_acks_to_set_address(acks_to, env, address);
sandesha2_accept_set_acks_to(accept, env, acks_to);
- sandesha2_create_seq_res_set_accept(response, env, accept);
+ sandesha2_create_seq_res_set_accept(create_seq_res, env, accept);
}
}
temp_envelope = sandesha2_msg_ctx_get_soap_envelope(create_seq_msg, env);
@@ -387,8 +382,7 @@
envelope = axiom_soap_envelope_create_default_soap_envelope(env, soap_version);
temp_soap_body = axiom_soap_envelope_get_body(envelope, env);
temp_om_node = axiom_soap_body_get_base_node(temp_soap_body, env);
- sandesha2_iom_rm_element_to_om_node((sandesha2_iom_rm_element_t *)(
- sandesha2_iom_rm_element_t *) response, env, temp_om_node);
+ sandesha2_create_seq_res_to_om_node(create_seq_res, env, temp_om_node);
temp_action = sandesha2_spec_specific_consts_get_create_seq_res_action(
env, rm_version);
if(rm_version)
@@ -419,16 +413,15 @@
axis2_msg_ctx_set_soap_envelope(out_msg, env, envelope);
temp_msg_ctx = sandesha2_msg_ctx_get_msg_ctx(create_seq_msg, env);
sandesha2_msg_creator_init_creation(env, temp_msg_ctx,out_msg);
- create_seq_response = sandesha2_msg_init_init_msg(env, out_msg);
- sandesha2_msg_ctx_set_msg_part(create_seq_response, env,
- SANDESHA2_MSG_PART_CREATE_SEQ_RESPONSE, (sandesha2_iom_rm_part_t *)
- response);
+ create_seq_res_rm_msg_ctx = sandesha2_msg_init_init_msg(env, out_msg);
+ sandesha2_msg_ctx_set_create_seq_res(create_seq_res_rm_msg_ctx, env,
+ create_seq_res);
temp_msg_ctx = sandesha2_msg_ctx_get_msg_ctx(create_seq_msg, env);
sandesha2_msg_creator_finalize_creation(env, temp_msg_ctx, out_msg);
axis2_msg_ctx_set_server_side(temp_msg_ctx, env, AXIS2_TRUE);
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
"[sandesha2] Exit:sandesha2_msg_creator_create_create_seq_res_msg");
- return create_seq_response;
+ return create_seq_res_rm_msg_ctx;
}
/**
@@ -440,10 +433,10 @@
*/
sandesha2_msg_ctx_t *
sandesha2_msg_creator_create_close_seq_res_msg(
- const axutil_env_t *env,
- sandesha2_msg_ctx_t *close_seq_msg,
- axis2_msg_ctx_t *out_msg,
- sandesha2_seq_property_mgr_t *seq_prop_mgr)
+ const axutil_env_t *env,
+ sandesha2_msg_ctx_t *close_seq_msg,
+ axis2_msg_ctx_t *out_msg,
+ sandesha2_seq_property_mgr_t *seq_prop_mgr)
{
axis2_conf_ctx_t *conf_ctx = NULL;
axis2_msg_ctx_t *temp_msg_ctx = NULL;
@@ -455,31 +448,31 @@
axiom_soap_envelope_t *envelope = NULL;
axiom_soap_envelope_t *temp_envelope = NULL;
sandesha2_close_seq_t *cs = NULL;
- sandesha2_msg_ctx_t *close_seq_response = NULL;
- sandesha2_iom_rm_part_t *response = NULL;
+ sandesha2_msg_ctx_t *close_seq_res_rm_msg_ctx = NULL;
sandesha2_identifier_t *identifier = NULL;
sandesha2_identifier_t *temp_identifier = NULL;
+ sandesha2_close_seq_res_t *close_seq_res = NULL;
int soap_version = -1;
- close_seq_response = sandesha2_msg_ctx_create(env, out_msg);
+ close_seq_res_rm_msg_ctx = sandesha2_msg_ctx_create(env, out_msg);
temp_msg_ctx = sandesha2_msg_ctx_get_msg_ctx(close_seq_msg, env);
conf_ctx = axis2_msg_ctx_get_conf_ctx(temp_msg_ctx, env);
- cs = (sandesha2_close_seq_t *) sandesha2_msg_ctx_get_msg_part(
- close_seq_msg, env, SANDESHA2_MSG_PART_CLOSE_SEQ);
+ cs = (sandesha2_close_seq_t *) sandesha2_msg_ctx_get_close_seq(
+ close_seq_msg, env);
temp_identifier = sandesha2_close_seq_get_identifier(cs, env);
seq_id = sandesha2_identifier_get_identifier(temp_identifier, env);
ns = sandesha2_msg_ctx_get_rm_ns_val(close_seq_msg, env);
- sandesha2_msg_ctx_set_rm_ns_val(close_seq_response, env, ns);
- response = (sandesha2_iom_rm_part_t *) sandesha2_close_seq_res_create(env, ns);
+ sandesha2_msg_ctx_set_rm_ns_val(close_seq_res_rm_msg_ctx, env, ns);
+ close_seq_res = sandesha2_close_seq_res_create(env, ns);
identifier = sandesha2_identifier_create(env, ns);
sandesha2_identifier_set_identifier(identifier, env, seq_id);
- sandesha2_close_seq_res_set_identifier((sandesha2_close_seq_res_t *) response, env, identifier);
+ sandesha2_close_seq_res_set_identifier(close_seq_res, env, identifier);
temp_envelope = sandesha2_msg_ctx_get_soap_envelope(close_seq_msg, env);
soap_version = sandesha2_utils_get_soap_version(env, temp_envelope);
envelope = axiom_soap_envelope_create_default_soap_envelope(env, soap_version);
- sandesha2_msg_ctx_set_soap_envelope(close_seq_response, env, envelope);
- sandesha2_msg_ctx_set_msg_part(close_seq_response, env,
- SANDESHA2_MSG_PART_CLOSE_SEQ_RESPONSE, response);
+ sandesha2_msg_ctx_set_soap_envelope(close_seq_res_rm_msg_ctx, env, envelope);
+ sandesha2_msg_ctx_set_close_seq_res(close_seq_res_rm_msg_ctx, env,
+ close_seq_res);
rm_version = sandesha2_utils_get_rm_version(env, seq_id, seq_prop_mgr);
temp_action = sandesha2_spec_specific_consts_get_close_seq_res_action(
env, rm_version);
@@ -495,10 +488,10 @@
temp_msg_ctx = sandesha2_msg_ctx_get_msg_ctx(close_seq_msg, env);
sandesha2_msg_creator_init_creation(env, temp_msg_ctx,out_msg);
- sandesha2_msg_ctx_add_soap_envelope(close_seq_response, env);
+ sandesha2_msg_ctx_add_soap_envelope(close_seq_res_rm_msg_ctx, env);
sandesha2_msg_creator_finalize_creation(env, temp_msg_ctx, out_msg);
axis2_msg_ctx_set_server_side(temp_msg_ctx, env, AXIS2_TRUE);
- return close_seq_response;
+ return close_seq_res_rm_msg_ctx;
}
/**
@@ -523,7 +516,7 @@
axis2_conf_ctx_t *conf_ctx = NULL;
axis2_op_t *terminate_seq_op = NULL;
axis2_op_t *ref_msg_op = NULL;
- axis2_op_ctx_t *terminate_seq_op_ctx = NULL;
+ /*axis2_op_ctx_t *terminate_seq_op_ctx = NULL;*/
axis2_char_t *terminate_seq_msg_id = NULL;
axis2_char_t *temp_msg_id = NULL;
axis2_char_t *rm_version = NULL;
@@ -558,14 +551,14 @@
}
terminate_seq_msg_ctx = sandesha2_utils_create_new_related_msg_ctx(env,
ref_rm_msg, terminate_seq_op);
- terminate_seq_op_ctx = axis2_msg_ctx_get_op_ctx(terminate_seq_msg_ctx, env);
+ /*terminate_seq_op_ctx = axis2_msg_ctx_get_op_ctx(terminate_seq_msg_ctx, env);*/
terminate_seq_msg_id = (axis2_char_t*)axis2_msg_ctx_get_msg_id(
terminate_seq_msg_ctx, env);
- axutil_allocator_switch_to_global_pool(env->allocator);
+ /*axutil_allocator_switch_to_global_pool(env->allocator);
if(terminate_seq_msg_id)
axis2_conf_ctx_register_op_ctx(conf_ctx, env, terminate_seq_msg_id,
terminate_seq_op_ctx);
- axutil_allocator_switch_to_local_pool(env->allocator);
+ axutil_allocator_switch_to_local_pool(env->allocator);*/
ref_msg_op = axis2_msg_ctx_get_op(ref_msg_ctx, env);
terminate_seq_op = axis2_msg_ctx_get_op(terminate_seq_msg_ctx, env);
if(ref_msg_op)
@@ -629,9 +622,8 @@
identifier = sandesha2_identifier_create(env, rm_ns_value);
sandesha2_identifier_set_identifier(identifier, env, seq_id);
sandesha2_terminate_seq_set_identifier(terminate_seq, env, identifier);
- sandesha2_msg_ctx_set_msg_part(terminate_rm_msg, env,
- SANDESHA2_MSG_PART_TERMINATE_SEQ,
- (sandesha2_iom_rm_part_t*)terminate_seq);
+ sandesha2_msg_ctx_set_terminate_seq(terminate_rm_msg, env,
+ terminate_seq);
sandesha2_msg_creator_finalize_creation(env, ref_msg_ctx,
terminate_seq_msg_ctx);
axis2_msg_ctx_set_property(terminate_seq_msg_ctx, env, AXIS2_TRANSPORT_IN,
@@ -658,8 +650,7 @@
axutil_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(
- ref_rm_msg, env, SANDESHA2_MSG_PART_TERMINATE_SEQ);
+ terminate_seq = sandesha2_msg_ctx_get_terminate_seq(ref_rm_msg, env);
seq_id = sandesha2_identifier_get_identifier(
sandesha2_terminate_seq_get_identifier(terminate_seq,
env), env);
@@ -675,9 +666,8 @@
sandesha2_utils_get_soap_version(env,
sandesha2_msg_ctx_get_soap_envelope(ref_rm_msg, env)));
sandesha2_msg_ctx_set_soap_envelope(res_rm_msg, env, soap_envelope);
- sandesha2_msg_ctx_set_msg_part(res_rm_msg, env,
- SANDESHA2_MSG_PART_TERMINATE_SEQ_RESPONSE,
- (sandesha2_iom_rm_part_t*)terminate_seq_res);
+ sandesha2_msg_ctx_set_terminate_seq_res(res_rm_msg, env,
+ terminate_seq_res);
rm_version = sandesha2_utils_get_rm_version(env, seq_id, seq_prop_mgr);
if(!rm_version)
{
@@ -955,11 +945,9 @@
sandesha2_seq_ack_set_ack_final(seq_ack, env, ack_final);
}
}
- sandesha2_msg_ctx_set_msg_part(app_msg, env,
- SANDESHA2_MSG_PART_SEQ_ACKNOWLEDGEMENT,
- (sandesha2_iom_rm_part_t *) seq_ack);
+ sandesha2_msg_ctx_set_seq_ack(app_msg, env, seq_ack);
soap_header = axiom_soap_envelope_get_header(envelope, env);
- sandesha2_iom_rm_element_to_om_node((sandesha2_iom_rm_element_t *)seq_ack, env, soap_header);
+ sandesha2_seq_ack_to_om_node(seq_ack, env, soap_header);
ack_req_action = sandesha2_spec_specific_consts_get_seq_ack_action(env,
rm_version);
@@ -1093,9 +1081,8 @@
env, rm_version);
axis2_msg_ctx_set_wsa_action(make_conn_msg_ctx, env, wsa_action);
axis2_msg_ctx_set_message_id(make_conn_msg_ctx, env, axutil_uuid_gen(env));
- sandesha2_msg_ctx_set_msg_part(make_conn_rm_msg_ctx, env,
- SANDESHA2_MSG_PART_MAKE_CONNECTION,
- (sandesha2_iom_rm_part_t *) make_conn);
+ sandesha2_msg_ctx_set_make_connection(make_conn_rm_msg_ctx, env,
+ make_conn);
/* Generating the soap envelope */
sandesha2_msg_ctx_add_soap_envelope(make_conn_rm_msg_ctx, env);
return make_conn_rm_msg_ctx;
Modified: webservices/sandesha/trunk/c/src/util/msg_init.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/msg_init.c?rev=614032&r1=614031&r2=614032&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/util/msg_init.c (original)
+++ webservices/sandesha/trunk/c/src/util/msg_init.c Mon Jan 21 14:25:17 2008
@@ -148,115 +148,104 @@
if(addressing_ns)
AXIS2_FREE(env->allocator, addressing_ns);
if(!rm_elements)
+ {
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
+ "[sandesha2]Could not create rm_elements");
return AXIS2_FAILURE;
+ }
envelope = axis2_msg_ctx_get_soap_envelope(msg_ctx, env);
action = (axis2_char_t*)axis2_msg_ctx_get_wsa_action(msg_ctx, env);
sandesha2_rm_elements_from_soap_envelope(rm_elements, env, envelope, action);
create_seq = sandesha2_rm_elements_get_create_seq(rm_elements, env);
if(create_seq)
{
- sandesha2_msg_ctx_set_msg_part(rm_msg_ctx, env,
- SANDESHA2_MSG_PART_CREATE_SEQ, (sandesha2_iom_rm_part_t *)
- create_seq);
- rm_ns = sandesha2_iom_rm_element_get_namespace_value(
- (sandesha2_iom_rm_element_t *) create_seq, env);
+ sandesha2_msg_ctx_set_create_seq(rm_msg_ctx, env, create_seq);
+ rm_ns = sandesha2_create_seq_get_namespace_value(
+ create_seq, env);
}
create_seq_res = sandesha2_rm_elements_get_create_seq_res(rm_elements, env);
if(create_seq_res)
{
- sandesha2_msg_ctx_set_msg_part(rm_msg_ctx, env,
- SANDESHA2_MSG_PART_CREATE_SEQ_RESPONSE,
- (sandesha2_iom_rm_part_t *) create_seq_res);
- rm_ns = sandesha2_iom_rm_element_get_namespace_value(
- (sandesha2_iom_rm_element_t *) create_seq_res, env);
+ sandesha2_msg_ctx_set_create_seq_res(rm_msg_ctx, env,
+ create_seq_res);
+ rm_ns = sandesha2_create_seq_res_get_namespace_value(
+ create_seq_res, env);
add_op_if_null(env, msg_ctx);
}
seq = sandesha2_rm_elements_get_seq(rm_elements, env);
if(seq)
{
- sandesha2_msg_ctx_set_msg_part(rm_msg_ctx, env,
- SANDESHA2_MSG_PART_SEQ, (sandesha2_iom_rm_part_t *) seq);
- rm_ns = sandesha2_iom_rm_element_get_namespace_value(
- (sandesha2_iom_rm_element_t *) seq, env);
+ sandesha2_msg_ctx_set_sequence(rm_msg_ctx, env, seq);
+ rm_ns = sandesha2_seq_get_namespace_value(
+ seq, env);
}
seq_ack = sandesha2_rm_elements_get_seq_ack(rm_elements, env);
if(seq_ack)
{
- sandesha2_msg_ctx_set_msg_part(rm_msg_ctx, env,
- SANDESHA2_MSG_PART_SEQ_ACKNOWLEDGEMENT,
- (sandesha2_iom_rm_part_t *) seq_ack);
- rm_ns = sandesha2_iom_rm_element_get_namespace_value(
- (sandesha2_iom_rm_element_t *) seq_ack, env);
+ sandesha2_msg_ctx_set_seq_ack(rm_msg_ctx, env, seq_ack);
+ rm_ns = sandesha2_seq_ack_get_namespace_value(
+ seq_ack, env);
add_op_if_null(env, msg_ctx);
}
terminate_seq = sandesha2_rm_elements_get_terminate_seq(rm_elements, env);
if(terminate_seq)
{
- sandesha2_msg_ctx_set_msg_part(rm_msg_ctx, env,
- SANDESHA2_MSG_PART_TERMINATE_SEQ,
- (sandesha2_iom_rm_part_t *) terminate_seq);
- rm_ns = sandesha2_iom_rm_element_get_namespace_value(
- (sandesha2_iom_rm_element_t *) terminate_seq, env);
+ sandesha2_msg_ctx_set_terminate_seq(rm_msg_ctx, env, terminate_seq);
+ rm_ns = sandesha2_terminate_seq_get_namespace_value(
+ terminate_seq, env);
add_op_if_null(env, msg_ctx);
}
terminate_seq_res = sandesha2_rm_elements_get_terminate_seq_res(rm_elements,
env);
if(terminate_seq_res)
{
- sandesha2_msg_ctx_set_msg_part(rm_msg_ctx, env,
- SANDESHA2_MSG_PART_TERMINATE_SEQ_RESPONSE,
- (sandesha2_iom_rm_part_t *) terminate_seq_res);
- rm_ns = sandesha2_iom_rm_element_get_namespace_value(
- (sandesha2_iom_rm_element_t *) terminate_seq_res, env);
+ sandesha2_msg_ctx_set_terminate_seq_res(rm_msg_ctx, env,
+ terminate_seq_res);
+ rm_ns = sandesha2_terminate_seq_res_get_namespace_value(
+ terminate_seq_res, env);
add_op_if_null(env, msg_ctx);
}
ack_request = sandesha2_rm_elements_get_ack_requested(rm_elements, env);
if(ack_request)
{
- sandesha2_msg_ctx_set_msg_part(rm_msg_ctx, env,
- SANDESHA2_MSG_PART_ACK_REQUEST,
- (sandesha2_iom_rm_part_t *) ack_request);
- rm_ns = sandesha2_iom_rm_element_get_namespace_value(
- (sandesha2_iom_rm_element_t *) ack_request, env);
+ sandesha2_msg_ctx_set_ack_requested(rm_msg_ctx, env,
+ ack_request);
+ rm_ns = sandesha2_ack_requested_get_namespace_value(
+ ack_request, env);
}
close_seq = sandesha2_rm_elements_get_close_seq(rm_elements, env);
if(close_seq)
{
- sandesha2_msg_ctx_set_msg_part(rm_msg_ctx, env,
- SANDESHA2_MSG_PART_CLOSE_SEQ,
- (sandesha2_iom_rm_part_t *) close_seq);
- rm_ns = sandesha2_iom_rm_element_get_namespace_value(
- (sandesha2_iom_rm_element_t *) close_seq, env);
+ sandesha2_msg_ctx_set_close_seq(rm_msg_ctx, env,
+ close_seq);
+ rm_ns = sandesha2_close_seq_get_namespace_value(
+ close_seq, env);
add_op_if_null(env, msg_ctx);
}
close_seq_res = sandesha2_rm_elements_get_close_seq_res(rm_elements, env);
if(close_seq_res)
{
- sandesha2_msg_ctx_set_msg_part(rm_msg_ctx, env,
- SANDESHA2_MSG_PART_CLOSE_SEQ_RESPONSE,
- (sandesha2_iom_rm_part_t *) close_seq_res);
- rm_ns = sandesha2_iom_rm_element_get_namespace_value(
- (sandesha2_iom_rm_element_t *) close_seq_res, env);
+ sandesha2_msg_ctx_set_close_seq_res(rm_msg_ctx, env,
+ close_seq_res);
+ rm_ns = sandesha2_close_seq_res_get_namespace_value(
+ close_seq_res, env);
add_op_if_null(env, msg_ctx);
}
make_conn = sandesha2_rm_elements_get_make_connection(rm_elements, env);
if(make_conn)
{
- sandesha2_msg_ctx_set_msg_part(rm_msg_ctx, env,
- SANDESHA2_MSG_PART_MAKE_CONNECTION,
- (sandesha2_iom_rm_part_t *) make_conn);
- rm_ns = sandesha2_iom_rm_element_get_namespace_value(
- (sandesha2_iom_rm_element_t *) make_conn, env);
+ sandesha2_msg_ctx_set_make_connection(rm_msg_ctx, env,
+ make_conn);
+ rm_ns = sandesha2_make_connection_get_namespace_value(make_conn, env);
add_op_if_null(env, msg_ctx);
}
msg_pending = sandesha2_rm_elements_get_msg_pending(rm_elements, env);
if(msg_pending)
{
- sandesha2_msg_ctx_set_msg_part(rm_msg_ctx, env,
- SANDESHA2_MSG_PART_MESSAGE_PENDING,
- (sandesha2_iom_rm_part_t *) msg_pending);
- rm_ns = sandesha2_iom_rm_element_get_namespace_value(
- (sandesha2_iom_rm_element_t *) msg_pending, env);
+ sandesha2_msg_ctx_set_msg_pending(rm_msg_ctx, env,
+ msg_pending);
+ rm_ns = sandesha2_msg_pending_get_namespace_value(
+ msg_pending, env);
add_op_if_null(env, msg_ctx);
}
sandesha2_msg_ctx_set_rm_ns_val(rm_msg_ctx, env, rm_ns);
@@ -305,31 +294,16 @@
seq_prop_mgr = sandesha2_permanent_seq_property_mgr_create(env, dbname);
if(dbname)
AXIS2_FREE(env->allocator, dbname);
- create_seq = (sandesha2_create_seq_t *) sandesha2_msg_ctx_get_msg_part(
- rm_msg_ctx, env, SANDESHA2_MSG_PART_CREATE_SEQ);
- create_seq_res = (sandesha2_create_seq_res_t *)
- sandesha2_msg_ctx_get_msg_part(rm_msg_ctx, env,
- SANDESHA2_MSG_PART_CREATE_SEQ_RESPONSE);
- terminate_seq = (sandesha2_terminate_seq_t *)
- sandesha2_msg_ctx_get_msg_part(rm_msg_ctx, env,
- SANDESHA2_MSG_PART_TERMINATE_SEQ);
- terminate_seq_res = (sandesha2_terminate_seq_res_t *)
- sandesha2_msg_ctx_get_msg_part(rm_msg_ctx, env,
- SANDESHA2_MSG_PART_TERMINATE_SEQ_RESPONSE);
- seq_ack = (sandesha2_seq_ack_t *)
- sandesha2_msg_ctx_get_msg_part(rm_msg_ctx, env,
- SANDESHA2_MSG_PART_SEQ_ACKNOWLEDGEMENT);
- seq = (sandesha2_seq_t *) sandesha2_msg_ctx_get_msg_part(
- rm_msg_ctx, env, SANDESHA2_MSG_PART_SEQ);
- ack_request = (sandesha2_ack_requested_t *)
- sandesha2_msg_ctx_get_msg_part(rm_msg_ctx, env,
- SANDESHA2_MSG_PART_ACK_REQUEST);
- close_seq = (sandesha2_close_seq_t *) sandesha2_msg_ctx_get_msg_part(
- rm_msg_ctx, env, SANDESHA2_MSG_PART_CLOSE_SEQ);
- close_seq_res = (sandesha2_close_seq_res_t *) sandesha2_msg_ctx_get_msg_part(
- rm_msg_ctx, env, SANDESHA2_MSG_PART_CLOSE_SEQ_RESPONSE);
- make_conn = (sandesha2_make_connection_t *) sandesha2_msg_ctx_get_msg_part(
- rm_msg_ctx, env, SANDESHA2_MSG_PART_MAKE_CONNECTION);
+ create_seq = sandesha2_msg_ctx_get_create_seq(rm_msg_ctx, env);
+ create_seq_res = sandesha2_msg_ctx_get_create_seq_res(rm_msg_ctx, env);
+ terminate_seq = sandesha2_msg_ctx_get_terminate_seq(rm_msg_ctx, env);
+ terminate_seq_res = sandesha2_msg_ctx_get_terminate_seq_res(rm_msg_ctx, env);
+ seq_ack = sandesha2_msg_ctx_get_seq_ack(rm_msg_ctx, env);
+ seq = sandesha2_msg_ctx_get_sequence(rm_msg_ctx, env);
+ ack_request = sandesha2_msg_ctx_get_ack_requested(rm_msg_ctx, env);
+ close_seq = sandesha2_msg_ctx_get_close_seq(rm_msg_ctx, env);
+ close_seq_res = sandesha2_msg_ctx_get_close_seq_res(rm_msg_ctx, env);
+ make_conn = sandesha2_msg_ctx_get_make_connection(rm_msg_ctx, env);
/* Setting message type */
if(create_seq)
{
Modified: webservices/sandesha/trunk/c/src/util/msg_retrans_adjuster.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/msg_retrans_adjuster.c?rev=614032&r1=614031&r2=614032&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/util/msg_retrans_adjuster.c (original)
+++ webservices/sandesha/trunk/c/src/util/msg_retrans_adjuster.c Mon Jan 21 14:25:17 2008
@@ -127,8 +127,8 @@
sender_mgr);
continue_sending = AXIS2_FALSE;
}
- if(rm_msg_ctx)
- sandesha2_msg_ctx_free(rm_msg_ctx, env);
+ /*if(rm_msg_ctx)
+ sandesha2_msg_ctx_free(rm_msg_ctx, env);*/
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
"[sandesha2]Exit:sandesha2_msg_retrans_adjuster_adjust_retrans");
return continue_sending;
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?rev=614032&r1=614031&r2=614032&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/util/sandesha2_utils.c (original)
+++ webservices/sandesha/trunk/c/src/util/sandesha2_utils.c Mon Jan 21 14:25:17 2008
@@ -645,12 +645,11 @@
axis2_op_set_parent(op, env, svc);
}
- axutil_allocator_switch_to_global_pool(env->allocator);
+ /*axutil_allocator_switch_to_global_pool(env->allocator);*/
op_ctx = axis2_op_ctx_create(env, op, axis2_msg_ctx_get_svc_ctx(new_msg,
env));
- axutil_allocator_switch_to_local_pool(env->allocator);
+ /*axutil_allocator_switch_to_local_pool(env->allocator);*/
axis2_msg_ctx_set_op_ctx(new_msg, env, op_ctx);
- /*axis2_op_ctx_add_msg_ctx(op_ctx, env, new_msg);*/
soap_env = axiom_soap_envelope_create_default_soap_envelope(env,
sandesha2_utils_get_soap_version(env,
@@ -862,25 +861,21 @@
if(SANDESHA2_MSG_TYPE_APPLICATION == msg_type)
{
sandesha2_seq_t *seq = NULL;
- seq = (sandesha2_seq_t*)sandesha2_msg_ctx_get_msg_part(rm_msg_ctx, env,
- SANDESHA2_MSG_PART_SEQ);
+ seq = sandesha2_msg_ctx_get_sequence(rm_msg_ctx, env);
seq_id = sandesha2_identifier_get_identifier(
sandesha2_seq_get_identifier(seq, env), env);
}
else if(SANDESHA2_MSG_TYPE_ACK == msg_type)
{
sandesha2_seq_ack_t *seq_ack = NULL;
- seq_ack = (sandesha2_seq_ack_t*)sandesha2_msg_ctx_get_msg_part(
- rm_msg_ctx, env, SANDESHA2_MSG_PART_SEQ_ACKNOWLEDGEMENT);
+ seq_ack = sandesha2_msg_ctx_get_seq_ack(rm_msg_ctx, env);
seq_id = sandesha2_identifier_get_identifier(
sandesha2_seq_ack_get_identifier(seq_ack, env), env);
}
else if(SANDESHA2_MSG_TYPE_ACK_REQUEST == msg_type)
{
sandesha2_ack_requested_t *ack_requested = NULL;
- ack_requested = (sandesha2_ack_requested_t*)
- sandesha2_msg_ctx_get_msg_part(rm_msg_ctx, env,
- SANDESHA2_MSG_PART_ACK_REQUEST);
+ ack_requested = sandesha2_msg_ctx_get_ack_requested(rm_msg_ctx, env);
seq_id = sandesha2_identifier_get_identifier(
sandesha2_ack_requested_get_identifier(ack_requested,
env), env);
@@ -888,9 +883,7 @@
else if(SANDESHA2_MSG_TYPE_CLOSE_SEQ == msg_type)
{
sandesha2_close_seq_t *close_seq = NULL;
- close_seq = (sandesha2_close_seq_t*)
- sandesha2_msg_ctx_get_msg_part(rm_msg_ctx, env,
- SANDESHA2_MSG_PART_CLOSE_SEQ);
+ close_seq = sandesha2_msg_ctx_get_close_seq(rm_msg_ctx, env);
seq_id = sandesha2_identifier_get_identifier(
sandesha2_close_seq_get_identifier(close_seq,
env), env);
@@ -898,9 +891,7 @@
else if(SANDESHA2_MSG_TYPE_CLOSE_SEQ_RESPONSE == msg_type)
{
sandesha2_close_seq_res_t *close_seq_res = NULL;
- close_seq_res = (sandesha2_close_seq_res_t*)
- sandesha2_msg_ctx_get_msg_part(rm_msg_ctx, env,
- SANDESHA2_MSG_PART_CLOSE_SEQ_RESPONSE);
+ close_seq_res = sandesha2_msg_ctx_get_close_seq_res(rm_msg_ctx, env);
seq_id = sandesha2_identifier_get_identifier(
sandesha2_close_seq_res_get_identifier(close_seq_res,
env), env);
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?rev=614032&r1=614031&r2=614032&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/util/seq_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/util/seq_mgr.c Mon Jan 21 14:25:17 2008
@@ -97,8 +97,7 @@
return NULL;
}
reply_to = sandesha2_msg_ctx_get_reply_to(create_seq_msg, env);
- create_seq = (sandesha2_create_seq_t *) sandesha2_msg_ctx_get_msg_part(
- create_seq_msg, env, SANDESHA2_MSG_PART_CREATE_SEQ);
+ create_seq = sandesha2_msg_ctx_get_create_seq(create_seq_msg, env);
if(!create_seq)
{
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "Create Sequence Part is NULL");
@@ -173,8 +172,7 @@
AXIS2_FAILURE);
return NULL;
}
- msg_rm_ns = sandesha2_iom_rm_element_get_namespace_value(
- (sandesha2_iom_rm_element_t *) create_seq, env);
+ msg_rm_ns = sandesha2_create_seq_get_namespace_value(create_seq, env);
if(0 == axutil_strcmp(SANDESHA2_SPEC_2005_02_NS_URI, msg_rm_ns))
{
spec_version = axutil_strdup(env, SANDESHA2_SPEC_VERSION_1_0);
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?rev=614032&r1=614031&r2=614032&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/util/terminate_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/util/terminate_mgr.c Mon Jan 21 14:25:17 2008
@@ -723,8 +723,11 @@
to_bean = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr, env, int_seq_id,
SANDESHA2_SEQ_PROP_TO_EPR);
if(to_bean)
+ {
to_epr = axis2_endpoint_ref_create(env,
sandesha2_seq_property_bean_get_value(to_bean, env));
+ sandesha2_seq_property_bean_free(to_bean, env);
+ }
/*if(!to_epr)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[sandesha2] To EPR has an "
@@ -780,9 +783,7 @@
axis2_char_t *seq_id = NULL;
axis2_char_t *internal_seq_id = NULL;
- terminate_seq = (sandesha2_terminate_seq_t*)
- sandesha2_msg_ctx_get_msg_part(terminate_rm_msg, env,
- SANDESHA2_MSG_PART_TERMINATE_SEQ);
+ terminate_seq = sandesha2_msg_ctx_get_terminate_seq(terminate_rm_msg, env);
seq_id = sandesha2_identifier_get_identifier(
sandesha2_terminate_seq_get_identifier(terminate_seq,
env), env);
@@ -822,9 +823,7 @@
sandesha2_msg_ctx_get_msg_id(terminate_rm_msg, env));
sandesha2_sender_bean_set_send(terminate_bean, env, AXIS2_TRUE);
- terminate_seq = (sandesha2_terminate_seq_t*)
- sandesha2_msg_ctx_get_msg_part(terminate_rm_msg, env,
- SANDESHA2_MSG_PART_TERMINATE_SEQ);
+ terminate_seq = sandesha2_msg_ctx_get_terminate_seq(terminate_rm_msg, env);
seq_id = sandesha2_identifier_get_identifier(
sandesha2_terminate_seq_get_identifier(terminate_seq,
env), env);
Modified: webservices/sandesha/trunk/c/src/workers/in_order_invoker.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/workers/in_order_invoker.c?rev=614032&r1=614031&r2=614032&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/workers/in_order_invoker.c (original)
+++ webservices/sandesha/trunk/c/src/workers/in_order_invoker.c Mon Jan 21 14:25:17 2008
@@ -414,8 +414,7 @@
sandesha2_msg_ctx_get_msg_type(rm_msg_ctx, env))
{
sandesha2_seq_t *seq = NULL;
- seq = (sandesha2_seq_t*)sandesha2_msg_ctx_get_msg_part(
- rm_msg_ctx, env, SANDESHA2_MSG_PART_SEQ);
+ seq = sandesha2_msg_ctx_get_sequence(rm_msg_ctx, env);
if(sandesha2_seq_get_last_msg(seq, env))
{
sandesha2_terminate_mgr_clean_recv_side_after_invocation(
Modified: webservices/sandesha/trunk/c/src/workers/sender_worker.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/workers/sender_worker.c?rev=614032&r1=614031&r2=614032&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/workers/sender_worker.c (original)
+++ webservices/sandesha/trunk/c/src/workers/sender_worker.c Mon Jan 21 14:25:17 2008
@@ -307,9 +307,7 @@
axis2_char_t *seq_id = NULL;
sandesha2_identifier_t *identifier = NULL;
- seq = (sandesha2_seq_t*)
- sandesha2_msg_ctx_get_msg_part(rm_msg_ctx, env,
- SANDESHA2_MSG_PART_SEQ);
+ seq = sandesha2_msg_ctx_get_sequence(rm_msg_ctx, env);
identifier = sandesha2_seq_get_identifier(seq, env);
seq_id = sandesha2_identifier_get_identifier(identifier, env);
}
@@ -370,9 +368,7 @@
axis2_conf_ctx_t *conf_ctx = NULL;
axis2_char_t *internal_seq_id = NULL;
- terminate_seq = (sandesha2_terminate_seq_t*)
- sandesha2_msg_ctx_get_msg_part(rm_msg_ctx, env,
- SANDESHA2_MSG_PART_TERMINATE_SEQ);
+ terminate_seq = sandesha2_msg_ctx_get_terminate_seq(rm_msg_ctx, env);
seq_id = sandesha2_identifier_get_identifier(
sandesha2_terminate_seq_get_identifier(terminate_seq,
env), env);
@@ -441,8 +437,7 @@
{
AXIS2_PARAM_CHECK(env->error, rm_msg_ctx, AXIS2_FAILURE);
- if(sandesha2_msg_ctx_get_msg_part(rm_msg_ctx, env,
- SANDESHA2_MSG_PART_SEQ_ACKNOWLEDGEMENT))
+ if(sandesha2_msg_ctx_get_seq_ack(rm_msg_ctx, env))
return AXIS2_TRUE;
return AXIS2_FALSE;
Modified: webservices/sandesha/trunk/c/src/wsrm/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/Makefile.am?rev=614032&r1=614031&r2=614032&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/Makefile.am (original)
+++ webservices/sandesha/trunk/c/src/wsrm/Makefile.am Mon Jan 21 14:25:17 2008
@@ -5,6 +5,7 @@
identifier.c\
address.c\
acks_to.c\
+ nack.c\
accept.c\
ack_none.c\
ack_range.c\
@@ -12,7 +13,6 @@
fault_code.c\
msg_number.c\
last_msg.c\
- nack.c\
ack_requested.c\
close_seq.c\
close_seq_res.c\
@@ -25,8 +25,6 @@
terminate_seq.c\
terminate_seq_res.c\
rm_elements.c \
- iom_rm_element.c \
- iom_rm_part.c \
msg_pending.c \
make_connection.c
Modified: webservices/sandesha/trunk/c/src/wsrm/accept.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/accept.c?rev=614032&r1=614031&r2=614032&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/accept.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/accept.c Mon Jan 21 14:25:17 2008
@@ -21,156 +21,113 @@
* @brief Accept struct impl
* Sandesha2 IOM Accept
*/
-typedef struct sandesha2_accept_impl sandesha2_accept_impl_t;
-struct sandesha2_accept_impl
+struct sandesha2_accept_t
{
- sandesha2_accept_t accept;
sandesha2_acks_to_t *acks_to;
axis2_char_t *rm_ns_val;
axis2_char_t *addr_ns_val;
};
-#define SANDESHA2_INTF_TO_IMPL(accept) ((sandesha2_accept_impl_t *)(accept))
-
/***************************** Function headers *******************************/
-axis2_char_t* AXIS2_CALL
-sandesha2_accept_get_namespace_value (sandesha2_iom_rm_element_t *accept,
- const axutil_env_t *env);
void* AXIS2_CALL
-sandesha2_accept_from_om_node(sandesha2_iom_rm_element_t *accept,
- const axutil_env_t *env, axiom_node_t *om_node);
+sandesha2_accept_from_om_node(
+ sandesha2_accept_t *accept,
+ const axutil_env_t *env,
+ axiom_node_t *om_node);
axiom_node_t* AXIS2_CALL
-sandesha2_accept_to_om_node(sandesha2_iom_rm_element_t *accept,
- const axutil_env_t *env, void *om_node);
+sandesha2_accept_to_om_node(
+ sandesha2_accept_t *accept,
+ const axutil_env_t *env,
+ void *om_node);
axis2_bool_t AXIS2_CALL
-sandesha2_accept_is_namespace_supported(sandesha2_iom_rm_element_t *accept,
- const axutil_env_t *env, axis2_char_t *namespace);
-
-axis2_status_t AXIS2_CALL
-sandesha2_accept_free (sandesha2_iom_rm_element_t *accept, const axutil_env_t *env);
-
+sandesha2_accept_is_namespace_supported(
+ const axutil_env_t *env,
+ axis2_char_t *namespace);
/***************************** End of function headers ************************/
AXIS2_EXTERN sandesha2_accept_t* AXIS2_CALL
-sandesha2_accept_create(const axutil_env_t *env, axis2_char_t *rm_ns_val,
- axis2_char_t *addr_ns_val)
+sandesha2_accept_create(
+ const axutil_env_t *env,
+ axis2_char_t *rm_ns_val,
+ axis2_char_t *addr_ns_val)
{
- sandesha2_accept_impl_t *accept_impl = NULL;
- AXIS2_ENV_CHECK(env, NULL);
+ sandesha2_accept_t *accept = NULL;
AXIS2_PARAM_CHECK(env->error, rm_ns_val, NULL);
AXIS2_PARAM_CHECK(env->error, addr_ns_val, NULL);
- if(AXIS2_FALSE == sandesha2_accept_is_namespace_supported(
- (sandesha2_iom_rm_element_t*)accept_impl,
- env, rm_ns_val))
+ if(AXIS2_FALSE == sandesha2_accept_is_namespace_supported(env, rm_ns_val))
{
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_UNSUPPORTED_NS,
- AXIS2_FAILURE);
+ AXIS2_FAILURE);
return NULL;
}
- accept_impl = (sandesha2_accept_impl_t *)AXIS2_MALLOC
- (env->allocator, sizeof(sandesha2_accept_impl_t));
+ accept = (sandesha2_accept_t *)AXIS2_MALLOC(env->allocator, sizeof(sandesha2_accept_t));
- if(NULL == accept_impl)
+ if(NULL == accept)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
- accept_impl->rm_ns_val = NULL;
- accept_impl->addr_ns_val = NULL;
- accept_impl->acks_to = NULL;
- accept_impl->accept.element.ops = NULL;
-
- accept_impl->accept.element.ops = AXIS2_MALLOC(env->allocator,
- sizeof(sandesha2_iom_rm_element_ops_t));
- if(NULL == accept_impl->accept.element.ops)
- {
- sandesha2_accept_free((sandesha2_iom_rm_element_t*)accept_impl, env);
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
- return NULL;
- }
-
- accept_impl->rm_ns_val = (axis2_char_t *)axutil_strdup(env ,rm_ns_val);
- accept_impl->addr_ns_val = (axis2_char_t *)axutil_strdup(env, addr_ns_val);
- accept_impl->acks_to = NULL;
+ accept->rm_ns_val = NULL;
+ accept->addr_ns_val = NULL;
+ accept->acks_to = NULL;
+
+ accept->rm_ns_val = (axis2_char_t *)axutil_strdup(env ,rm_ns_val);
+ accept->addr_ns_val = (axis2_char_t *)axutil_strdup(env, addr_ns_val);
+ accept->acks_to = NULL;
- accept_impl->accept.element.ops->get_namespace_value =
- sandesha2_accept_get_namespace_value;
- accept_impl->accept.element.ops->from_om_node = sandesha2_accept_from_om_node;
- accept_impl->accept.element.ops->to_om_node = sandesha2_accept_to_om_node;
- accept_impl->accept.element.ops->is_namespace_supported =
- sandesha2_accept_is_namespace_supported;
- accept_impl->accept.element.ops->free = sandesha2_accept_free;
-
- return &(accept_impl->accept);
+ return accept;
}
axis2_status_t AXIS2_CALL
-sandesha2_accept_free (sandesha2_iom_rm_element_t *accept,
- const axutil_env_t *env)
+sandesha2_accept_free(
+ sandesha2_accept_t *accept,
+ const axutil_env_t *env)
{
- sandesha2_accept_impl_t *accept_impl = NULL;
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- accept_impl = SANDESHA2_INTF_TO_IMPL(accept);
-
- if(NULL != accept_impl->addr_ns_val)
- {
- AXIS2_FREE(env->allocator, accept_impl->addr_ns_val);
- accept_impl->addr_ns_val = NULL;
- }
- if(NULL != accept_impl->rm_ns_val)
+ if(NULL != accept->addr_ns_val)
{
- AXIS2_FREE(env->allocator, accept_impl->rm_ns_val);
- accept_impl->rm_ns_val = NULL;
+ AXIS2_FREE(env->allocator, accept->addr_ns_val);
+ accept->addr_ns_val = NULL;
}
- if(NULL != accept_impl->accept.element.ops)
+ if(NULL != accept->rm_ns_val)
{
- AXIS2_FREE(env->allocator, accept_impl->accept.element.ops);
- accept_impl->accept.element.ops = NULL;
- }
- if(NULL != accept->ops)
- {
- AXIS2_FREE(env->allocator, accept->ops);
- accept->ops = NULL;
+ AXIS2_FREE(env->allocator, accept->rm_ns_val);
+ accept->rm_ns_val = NULL;
}
- AXIS2_FREE(env->allocator, SANDESHA2_INTF_TO_IMPL(accept));
+ AXIS2_FREE(env->allocator, accept);
return AXIS2_SUCCESS;
}
axis2_char_t* AXIS2_CALL
-sandesha2_accept_get_namespace_value (sandesha2_iom_rm_element_t *accept,
- const axutil_env_t *env)
+sandesha2_accept_get_namespace_value(
+ sandesha2_accept_t *accept,
+ const axutil_env_t *env)
{
- sandesha2_accept_impl_t *accept_impl = NULL;
- accept_impl = SANDESHA2_INTF_TO_IMPL(accept);
- return accept_impl->rm_ns_val;
+ return accept->rm_ns_val;
}
void* AXIS2_CALL
sandesha2_accept_from_om_node(
- sandesha2_iom_rm_element_t *accept,
+ sandesha2_accept_t *accept,
const axutil_env_t *env,
axiom_node_t *om_node)
{
- sandesha2_accept_impl_t *accept_impl = NULL;
axutil_qname_t *accept_qname = NULL;
axiom_node_t *child_om_node = NULL;
axiom_element_t *om_element = NULL;
axiom_element_t *accept_part = NULL;
- AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, om_node, NULL);
- accept_impl = SANDESHA2_INTF_TO_IMPL(accept);
accept_qname = axutil_qname_create(env, SANDESHA2_WSRM_COMMON_ACCEPT,
- accept_impl->rm_ns_val, NULL);
+ accept->rm_ns_val, NULL);
if(NULL == accept_qname)
{
return NULL;
@@ -190,14 +147,13 @@
AXIS2_FAILURE);
return NULL;
}
- accept_impl->acks_to = sandesha2_acks_to_create(env, NULL,
- accept_impl->rm_ns_val, accept_impl->addr_ns_val);
- if(NULL == accept_impl->acks_to)
+ accept->acks_to = sandesha2_acks_to_create(env, NULL,
+ accept->rm_ns_val, accept->addr_ns_val);
+ if(NULL == accept->acks_to)
{
return NULL;
}
- if(!sandesha2_iom_rm_element_from_om_node((sandesha2_iom_rm_element_t *)accept_impl->acks_to, env,
- child_om_node))
+ if(!sandesha2_acks_to_from_om_node(accept->acks_to, env, child_om_node))
{
return NULL;
}
@@ -206,24 +162,23 @@
axiom_node_t* AXIS2_CALL
-sandesha2_accept_to_om_node(sandesha2_iom_rm_element_t *accept,
- const axutil_env_t *env, void *om_node)
+sandesha2_accept_to_om_node(
+ sandesha2_accept_t *accept,
+ const axutil_env_t *env,
+ void *om_node)
{
- sandesha2_accept_impl_t *accept_impl = NULL;
axiom_namespace_t *rm_namespace = NULL;
axiom_element_t *accept_element = NULL;
axiom_node_t *accept_node = NULL;
- AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, om_node, NULL);
- accept_impl = SANDESHA2_INTF_TO_IMPL(accept);
- if(NULL == accept_impl->acks_to)
+ if(NULL == accept->acks_to)
{
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_TO_OM_NULL_ELEMENT,
- AXIS2_FAILURE);
+ AXIS2_FAILURE);
return NULL;
}
- rm_namespace = axiom_namespace_create(env, accept_impl->rm_ns_val,
+ rm_namespace = axiom_namespace_create(env, accept->rm_ns_val,
SANDESHA2_WSRM_COMMON_NS_PREFIX_RM);
if(NULL == rm_namespace)
{
@@ -236,49 +191,45 @@
{
return NULL;
}
- sandesha2_iom_rm_element_to_om_node((sandesha2_iom_rm_element_t *)
- accept_impl->acks_to, env, accept_node);
+ sandesha2_acks_to_to_om_node(accept->acks_to, env, accept_node);
axiom_node_add_child((axiom_node_t*)om_node, env, accept_node);
return (axiom_node_t*)om_node;
}
-axis2_bool_t AXIS2_CALL
-sandesha2_accept_is_namespace_supported(sandesha2_iom_rm_element_t *accept,
- const axutil_env_t *env, axis2_char_t *namespace)
-{
- if(0 == axutil_strcmp(namespace, SANDESHA2_SPEC_2005_02_NS_URI))
- {
- return AXIS2_TRUE;
- }
- if(0 == axutil_strcmp(namespace, SANDESHA2_SPEC_2006_08_NS_URI))
- {
- return AXIS2_TRUE;
- }
- return AXIS2_FALSE;
-}
-
axis2_status_t AXIS2_CALL
sandesha2_accept_set_acks_to(
sandesha2_accept_t *accept,
const axutil_env_t *env,
sandesha2_acks_to_t *acks_to)
{
- sandesha2_accept_impl_t *accept_impl = NULL;
-
- accept_impl = SANDESHA2_INTF_TO_IMPL(accept);
/* TODO free old acks_to ?*/
- accept_impl->acks_to = acks_to;
+ accept->acks_to = acks_to;
return AXIS2_SUCCESS;
}
-
sandesha2_acks_to_t * AXIS2_CALL
sandesha2_accept_get_acks_to(
sandesha2_accept_t *accept,
const axutil_env_t *env)
{
- sandesha2_accept_impl_t *accept_impl = NULL;
- accept_impl = SANDESHA2_INTF_TO_IMPL(accept);
- return accept_impl->acks_to;
-}
+ return accept->acks_to;
+}
+
+axis2_bool_t AXIS2_CALL
+sandesha2_accept_is_namespace_supported(
+ const axutil_env_t *env,
+ axis2_char_t *namespace)
+{
+ if(0 == axutil_strcmp(namespace, SANDESHA2_SPEC_2005_02_NS_URI))
+ {
+ return AXIS2_TRUE;
+ }
+ if(0 == axutil_strcmp(namespace, SANDESHA2_SPEC_2006_08_NS_URI))
+ {
+ return AXIS2_TRUE;
+ }
+ return AXIS2_FALSE;
+}
+
+
Modified: webservices/sandesha/trunk/c/src/wsrm/ack_final.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/ack_final.c?rev=614032&r1=614031&r2=614032&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/ack_final.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/ack_final.c Mon Jan 21 14:25:17 2008
@@ -16,143 +16,104 @@
#include <sandesha2_ack_final.h>
#include <sandesha2_constants.h>
+#include <axiom_node.h>
+#include <axiom_element.h>
+#include <sandesha2_error.h>
/**
* @brief AckFinal struct impl
- * Sandesha2 IOM AckFinal
+ * Sandesha2 AckFinal
*/
-typedef struct sandesha2_ack_final_impl sandesha2_ack_final_impl_t;
-
-struct sandesha2_ack_final_impl
+struct sandesha2_ack_final_t
{
- sandesha2_ack_final_t ack_final;
axis2_char_t *ns_val;
};
-#define SANDESHA2_INTF_TO_IMPL(ack_final) \
- ((sandesha2_ack_final_impl_t *)(ack_final))
-
/***************************** Function headers *******************************/
-axis2_char_t* AXIS2_CALL
-sandesha2_ack_final_get_namespace_value (sandesha2_iom_rm_element_t *ack_final,
- const axutil_env_t *env);
-
void* AXIS2_CALL
-sandesha2_ack_final_from_om_node(sandesha2_iom_rm_element_t *ack_final,
- const axutil_env_t *env, axiom_node_t *om_node);
+sandesha2_ack_final_from_om_node(
+ sandesha2_ack_final_t *ack_final,
+ const axutil_env_t *env,
+ axiom_node_t *om_node);
axiom_node_t* AXIS2_CALL
-sandesha2_ack_final_to_om_node(sandesha2_iom_rm_element_t *ack_final,
- const axutil_env_t *env, void *om_node);
+sandesha2_ack_final_to_om_node(
+ sandesha2_ack_final_t *ack_final,
+ const axutil_env_t *env, void *om_node);
axis2_bool_t AXIS2_CALL
-sandesha2_ack_final_is_namespace_supported(sandesha2_iom_rm_element_t *ack_final,
- const axutil_env_t *env, axis2_char_t *namespace);
-
-axis2_status_t AXIS2_CALL
-sandesha2_ack_final_free (sandesha2_iom_rm_element_t *ack_final,
- const axutil_env_t *env);
+sandesha2_ack_final_is_namespace_supported(
+ const axutil_env_t *env,
+ axis2_char_t *namespace);
/***************************** End of function headers ************************/
AXIS2_EXTERN sandesha2_ack_final_t* AXIS2_CALL
-sandesha2_ack_final_create(const axutil_env_t *env, axis2_char_t *ns_val)
+sandesha2_ack_final_create(
+ const axutil_env_t *env,
+ axis2_char_t *ns_val)
{
- sandesha2_ack_final_impl_t *ack_final_impl = NULL;
- AXIS2_ENV_CHECK(env, NULL);
+ sandesha2_ack_final_t *ack_final = NULL;
AXIS2_PARAM_CHECK(env->error, ns_val, NULL);
- if(AXIS2_FALSE == sandesha2_ack_final_is_namespace_supported(
- (sandesha2_iom_rm_element_t*)ack_final_impl,
- env, ns_val))
+ if(AXIS2_FALSE == sandesha2_ack_final_is_namespace_supported(env, ns_val))
{
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_UNSUPPORTED_NS,
- AXIS2_FAILURE);
+ AXIS2_FAILURE);
return NULL;
}
- ack_final_impl = (sandesha2_ack_final_impl_t *)AXIS2_MALLOC
- (env->allocator, sizeof(sandesha2_ack_final_impl_t));
+ ack_final = (sandesha2_ack_final_t *)AXIS2_MALLOC
+ (env->allocator, sizeof(sandesha2_ack_final_t));
- if(NULL == ack_final_impl)
+ if(NULL == ack_final)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
- ack_final_impl->ns_val = NULL;
- ack_final_impl->ack_final.element.ops = NULL;
-
- ack_final_impl->ack_final.element.ops = AXIS2_MALLOC(env->allocator,
- sizeof(sandesha2_iom_rm_element_ops_t));
- if(NULL == ack_final_impl->ack_final.element.ops)
- {
- sandesha2_ack_final_free((sandesha2_iom_rm_element_t*)ack_final_impl,
- env);
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
- return NULL;
- }
- ack_final_impl->ns_val = (axis2_char_t *)axutil_strdup(env, ns_val);
+ ack_final->ns_val = NULL;
+ ack_final->ns_val = (axis2_char_t *)axutil_strdup(env, ns_val);
- ack_final_impl->ack_final.element.ops->get_namespace_value =
- sandesha2_ack_final_get_namespace_value;
- ack_final_impl->ack_final.element.ops->from_om_node =
- sandesha2_ack_final_from_om_node;
- ack_final_impl->ack_final.element.ops->to_om_node =
- sandesha2_ack_final_to_om_node;
- ack_final_impl->ack_final.element.ops->is_namespace_supported =
- sandesha2_ack_final_is_namespace_supported;
- ack_final_impl->ack_final.element.ops->free = sandesha2_ack_final_free;
-
- return &(ack_final_impl->ack_final);
+ return ack_final;
}
axis2_status_t AXIS2_CALL
-sandesha2_ack_final_free (sandesha2_iom_rm_element_t *ack_final,
- const axutil_env_t *env)
+sandesha2_ack_final_free(
+ sandesha2_ack_final_t *ack_final,
+ const axutil_env_t *env)
{
- sandesha2_ack_final_impl_t *ack_final_impl = NULL;
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- ack_final_impl = SANDESHA2_INTF_TO_IMPL(ack_final);
-
- if(NULL != ack_final_impl->ns_val)
+ if(NULL != ack_final->ns_val)
{
- AXIS2_FREE(env->allocator, ack_final_impl->ns_val);
- ack_final_impl->ns_val = NULL;
+ AXIS2_FREE(env->allocator, ack_final->ns_val);
+ ack_final->ns_val = NULL;
}
- if(NULL != ack_final_impl->ack_final.element.ops)
- {
- AXIS2_FREE(env->allocator, ack_final_impl->ack_final.element.ops);
- ack_final_impl->ack_final.element.ops = NULL;
- }
- AXIS2_FREE(env->allocator, SANDESHA2_INTF_TO_IMPL(ack_final));
+ AXIS2_FREE(env->allocator, ack_final);
return AXIS2_SUCCESS;
}
axis2_char_t* AXIS2_CALL
-sandesha2_ack_final_get_namespace_value (sandesha2_iom_rm_element_t *ack_final,
- const axutil_env_t *env)
+sandesha2_ack_final_get_namespace_value(
+ sandesha2_ack_final_t *ack_final,
+ const axutil_env_t *env)
{
- sandesha2_ack_final_impl_t *ack_final_impl = NULL;
- ack_final_impl = SANDESHA2_INTF_TO_IMPL(ack_final);
- return ack_final_impl->ns_val;
+ return ack_final->ns_val;
}
void* AXIS2_CALL
-sandesha2_ack_final_from_om_node(sandesha2_iom_rm_element_t *ack_final,
- const axutil_env_t *env, axiom_node_t *om_node)
+sandesha2_ack_final_from_om_node(
+ sandesha2_ack_final_t *ack_final,
+ const axutil_env_t *env,
+ axiom_node_t *om_node)
{
- sandesha2_ack_final_impl_t *ack_final_impl = NULL;
axutil_qname_t *final_qname = NULL;
axiom_element_t *om_element = NULL;
axiom_element_t *final_part = NULL;
axiom_node_t *final_part_node = NULL;
- AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, om_node, NULL);
- ack_final_impl = SANDESHA2_INTF_TO_IMPL(ack_final);
final_qname = axutil_qname_create(env, SANDESHA2_WSRM_COMMON_FINAL,
- ack_final_impl->ns_val, NULL);
+ ack_final->ns_val, NULL);
if(NULL == final_qname)
{
return NULL;
@@ -161,15 +122,15 @@
if(NULL == om_element)
{
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_NULL_OM_ELEMENT,
- AXIS2_FAILURE);
+ AXIS2_FAILURE);
return NULL;
}
final_part = axiom_element_get_first_child_with_qname(om_element, env,
- final_qname, om_node, &final_part_node);
+ final_qname, om_node, &final_part_node);
if(NULL == final_part)
{
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_NULL_OM_ELEMENT,
- AXIS2_FAILURE);
+ AXIS2_FAILURE);
return NULL;
}
return ack_final;
@@ -177,38 +138,33 @@
axiom_node_t* AXIS2_CALL
-sandesha2_ack_final_to_om_node(sandesha2_iom_rm_element_t *ack_final,
- const axutil_env_t *env, void *om_node)
+sandesha2_ack_final_to_om_node(
+ sandesha2_ack_final_t *ack_final,
+ const axutil_env_t *env, void *om_node)
{
- sandesha2_ack_final_impl_t *ack_final_impl = NULL;
axiom_namespace_t *rm_ns = NULL;
axiom_element_t *af_element = NULL;
axiom_node_t *af_node = NULL;
- AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, om_node, NULL);
- ack_final_impl = SANDESHA2_INTF_TO_IMPL(ack_final);
- rm_ns = axiom_namespace_create(env, ack_final_impl->ns_val,
- SANDESHA2_WSRM_COMMON_NS_PREFIX_RM);
+ rm_ns = axiom_namespace_create(env, ack_final->ns_val,
+ SANDESHA2_WSRM_COMMON_NS_PREFIX_RM);
if(NULL == rm_ns)
{
return NULL;
}
af_element = axiom_element_create(env, NULL, SANDESHA2_WSRM_COMMON_FINAL,
- rm_ns, &af_node);
+ rm_ns, &af_node);
axiom_node_add_child((axiom_node_t*)om_node, env, af_node);
return (axiom_node_t*)om_node;
}
axis2_bool_t AXIS2_CALL
-sandesha2_ack_final_is_namespace_supported(sandesha2_iom_rm_element_t *ack_final,
- const axutil_env_t *env, axis2_char_t *namespace)
+sandesha2_ack_final_is_namespace_supported(
+ const axutil_env_t *env,
+ axis2_char_t *namespace)
{
- sandesha2_ack_final_impl_t *ack_final_impl = NULL;
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-
- ack_final_impl = SANDESHA2_INTF_TO_IMPL(ack_final);
if(0 == axutil_strcmp(namespace, SANDESHA2_SPEC_2005_02_NS_URI))
{
return AXIS2_FALSE;
Modified: webservices/sandesha/trunk/c/src/wsrm/ack_none.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/ack_none.c?rev=614032&r1=614031&r2=614032&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/ack_none.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/ack_none.c Mon Jan 21 14:25:17 2008
@@ -16,144 +16,105 @@
#include <sandesha2_ack_none.h>
#include <sandesha2_constants.h>
+#include <axiom_node.h>
+#include <axiom_element.h>
/**
* @brief AckNone struct impl
- * Sandesha2 IOM AckNone
+ * Sandesha2 AckNone
*/
-typedef struct sandesha2_ack_none_impl sandesha2_ack_none_impl_t;
-
-struct sandesha2_ack_none_impl
+struct sandesha2_ack_none_t
{
- sandesha2_ack_none_t ack_none;
axis2_char_t *ns_val;
};
-#define SANDESHA2_INTF_TO_IMPL(ack_none) \
- ((sandesha2_ack_none_impl_t *)(ack_none))
-
/***************************** Function headers *******************************/
-axis2_char_t* AXIS2_CALL
-sandesha2_ack_none_get_namespace_value (sandesha2_iom_rm_element_t *ack_none,
- const axutil_env_t *env);
void* AXIS2_CALL
-sandesha2_ack_none_from_om_node(sandesha2_iom_rm_element_t *ack_none,
- const axutil_env_t *env, axiom_node_t *om_node);
+sandesha2_ack_none_from_om_node(
+ sandesha2_ack_none_t *ack_none,
+ const axutil_env_t *env,
+ axiom_node_t *om_node);
axiom_node_t* AXIS2_CALL
-sandesha2_ack_none_to_om_node(sandesha2_iom_rm_element_t *ack_none,
- const axutil_env_t *env, void *om_node);
+sandesha2_ack_none_to_om_node(
+ sandesha2_ack_none_t *ack_none,
+ const axutil_env_t *env,
+ void *om_node);
axis2_bool_t AXIS2_CALL
-sandesha2_ack_none_is_namespace_supported(sandesha2_iom_rm_element_t *ack_none,
- const axutil_env_t *env, axis2_char_t *namespace);
-
-axis2_status_t AXIS2_CALL
-sandesha2_ack_none_free (sandesha2_iom_rm_element_t *ack_none,
- const axutil_env_t *env);
+sandesha2_ack_none_is_namespace_supported(
+ const axutil_env_t *env,
+ axis2_char_t *namespace);
/***************************** End of function headers ************************/
AXIS2_EXTERN sandesha2_ack_none_t * AXIS2_CALL
-sandesha2_ack_none_create(const axutil_env_t *env, axis2_char_t *ns_val)
+sandesha2_ack_none_create(
+ const axutil_env_t *env,
+ axis2_char_t *ns_val)
{
- sandesha2_ack_none_impl_t *ack_none_impl = NULL;
- AXIS2_ENV_CHECK(env, NULL);
+ sandesha2_ack_none_t *ack_none = NULL;
AXIS2_PARAM_CHECK(env->error, ns_val, NULL);
- if(AXIS2_FALSE == sandesha2_ack_none_is_namespace_supported(
- (sandesha2_iom_rm_element_t*)ack_none_impl,
- env, ns_val))
+ if(AXIS2_FALSE == sandesha2_ack_none_is_namespace_supported(env, ns_val))
{
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_UNSUPPORTED_NS,
- AXIS2_FAILURE);
+ AXIS2_FAILURE);
return NULL;
}
- ack_none_impl = (sandesha2_ack_none_impl_t *)AXIS2_MALLOC
- (env->allocator, sizeof(sandesha2_ack_none_impl_t));
+ ack_none = (sandesha2_ack_none_t *)AXIS2_MALLOC
+ (env->allocator, sizeof(sandesha2_ack_none_t));
- if(NULL == ack_none_impl)
+ if(NULL == ack_none)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
- ack_none_impl->ns_val = NULL;
- ack_none_impl->ack_none.element.ops = NULL;
+ ack_none->ns_val = NULL;
- ack_none_impl->ack_none.element.ops = AXIS2_MALLOC(env->allocator,
- sizeof(sandesha2_iom_rm_element_ops_t));
- if(NULL == ack_none_impl->ack_none.element.ops)
- {
- sandesha2_ack_none_free((sandesha2_iom_rm_element_t*)
- ack_none_impl, env);
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
- return NULL;
- }
- ack_none_impl->ns_val = (axis2_char_t *)axutil_strdup( env , ns_val);
- ack_none_impl->ack_none.element.ops->get_namespace_value =
- sandesha2_ack_none_get_namespace_value;
- ack_none_impl->ack_none.element.ops->from_om_node =
- sandesha2_ack_none_from_om_node;
- ack_none_impl->ack_none.element.ops->to_om_node =
- sandesha2_ack_none_to_om_node;
- ack_none_impl->ack_none.element.ops->is_namespace_supported =
- sandesha2_ack_none_is_namespace_supported;
- ack_none_impl->ack_none.element.ops->free = sandesha2_ack_none_free;
+ ack_none->ns_val = (axis2_char_t *)axutil_strdup( env , ns_val);
- return &(ack_none_impl->ack_none);
+ return ack_none;
}
axis2_status_t AXIS2_CALL
-sandesha2_ack_none_free (sandesha2_iom_rm_element_t *ack_none,
- const axutil_env_t *env)
+sandesha2_ack_none_free(
+ sandesha2_ack_none_t *ack_none,
+ const axutil_env_t *env)
{
- sandesha2_ack_none_impl_t *ack_none_impl = NULL;
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- ack_none_impl = SANDESHA2_INTF_TO_IMPL(ack_none);
-
- if(NULL != ack_none_impl->ns_val)
- {
- AXIS2_FREE(env->allocator, ack_none_impl->ns_val);
- ack_none_impl->ns_val = NULL;
- }
- if(NULL != ack_none_impl->ack_none.element.ops)
+ if(NULL != ack_none->ns_val)
{
- AXIS2_FREE(env->allocator, ack_none_impl->ack_none.element.ops);
- ack_none_impl->ack_none.element.ops = NULL;
+ AXIS2_FREE(env->allocator, ack_none->ns_val);
+ ack_none->ns_val = NULL;
}
- AXIS2_FREE(env->allocator, SANDESHA2_INTF_TO_IMPL(ack_none));
+ AXIS2_FREE(env->allocator, ack_none);
return AXIS2_SUCCESS;
}
axis2_char_t* AXIS2_CALL
-sandesha2_ack_none_get_namespace_value (sandesha2_iom_rm_element_t *ack_none,
- const axutil_env_t *env)
+sandesha2_ack_none_get_namespace_value(
+ sandesha2_ack_none_t *ack_none,
+ const axutil_env_t *env)
{
- sandesha2_ack_none_impl_t *ack_none_impl = NULL;
- AXIS2_ENV_CHECK(env, NULL);
-
- ack_none_impl = SANDESHA2_INTF_TO_IMPL(ack_none);
- return ack_none_impl->ns_val;
+ return ack_none->ns_val;
}
void* AXIS2_CALL
-sandesha2_ack_none_from_om_node(sandesha2_iom_rm_element_t *ack_none,
- const axutil_env_t *env, axiom_node_t *om_node)
+sandesha2_ack_none_from_om_node(
+ sandesha2_ack_none_t *ack_none,
+ const axutil_env_t *env, axiom_node_t *om_node)
{
- sandesha2_ack_none_impl_t *ack_none_impl = NULL;
axiom_element_t *om_element = NULL;
axiom_element_t *none_part = NULL;
axiom_node_t *none_node = NULL;
axutil_qname_t *none_qname = NULL;
- AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, om_node, NULL);
- ack_none_impl = SANDESHA2_INTF_TO_IMPL(ack_none);
none_qname = axutil_qname_create(env, SANDESHA2_WSRM_COMMON_NONE,
- ack_none_impl->ns_val, NULL);
+ ack_none->ns_val, NULL);
if(NULL == none_qname)
{
return NULL;
@@ -162,7 +123,7 @@
if(NULL == om_element)
{
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_NULL_OM_ELEMENT,
- AXIS2_FAILURE);
+ AXIS2_FAILURE);
return NULL;
}
none_part = axiom_element_get_first_child_with_qname(om_element, env,
@@ -170,7 +131,7 @@
if(NULL == none_part)
{
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_NULL_OM_ELEMENT,
- AXIS2_FAILURE);
+ AXIS2_FAILURE);
return NULL;
}
return ack_none;
@@ -178,26 +139,25 @@
axiom_node_t* AXIS2_CALL
-sandesha2_ack_none_to_om_node(sandesha2_iom_rm_element_t *ack_none,
- const axutil_env_t *env, void *om_node)
+sandesha2_ack_none_to_om_node(
+ sandesha2_ack_none_t *ack_none,
+ const axutil_env_t *env,
+ void *om_node)
{
- sandesha2_ack_none_impl_t *ack_none_impl = NULL;
axiom_namespace_t *rm_ns = NULL;
axiom_element_t *an_element = NULL;
axiom_node_t *an_node = NULL;
- AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, om_node, NULL);
- ack_none_impl = SANDESHA2_INTF_TO_IMPL(ack_none);
- rm_ns = axiom_namespace_create(env, ack_none_impl->ns_val,
- SANDESHA2_WSRM_COMMON_NS_PREFIX_RM);
+ rm_ns = axiom_namespace_create(env, ack_none->ns_val,
+ SANDESHA2_WSRM_COMMON_NS_PREFIX_RM);
if(NULL == rm_ns)
{
return NULL;
}
an_element = axiom_element_create(env, NULL, SANDESHA2_WSRM_COMMON_NONE,
- rm_ns, &an_node);
+ rm_ns, &an_node);
if(NULL == an_element)
{
return NULL;
@@ -207,13 +167,10 @@
}
axis2_bool_t AXIS2_CALL
-sandesha2_ack_none_is_namespace_supported(sandesha2_iom_rm_element_t *ack_none,
- const axutil_env_t *env, axis2_char_t *namespace)
+sandesha2_ack_none_is_namespace_supported(
+ const axutil_env_t *env,
+ axis2_char_t *namespace)
{
- sandesha2_ack_none_impl_t *ack_none_impl = NULL;
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-
- ack_none_impl = SANDESHA2_INTF_TO_IMPL(ack_none);
if(0 == axutil_strcmp(namespace, SANDESHA2_SPEC_2005_02_NS_URI))
{
return AXIS2_FALSE;
@@ -224,3 +181,4 @@
}
return AXIS2_FALSE;
}
+
---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org