You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fx-dev@ws.apache.org by da...@apache.org on 2006/08/11 05:57:29 UTC
svn commit: r430650 - in /webservices/sandesha/trunk/c/src: handlers/
msgprocessors/ util/ wsrm/
Author: damitha
Date: Thu Aug 10 20:57:29 2006
New Revision: 430650
URL: http://svn.apache.org/viewvc?rev=430650&view=rev
Log:
More work in getting the sandesha2 work
Modified:
webservices/sandesha/trunk/c/src/handlers/sandesha2_global_in_handler.c
webservices/sandesha/trunk/c/src/msgprocessors/ack_msg_processor.c
webservices/sandesha/trunk/c/src/msgprocessors/ack_req_msg_processor.c
webservices/sandesha/trunk/c/src/msgprocessors/create_seq_msg_processor.c
webservices/sandesha/trunk/c/src/msgprocessors/create_seq_res_msg_processor.c
webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c
webservices/sandesha/trunk/c/src/util/msg_creator.c
webservices/sandesha/trunk/c/src/wsrm/address.c
Modified: webservices/sandesha/trunk/c/src/handlers/sandesha2_global_in_handler.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/handlers/sandesha2_global_in_handler.c?rev=430650&r1=430649&r2=430650&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/handlers/sandesha2_global_in_handler.c (original)
+++ webservices/sandesha/trunk/c/src/handlers/sandesha2_global_in_handler.c Thu Aug 10 20:57:29 2006
@@ -371,7 +371,7 @@
}
if(AXIS2_TRUE == drop)
{
- SANDESHA2_MSG_CTX_PAUSE(rm_msg_ctx, env);
+ SANDESHA2_MSG_CTX_SET_PAUSED(rm_msg_ctx, env, AXIS2_TRUE);
return AXIS2_TRUE;
}
return AXIS2_FALSE;
Modified: webservices/sandesha/trunk/c/src/msgprocessors/ack_msg_processor.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/msgprocessors/ack_msg_processor.c?rev=430650&r1=430649&r2=430650&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/ack_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/ack_msg_processor.c Thu Aug 10 20:57:29 2006
@@ -346,7 +346,7 @@
out_seq_id, int_seq_id, storage_mgr);
}
}
- SANDESHA2_MSG_CTX_PAUSE(rm_msg_ctx, env);
+ SANDESHA2_MSG_CTX_SET_PAUSED(rm_msg_ctx, env, AXIS2_TRUE);
return AXIS2_SUCCESS;
}
Modified: webservices/sandesha/trunk/c/src/msgprocessors/ack_req_msg_processor.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/msgprocessors/ack_req_msg_processor.c?rev=430650&r1=430649&r2=430650&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/ack_req_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/ack_req_msg_processor.c Thu Aug 10 20:57:29 2006
@@ -214,7 +214,7 @@
ack_rm_msg = sandesha2_msg_init_init_msg(env, ack_msg_ctx);
SANDESHA2_MSG_CTX_SET_RM_NS_VAL(ack_rm_msg, env,
SANDESHA2_MSG_CTX_GET_RM_NS_VAL(rm_msg_ctx, env));
- AXIS2_MSG_CTX_SET_MSG_ID(ack_msg_ctx, env, axis2_uuid_gen(env));
+ AXIS2_MSG_CTX_SET_MESSAGE_ID(ack_msg_ctx, env, axis2_uuid_gen(env));
envelope = axiom_soap_envelope_create_default_soap_envelope(env,
sandesha2_utils_get_soap_version(env,
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=430650&r1=430649&r2=430650&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 Thu Aug 10 20:57:29 2006
@@ -294,7 +294,7 @@
acks_to_bean = sandesha2_seq_property_bean_create_with_data(env,
new_seq_id, SANDESHA2_SEQ_PROP_ACKS_TO_EPR,
AXIS2_ENDPOINT_REF_GET_ADDRESS(acks_to, env));
- SANDESHA2_SEQ_PROPERTY_BEAN_MGR_INSERT(seq_prop_mgr, env, acks_to_bean);
+ SANDESHA2_SEQ_PROPERTY_MGR_INSERT(seq_prop_mgr, env, acks_to_bean);
AXIS2_MSG_CTX_SET_RESPONSE_WRITTEN(out_msg_ctx, env, AXIS2_TRUE);
sandesha2_seq_mgr_update_last_activated_time(env, new_seq_id,
storage_mgr);
@@ -325,7 +325,7 @@
AXIS2_CTX_SET_PROPERTY(ctx, env, AXIS2_RESPONSE_WRITTEN, property,
AXIS2_FALSE);
- SANDESHA2_MSG_CTX_PAUSE(rm_msg_ctx, env);
+ SANDESHA2_MSG_CTX_SET_PAUSED(rm_msg_ctx, env, AXIS2_TRUE);
return AXIS2_SUCCESS;
}
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=430650&r1=430649&r2=430650&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 Thu Aug 10 20:57:29 2006
@@ -409,7 +409,7 @@
AXIS2_PROPERTY_SET_VALUE(property, env, AXIS2_STRDUP("TRUE", env));
AXIS2_CTX_SET_PROPERTY(ctx, env, AXIS2_RESPONSE_WRITTEN, property,
AXIS2_FALSE);
- SANDESHA2_MSG_CTX_PAUSE(rm_msg_ctx, env);
+ SANDESHA2_MSG_CTX_SET_PAUSED(rm_msg_ctx, env, AXIS2_TRUE);
return AXIS2_SUCCESS;
}
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=430650&r1=430649&r2=430650&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 Thu Aug 10 20:57:29 2006
@@ -239,7 +239,7 @@
SANDESHA2_SEQ_PROPERTY_MGR_INSERT(seq_prop_mgr, env, transmit_bean);
sandesha2_seq_mgr_update_last_activated_time(env, seq_id, storage_man);
- SANDESHA2_MSG_CTX_PAUSE(msg_ctx, env);
+ SANDESHA2_MSG_CTX_SET_PAUSED(msg_ctx, env, AXIS2_TRUE);
return AXIS2_SUCCESS;
}
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=430650&r1=430649&r2=430650&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/util/msg_creator.c (original)
+++ webservices/sandesha/trunk/c/src/util/msg_creator.c Thu Aug 10 20:57:29 2006
@@ -336,13 +336,13 @@
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_IMO_RM_ELEMENT_TO_OM_NODE((sandesha2_iom_rm_element_t *) response,
+ SANDESHA2_IOM_RM_ELEMENT_TO_OM_NODE((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 =
- sandesha2_spec_specific_consts_get_create_seq_res_soap_action(env,
+ sandesha2_spec_specific_consts_get_create_seq_res_action(env,
rm_version);
AXIS2_MSG_CTX_SET_SOAP_ACTION(out_msg, env, temp_action);
ctx = AXIS2_MSG_CTX_GET_BASE(out_msg, env);
@@ -351,8 +351,8 @@
AXIS2_PROPERTY_SET_VALUE(prop, env, addressing_ns_value);
AXIS2_CTX_SET_PROPERTY(ctx, env, AXIS2_WSA_VERSION, prop, AXIS2_FALSE);
new_msg_id = axis2_uuid_gen(env);
- AXIS2_MSG_CTX_SET_MSG_ID(out_msg, env, new_msg_id);
- AXIS2_MSG_CTX_SET_ENVELOPE(out_msg, env, envelope);
+ AXIS2_MSG_CTX_SET_MESSAGE_ID(out_msg, env, new_msg_id);
+ 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);
@@ -531,7 +531,7 @@
return NULL;
}
temp_msg_id = axis2_uuid_gen(env);
- AXIS2_MSG_SET_MSG_ID(terminate_seq_msg_ctx, env, temp_msg_id);
+ AXIS2_MSG_CTX_SET_MESSAGE_ID(terminate_seq_msg_ctx, env, temp_msg_id);
ref_msg_op = AXIS2_MSG_CTX_GET_OP(ref_msg_ctx, env);
if(ref_msg_op)
{
@@ -661,7 +661,7 @@
temp_value = AXIS2_PARAM_GET_VALUE(next_param, env);
new_param = axis2_param_create(env, temp_name, temp_value);
new_param->ops->value_free = next_param->ops->value_free;
- AXIS2_OP_SET_PARAM(new_op, env, new_param);
+ AXIS2_OP_ADD_PARAM(new_op, env, new_param);
}
}
}
Modified: webservices/sandesha/trunk/c/src/wsrm/address.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/address.c?rev=430650&r1=430649&r2=430650&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/address.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/address.c Thu Aug 10 20:57:29 2006
@@ -199,7 +199,7 @@
return NULL;
}
str_address = AXIOM_ELEMENT_GET_TEXT(addr_part, env, addr_node);
- if(NULL == str_address || AXIS2_STRLEN(str_address))
+ if(NULL == str_address || 0 == AXIS2_STRLEN(str_address))
{
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_EMPTY_OM_ELEMENT,
AXIS2_FAILURE);
---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org