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 2006/07/11 14:42:27 UTC
svn commit: r420822 [4/4] - in /webservices/sandesha/trunk/c: include/
include/sandesha2/ src/client/ src/msgprocessors/ src/storage/beans/
src/storage/inmemory/ src/transport/ src/util/ src/workers/ src/wsrm/
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=420822&r1=420821&r2=420822&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/workers/in_order_invoker.c (original)
+++ webservices/sandesha/trunk/c/src/workers/in_order_invoker.c Tue Jul 11 05:42:25 2006
@@ -17,10 +17,10 @@
#include <sandesha2/sandesha2_constants.h>
#include <sandesha2/sandesha2_utils.h>
#include <sandesha2/sandesha2_transaction.h>
-#include <sandesha2/sandesha2_storage_manager.h>
+#include <sandesha2/sandesha2_storage_mgr.h>
#include <sandesha2/sandesha2_seq_property_bean.h>
#include <sandesha2/sandesha2_msg_ctx.h>
-#include <sandesha2/sandesha2_sequence.h>
+#include <sandesha2/sandesha2_seq.h>
#include <axis2_addr.h>
#include <axis2_engine.h>
#include <stdio.h>
@@ -38,7 +38,7 @@
sandesha2_in_order_invoker_t invoker;
axis2_conf_ctx_t *conf_ctx;
axis2_bool_t run_invoker;
- axis2_array_list_t *working_sequences;
+ axis2_array_list_t *working_seqs;
axis2_thread_mutex_t *mutex;
};
@@ -107,7 +107,7 @@
}
invoker_impl->conf_ctx = NULL;
invoker_impl->run_invoker = AXIS2_FALSE;
- invoker_impl->working_sequences = NULL;
+ invoker_impl->working_seqs = NULL;
invoker_impl->mutex = NULL;
invoker_impl->invoker.ops = NULL;
@@ -121,7 +121,7 @@
return NULL;
}
- invoker_impl->working_sequences = axis2_array_list_create(env,
+ invoker_impl->working_seqs = axis2_array_list_create(env,
AXIS2_ARRAY_LIST_DEFAULT_CAPACITY);
invoker_impl->mutex = axis2_thread_mutex_create(env->allocator,
AXIS2_THREAD_MUTEX_DEFAULT);
@@ -156,10 +156,10 @@
axis2_thread_mutex_destroy(invoker_impl->mutex);
invoker_impl->mutex = NULL;
}
- if(NULL != invoker_impl->working_sequences)
+ if(NULL != invoker_impl->working_seqs)
{
- AXIS2_ARRY_LIST_FREE(invoker_impl->working_sequences, env);
- invoker_impl->working_sequences = NULL;
+ AXIS2_ARRY_LIST_FREE(invoker_impl->working_seqs, env);
+ invoker_impl->working_seqs = NULL;
}
if(NULL != invoker->ops)
{
@@ -181,7 +181,7 @@
invoker_impl = SANDESHA2_INTF_TO_IMPL(invoker);
axis2_thread_mutex_lock(invoker_impl->mutex);
- if(0 == AXIS2_ARRY_LIST_SIZE(invoker_impl->working_sequences, env))
+ if(0 == AXIS2_ARRY_LIST_SIZE(invoker_impl->working_seqs, env))
invoker_impl->run_invoker = AXIS2_FALSE;
axis2_thread_mutex_unlock(invoker_impl->mutex);
return AXIS2_SUCCESS;
@@ -232,8 +232,8 @@
invoker_impl = SANDESHA2_INTF_TO_IMPL(invoker);
axis2_thread_mutex_lock(invoker_impl->mutex);
if(AXIS2_FALSE == sandesha2_utils_array_list_contains(env,
- invoker_impl->working_sequences, seq_id))
- AXIS2_ARRY_LIST_ADD(invoker_impl->working_sequences, env, seq_id);
+ invoker_impl->working_seqs, seq_id))
+ AXIS2_ARRY_LIST_ADD(invoker_impl->working_seqs, env, seq_id);
if(AXIS2_FALSE == invoker_impl->run_invoker)
{
invoker_impl->conf_ctx = conf_ctx;
@@ -317,29 +317,29 @@
sandesha2_transaction_t *transaction = NULL;
/* Use when transaction handling is done
axis2_bool_t rollbacked = AXIS2_FALSE;*/
- sandesha2_storage_manager_t *storage_manager = NULL;
- sandesha2_next_msg_bean_manager_t *next_msg_mgr = NULL;
- sandesha2_invoker_bean_manager_t *storage_map_mgr = NULL;
- sandesha2_seq_property_bean_manager_t *seq_prop_mgr = NULL;
+ sandesha2_storage_mgr_t *storage_mgr = NULL;
+ sandesha2_next_msg_bean_mgr_t *next_msg_mgr = NULL;
+ sandesha2_invoker_bean_mgr_t *storage_map_mgr = NULL;
+ sandesha2_seq_property_bean_mgr_t *seq_prop_mgr = NULL;
sandesha2_seq_property_bean_t *all_seq_bean = NULL;
axis2_array_list_t *all_seq_list = NULL;
int i = 0;
sleep(1);
- storage_manager = sandesha2_utils_get_storage_manager(env,
+ storage_mgr = sandesha2_utils_get_storage_mgr(env,
invoker_impl->conf_ctx,
AXIS2_CONF_CTX_GET_CONF(invoker_impl->conf_ctx, env));
- next_msg_mgr = SANDESHA2_STORAGE_MANAGER_GET_NEXT_MSG_BEAN_MANAGER(
- storage_manager, env);
- storage_map_mgr = SANDESHA2_STORAGE_MANAGER_GET_STORAGE_MAP_BEAN_MANAGER
- (storage_manager, env);
- seq_prop_mgr = SANDESHA2_STORAGE_MANAGER_GET_SEQ_PROPERTY_BEAN_MANAGER(
- storage_manager, env);
- transaction = SANDESHA2_STORAGE_MANAGER_GET_TRANSACTION(storage_manager,
+ next_msg_mgr = SANDESHA2_STORAGE_MGR_GET_NEXT_MSG_BEAN_MGR(
+ storage_mgr, env);
+ storage_map_mgr = SANDESHA2_STORAGE_MGR_GET_STORAGE_MAP_BEAN_MGR
+ (storage_mgr, env);
+ seq_prop_mgr = SANDESHA2_STORAGE_MGR_GET_SEQ_PROPERTY_BEAN_MGR(
+ storage_mgr, env);
+ transaction = SANDESHA2_STORAGE_MGR_GET_TRANSACTION(storage_mgr,
env);
- all_seq_bean = SANDESHA2_SEQ_PROPERTY_BEAN_MANAGER_RETRIEVE(seq_prop_mgr,
- env, SANDESHA2_SEQ_PROP_ALL_SEQUENCES,
- SANDESHA2_SEQ_PROP_INCOMING_SEQUENCE_LIST);
+ all_seq_bean = SANDESHA2_SEQ_PROPERTY_BEAN_MGR_RETRIEVE(seq_prop_mgr,
+ env, SANDESHA2_SEQ_PROP_ALL_SEQS,
+ SANDESHA2_SEQ_PROP_INCOMING_SEQ_LIST);
if(NULL == all_seq_bean)
continue;
all_seq_list = sandesha2_utils_get_array_list_from_string(env,
@@ -356,13 +356,13 @@
sandesha2_invoker_bean_t *find_bean = NULL;
axis2_bool_t invoked = AXIS2_FALSE;
int j = 0;
- axis2_bool_t continue_sequence = AXIS2_TRUE;
+ axis2_bool_t continue_seq = AXIS2_TRUE;
seq_id = AXIS2_ARRAY_LIST_GET(all_seq_list, env, i);
SANDESHA2_TRANSACTION_COMMIT(transaction, env);
- transaction = SANDESHA2_STORAGE_MANAGER_GET_TRANSACTION(
- storage_manager, env);
- next_msg_bean = SANDESHA2_NEXT_MSG_BEAN_MANAGER_RETRIEVE(
+ transaction = SANDESHA2_STORAGE_MGR_GET_TRANSACTION(
+ storage_mgr, env);
+ next_msg_bean = SANDESHA2_NEXT_MSG_BEAN_MGR_RETRIEVE(
next_msg_mgr, env, seq_id);
if(NULL == next_msg_bean)
{
@@ -377,7 +377,7 @@
str_list = sandesha2_utils_array_list_to_string(env, all_seq_list);
SANDESHA2_SEQ_PROPERTY_BEAN_SET_VALUE(all_seq_bean, env,
str_list);
- SANDESHA2_SEQ_PROPERTY_BEAN_MANAGER_UPDATE(seq_prop_mgr, env,
+ SANDESHA2_SEQ_PROPERTY_BEAN_MGR_UPDATE(seq_prop_mgr, env,
all_seq_bean);
continue;
}
@@ -391,7 +391,7 @@
}
find_bean = sandesha2_invoker_bean_create_with_data(env, NULL,
next_msg_no, seq_id, AXIS2_FALSE);
- st_map_list = SANDESHA2_INVOKER_BEAN_MANAGER_FIND(storage_map_mgr,
+ st_map_list = SANDESHA2_INVOKER_BEAN_MGR_FIND(storage_map_mgr,
env, find_bean);
for(j = 0; j < AXIS2_ARRAY_LIST_SIZE(st_map_list, env); j++)
{
@@ -408,8 +408,8 @@
st_map_bean = AXIS2_ARRAY_LIST_GET(st_map_list, env, j);
key = SANDESHA2_INVOKER_BEAN_GET_MSG_CONTEXT_REF_ID(st_map_bean,
env);
- msg_to_invoke = SANDESHA2_STORAGE_MANAGER_RETRIEVE_MSG_CTX(
- storage_manager, env, key, invoker_impl->conf_ctx);
+ msg_to_invoke = SANDESHA2_STORAGE_MGR_RETRIEVE_MSG_CTX(
+ storage_mgr, env, key, invoker_impl->conf_ctx);
rm_msg_ctx = sandesha2_msg_initilizer_initilize_msg(env,
msg_to_invoke);
/* have to commit the transaction before invoking. This may get
@@ -440,39 +440,39 @@
else
AXIS2_ENGINE_RESUME_RECIEVE(engine, env, msg_to_invoke);
invoked = AXIS2_TRUE;
- transaction = SANDESHA2_STORAGE_MANAGER_GET_TRANSACTION(
- storage_manager, env);
- SANDESHA2_STORAGE_MANAGER_DELETE(storage_manager, env, key);
- msg_ctx = SANDESHA2_STORAGE_MANAGER_RETRIEVE_MSG_CTX(
- storage_manager, env, key, invoker_impl->conf_ctx);
+ transaction = SANDESHA2_STORAGE_MGR_GET_TRANSACTION(
+ storage_mgr, env);
+ SANDESHA2_STORAGE_MGR_DELETE(storage_mgr, env, key);
+ msg_ctx = SANDESHA2_STORAGE_MGR_RETRIEVE_MSG_CTX(
+ storage_mgr, env, key, invoker_impl->conf_ctx);
if(NULL != msg_ctx)
- SANDESHA2_STORAGE_MANAGER_REMOVE_MSG_CTX(storage_manager,
+ SANDESHA2_STORAGE_MGR_REMOVE_MSG_CTX(storage_mgr,
env, key);
if(SANDESHA2_MSG_TYPE_APPLICATION ==
SANDESHA2_MSG_CTX_GET_MSG_TYPE(rm_msg_ctx, env))
{
- sandesha2_sequence_t *sequence = NULL;
- sequence = (sandesha2_sequence_t*)_MSG_CTX_GET_MSG_PART(
- rm_msg_ctx, env, SANDESHA2_MSG_PART_SEQUENCE);
- if(NULL != SANDESHA2_SEQUENCE_GET_LAST_MSG(sequence, env))
+ sandesha2_seq_t *seq = NULL;
+ seq = (sandesha2_seq_t*)_MSG_CTX_GET_MSG_PART(
+ rm_msg_ctx, env, SANDESHA2_MSG_PART_SEQ);
+ if(NULL != SANDESHA2_SEQ_GET_LAST_MSG(seq, env))
{
- sandesha2_terminate_manager_clean_recv_side_after_invocation(
+ sandesha2_terminate_mgr_clean_recv_side_after_invocation(
env, invoker_impl->conf_ctx, seq_id,
- storage_manager);
- /* we are done with current sequence */
- continue_sequence = AXIS2_FALSE;
+ storage_mgr);
+ /* we are done with current seq */
+ continue_seq = AXIS2_FALSE;
break;
}
}
}
- if(AXIS2_FALSE == continue_sequence)
+ if(AXIS2_FALSE == continue_seq)
break;
if(AXIS2_TRUE == invoked)
{
next_msg_no++;
SANDESHA2_NEXT_MSG_BEAN_SET_NEXT_MSG_NO_TO_PROCESS(next_msg_bean,
env, next_msg_no);
- SANDESHA2_NEXT_MSG_BEAN_MANAGER_UPDATE(next_msg_mgr, env,
+ SANDESHA2_NEXT_MSG_BEAN_MGR_UPDATE(next_msg_mgr, env,
next_msg_bean);
}
}
Modified: webservices/sandesha/trunk/c/src/wsrm/close_seq.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/close_seq.c?rev=420822&r1=420821&r2=420822&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/close_seq.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/close_seq.c Tue Jul 11 05:42:25 2006
@@ -217,7 +217,7 @@
return NULL;
}
close_seq_qname = axis2_qname_create(env,
- SANDESHA2_WSRM_COMMON_CLOSE_SEQUENCE,
+ SANDESHA2_WSRM_COMMON_CLOSE_SEQ,
close_seq_impl->ns_val, NULL);
if(NULL == close_seq_qname)
{
@@ -273,7 +273,7 @@
return NULL;
}
cs_element = axiom_element_create(env, NULL,
- SANDESHA2_WSRM_COMMON_CLOSE_SEQUENCE, rm_ns,
+ SANDESHA2_WSRM_COMMON_CLOSE_SEQ, rm_ns,
&cs_node);
if(NULL == cs_element)
{
@@ -352,7 +352,7 @@
* Remove if old exists
*/
close_seq_qname = axis2_qname_create(env,
- SANDESHA2_WSRM_COMMON_CLOSE_SEQUENCE,
+ SANDESHA2_WSRM_COMMON_CLOSE_SEQ,
close_seq_impl->ns_val, NULL);
if(NULL == close_seq_qname)
{
Modified: webservices/sandesha/trunk/c/src/wsrm/close_seq_res.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/close_seq_res.c?rev=420822&r1=420821&r2=420822&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/close_seq_res.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/close_seq_res.c Tue Jul 11 05:42:25 2006
@@ -224,7 +224,7 @@
return NULL;
}
csr_qname = axis2_qname_create(env,
- SANDESHA2_WSRM_COMMON_CLOSE_SEQUENCE_RESPONSE,
+ SANDESHA2_WSRM_COMMON_CLOSE_SEQ_RESPONSE,
close_seq_res_impl->ns_val, NULL);
if(NULL == csr_qname)
{
@@ -280,7 +280,7 @@
return NULL;
}
csr_element = axiom_element_create(env, NULL,
- SANDESHA2_WSRM_COMMON_CLOSE_SEQUENCE_RESPONSE, rm_ns,
+ SANDESHA2_WSRM_COMMON_CLOSE_SEQ_RESPONSE, rm_ns,
&csr_node);
if(NULL == csr_element)
{
@@ -359,7 +359,7 @@
* Remove if old exists
*/
close_seq_qname = axis2_qname_create(env,
- SANDESHA2_WSRM_COMMON_CLOSE_SEQUENCE_RESPONSE,
+ SANDESHA2_WSRM_COMMON_CLOSE_SEQ_RESPONSE,
close_seq_res_impl->ns_val, NULL);
if(NULL == close_seq_qname)
{
Modified: webservices/sandesha/trunk/c/src/wsrm/create_seq.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/create_seq.c?rev=420822&r1=420821&r2=420822&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/create_seq.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/create_seq.c Tue Jul 11 05:42:25 2006
@@ -253,7 +253,7 @@
AXIS2_FAILURE);
return NULL;
}
- seq_qname = axis2_qname_create(env, SANDESHA2_WSRM_COMMON_CREATE_SEQUENCE,
+ seq_qname = axis2_qname_create(env, SANDESHA2_WSRM_COMMON_CREATE_SEQ,
create_seq_impl->rm_ns_val, NULL);
if(NULL == seq_qname)
{
@@ -281,7 +281,7 @@
{
return NULL;
}
- offer_qname = axis2_qname_create(env, SANDESHA2_WSRM_COMMON_SEQUENCE_OFFER,
+ offer_qname = axis2_qname_create(env, SANDESHA2_WSRM_COMMON_SEQ_OFFER,
create_seq_impl->rm_ns_val, NULL);
if(NULL == offer_qname)
{
@@ -356,7 +356,7 @@
return NULL;
}
cs_element = axiom_element_create(env, NULL,
- SANDESHA2_WSRM_COMMON_CREATE_SEQUENCE, rm_ns,
+ SANDESHA2_WSRM_COMMON_CREATE_SEQ, rm_ns,
&cs_node);
if(NULL == cs_element)
{
@@ -475,7 +475,7 @@
* Remove if old exists
*/
create_seq_qname = axis2_qname_create(env,
- SANDESHA2_WSRM_COMMON_CREATE_SEQUENCE,
+ SANDESHA2_WSRM_COMMON_CREATE_SEQ,
create_seq_impl->rm_ns_val, NULL);
if(NULL == create_seq_qname)
{
Modified: webservices/sandesha/trunk/c/src/wsrm/create_seq_res.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/create_seq_res.c?rev=420822&r1=420821&r2=420822&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/create_seq_res.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/create_seq_res.c Tue Jul 11 05:42:25 2006
@@ -270,7 +270,7 @@
return NULL;
}
csr_qname = axis2_qname_create(env,
- SANDESHA2_WSRM_COMMON_CREATE_SEQUENCE_RESPONSE,
+ SANDESHA2_WSRM_COMMON_CREATE_SEQ_RESPONSE,
create_seq_res_impl->rm_ns_val, NULL);
if(NULL == csr_qname)
{
@@ -373,7 +373,7 @@
return NULL;
}
csr_element = axiom_element_create(env, NULL,
- SANDESHA2_WSRM_COMMON_CREATE_SEQUENCE_RESPONSE, rm_ns,
+ SANDESHA2_WSRM_COMMON_CREATE_SEQ_RESPONSE, rm_ns,
&csr_node);
if(NULL == csr_element)
{
@@ -507,7 +507,7 @@
* Remove if old exists
*/
create_seq_res_qname = axis2_qname_create(env,
- SANDESHA2_WSRM_COMMON_CREATE_SEQUENCE_RESPONSE,
+ SANDESHA2_WSRM_COMMON_CREATE_SEQ_RESPONSE,
create_seq_res_impl->rm_ns_val, NULL);
if(NULL == create_seq_res_qname)
{
Modified: webservices/sandesha/trunk/c/src/wsrm/seq_ack.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/seq_ack.c?rev=420822&r1=420821&r2=420822&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/seq_ack.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/seq_ack.c Tue Jul 11 05:42:25 2006
@@ -286,7 +286,7 @@
AXIS2_FAILURE);
return NULL;
}
- sa_qname = axis2_qname_create(env, SANDESHA2_WSRM_COMMON_SEQUENCE_ACK,
+ sa_qname = axis2_qname_create(env, SANDESHA2_WSRM_COMMON_SEQ_ACK,
seq_ack_impl->ns_val, NULL);
if(NULL == sa_qname)
{
@@ -463,7 +463,7 @@
return NULL;
}
sa_block = AXIOM_SOAP_HEADER_ADD_HEADER_BLOCK(soap_header, env,
- SANDESHA2_WSRM_COMMON_SEQUENCE_ACK, rm_ns);
+ SANDESHA2_WSRM_COMMON_SEQ_ACK, rm_ns);
if(NULL == sa_block)
{
return NULL;
@@ -678,7 +678,7 @@
* Remove if old exists
*/
seq_ack_qname = axis2_qname_create(env,
- SANDESHA2_WSRM_COMMON_SEQUENCE_ACK,
+ SANDESHA2_WSRM_COMMON_SEQ_ACK,
seq_ack_impl->ns_val, NULL);
if(NULL == seq_ack_qname)
{
Modified: webservices/sandesha/trunk/c/src/wsrm/seq_fault.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/seq_fault.c?rev=420822&r1=420821&r2=420822&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/seq_fault.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/seq_fault.c Tue Jul 11 05:42:25 2006
@@ -195,7 +195,7 @@
AXIS2_FAILURE);
return NULL;
}
- sf_qname = axis2_qname_create(env, SANDESHA2_WSRM_COMMON_SEQUENCE_FAULT,
+ sf_qname = axis2_qname_create(env, SANDESHA2_WSRM_COMMON_SEQ_FAULT,
seq_fault_impl->ns_val, NULL);
if(NULL == sf_qname)
{
@@ -252,7 +252,7 @@
return NULL;
}
sf_element = axiom_element_create(env, NULL,
- SANDESHA2_WSRM_COMMON_SEQUENCE_FAULT, rm_ns, &sf_node);
+ SANDESHA2_WSRM_COMMON_SEQ_FAULT, rm_ns, &sf_node);
if(NULL == sf_element)
{
return NULL;
Modified: webservices/sandesha/trunk/c/src/wsrm/seq_offer.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/seq_offer.c?rev=420822&r1=420821&r2=420822&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/seq_offer.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/seq_offer.c Tue Jul 11 05:42:25 2006
@@ -211,7 +211,7 @@
AXIS2_FAILURE);
return NULL;
}
- so_qname = axis2_qname_create(env, SANDESHA2_WSRM_COMMON_SEQUENCE_OFFER,
+ so_qname = axis2_qname_create(env, SANDESHA2_WSRM_COMMON_SEQ_OFFER,
seq_offer_impl->ns_val, NULL);
if(NULL == so_qname)
{
@@ -282,7 +282,7 @@
return NULL;
}
so_element = axiom_element_create(env, NULL,
- SANDESHA2_WSRM_COMMON_SEQUENCE_OFFER, rm_ns, &so_node);
+ SANDESHA2_WSRM_COMMON_SEQ_OFFER, rm_ns, &so_node);
if(NULL == so_element)
{
return NULL;
Modified: webservices/sandesha/trunk/c/src/wsrm/sequence.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/sequence.c?rev=420822&r1=420821&r2=420822&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/sequence.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/sequence.c Tue Jul 11 05:42:25 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include <sandesha2/sandesha2_sequence.h>
+#include <sandesha2/sandesha2_seq.h>
#include <sandesha2/sandesha2_constants.h>
#include <axiom_soap_header.h>
#include <axiom_soap_header_block.h>
@@ -23,11 +23,11 @@
* @brief Sequence struct impl
* Sandesha2 IOM Sequence
*/
-typedef struct sandesha2_sequence_impl sandesha2_sequence_impl_t;
+typedef struct sandesha2_seq_impl sandesha2_seq_impl_t;
-struct sandesha2_sequence_impl
+struct sandesha2_seq_impl
{
- sandesha2_sequence_t sequence;
+ sandesha2_seq_t seq;
sandesha2_identifier_t *identifier;
sandesha2_msg_number_t *msg_num;
sandesha2_last_msg_t *last_msg;
@@ -35,201 +35,201 @@
axis2_char_t *ns_val;
};
-#define SANDESHA2_INTF_TO_IMPL(sequence) \
- ((sandesha2_sequence_impl_t *)(sequence))
+#define SANDESHA2_INTF_TO_IMPL(seq) \
+ ((sandesha2_seq_impl_t *)(seq))
/***************************** Function headers *******************************/
axis2_char_t* AXIS2_CALL
-sandesha2_sequence_get_namespace_value (sandesha2_iom_rm_element_t *sequence,
+sandesha2_seq_get_namespace_value (sandesha2_iom_rm_element_t *seq,
const axis2_env_t *env);
void* AXIS2_CALL
-sandesha2_sequence_from_om_node(sandesha2_iom_rm_element_t *sequence,
+sandesha2_seq_from_om_node(sandesha2_iom_rm_element_t *seq,
const axis2_env_t *env, axiom_node_t *om_node);
axiom_node_t* AXIS2_CALL
-sandesha2_sequence_to_om_node(sandesha2_iom_rm_element_t *sequence,
+sandesha2_seq_to_om_node(sandesha2_iom_rm_element_t *seq,
const axis2_env_t *env, void *om_node);
axis2_bool_t AXIS2_CALL
-sandesha2_sequence_is_namespace_supported(sandesha2_iom_rm_element_t *sequence,
+sandesha2_seq_is_namespace_supported(sandesha2_iom_rm_element_t *seq,
const axis2_env_t *env, axis2_char_t *namespace);
sandesha2_identifier_t * AXIS2_CALL
-sandesha2_sequence_get_identifier(sandesha2_sequence_t *sequence,
+sandesha2_seq_get_identifier(sandesha2_seq_t *seq,
const axis2_env_t *env);
axis2_status_t AXIS2_CALL
-sandesha2_sequence_set_identifier(sandesha2_sequence_t *sequence,
+sandesha2_seq_set_identifier(sandesha2_seq_t *seq,
const axis2_env_t *env,
sandesha2_identifier_t *identifier);
sandesha2_msg_number_t * AXIS2_CALL
-sandesha2_sequence_get_msg_num(sandesha2_sequence_t *sequence,
+sandesha2_seq_get_msg_num(sandesha2_seq_t *seq,
const axis2_env_t *env);
axis2_status_t AXIS2_CALL
-sandesha2_sequence_set_msg_num(sandesha2_sequence_t *sequence,
+sandesha2_seq_set_msg_num(sandesha2_seq_t *seq,
const axis2_env_t *env,
sandesha2_msg_number_t *msg_num);
sandesha2_last_msg_t * AXIS2_CALL
-sandesha2_sequence_get_last_msg(sandesha2_sequence_t *sequence,
+sandesha2_seq_get_last_msg(sandesha2_seq_t *seq,
const axis2_env_t *env);
axis2_status_t AXIS2_CALL
-sandesha2_sequence_set_last_msg(sandesha2_sequence_t *sequence,
+sandesha2_seq_set_last_msg(sandesha2_seq_t *seq,
const axis2_env_t *env,
sandesha2_last_msg_t *last_msg);
axis2_bool_t AXIS2_CALL
-sandesha2_sequence_is_must_understand(sandesha2_sequence_t *sequence,
+sandesha2_seq_is_must_understand(sandesha2_seq_t *seq,
const axis2_env_t *env);
axis2_status_t AXIS2_CALL
-sandesha2_sequence_set_must_understand(sandesha2_sequence_t *sequence,
+sandesha2_seq_set_must_understand(sandesha2_seq_t *seq,
const axis2_env_t *env, axis2_bool_t mu);
axis2_status_t AXIS2_CALL
-sandesha2_sequence_to_soap_env(sandesha2_iom_rm_part_t *sequence,
+sandesha2_seq_to_soap_env(sandesha2_iom_rm_part_t *seq,
const axis2_env_t *env,
axiom_soap_envelope_t *envelope);
axis2_status_t AXIS2_CALL
-sandesha2_sequence_free (sandesha2_iom_rm_element_t *sequence,
+sandesha2_seq_free (sandesha2_iom_rm_element_t *seq,
const axis2_env_t *env);
/***************************** End of function headers ************************/
-AXIS2_EXTERN sandesha2_sequence_t* AXIS2_CALL
-sandesha2_sequence_create(const axis2_env_t *env, axis2_char_t *ns_val)
+AXIS2_EXTERN sandesha2_seq_t* AXIS2_CALL
+sandesha2_seq_create(const axis2_env_t *env, axis2_char_t *ns_val)
{
- sandesha2_sequence_impl_t *sequence_impl = NULL;
+ sandesha2_seq_impl_t *seq_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, ns_val, NULL);
- if(AXIS2_FALSE == sandesha2_sequence_is_namespace_supported(
- (sandesha2_iom_rm_element_t*)sequence_impl, env,
+ if(AXIS2_FALSE == sandesha2_seq_is_namespace_supported(
+ (sandesha2_iom_rm_element_t*)seq_impl, env,
ns_val))
{
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_UNSUPPORTED_NS,
AXIS2_FAILURE);
return NULL;
}
- sequence_impl = (sandesha2_sequence_impl_t *)AXIS2_MALLOC
- (env->allocator, sizeof(sandesha2_sequence_impl_t));
+ seq_impl = (sandesha2_seq_impl_t *)AXIS2_MALLOC
+ (env->allocator, sizeof(sandesha2_seq_impl_t));
- if(NULL == sequence_impl)
+ if(NULL == seq_impl)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
- sequence_impl->ns_val = NULL;
- sequence_impl->identifier = NULL;
- sequence_impl->msg_num = NULL;
- sequence_impl->last_msg = NULL;
- sequence_impl->must_understand = AXIS2_TRUE;
- sequence_impl->sequence.ops = NULL;
- sequence_impl->sequence.part.ops = NULL;
- sequence_impl->sequence.part.element.ops = NULL;
-
- sequence_impl->sequence.ops = AXIS2_MALLOC(env->allocator,
- sizeof(sandesha2_sequence_ops_t));
- if(NULL == sequence_impl->sequence.ops)
+ seq_impl->ns_val = NULL;
+ seq_impl->identifier = NULL;
+ seq_impl->msg_num = NULL;
+ seq_impl->last_msg = NULL;
+ seq_impl->must_understand = AXIS2_TRUE;
+ seq_impl->seq.ops = NULL;
+ seq_impl->seq.part.ops = NULL;
+ seq_impl->seq.part.element.ops = NULL;
+
+ seq_impl->seq.ops = AXIS2_MALLOC(env->allocator,
+ sizeof(sandesha2_seq_ops_t));
+ if(NULL == seq_impl->seq.ops)
{
- sandesha2_sequence_free((sandesha2_iom_rm_element_t*)
- sequence_impl, env);
+ sandesha2_seq_free((sandesha2_iom_rm_element_t*)
+ seq_impl, env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
- sequence_impl->sequence.part.ops = AXIS2_MALLOC(env->allocator,
+ seq_impl->seq.part.ops = AXIS2_MALLOC(env->allocator,
sizeof(sandesha2_iom_rm_part_ops_t));
- if(NULL == sequence_impl->sequence.part.ops)
+ if(NULL == seq_impl->seq.part.ops)
{
- sandesha2_sequence_free((sandesha2_iom_rm_element_t*)
- sequence_impl, env);
+ sandesha2_seq_free((sandesha2_iom_rm_element_t*)
+ seq_impl, env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
- sequence_impl->sequence.part.element.ops = AXIS2_MALLOC(env->allocator,
+ seq_impl->seq.part.element.ops = AXIS2_MALLOC(env->allocator,
sizeof(sandesha2_iom_rm_element_ops_t));
- if(NULL == sequence_impl->sequence.part.element.ops)
+ if(NULL == seq_impl->seq.part.element.ops)
{
- sandesha2_sequence_free((sandesha2_iom_rm_element_t*)
- sequence_impl, env);
+ sandesha2_seq_free((sandesha2_iom_rm_element_t*)
+ seq_impl, env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
- sequence_impl->ns_val = (axis2_char_t *)AXIS2_STRDUP(ns_val, env);
+ seq_impl->ns_val = (axis2_char_t *)AXIS2_STRDUP(ns_val, env);
- sequence_impl->sequence.part.element.ops->get_namespace_value =
- sandesha2_sequence_get_namespace_value;
- sequence_impl->sequence.part.element.ops->from_om_node =
- sandesha2_sequence_from_om_node;
- sequence_impl->sequence.part.element.ops->to_om_node =
- sandesha2_sequence_to_om_node;
- sequence_impl->sequence.part.element.ops->is_namespace_supported =
- sandesha2_sequence_is_namespace_supported;
- sequence_impl->sequence.ops->set_identifier =
- sandesha2_sequence_set_identifier;
- sequence_impl->sequence.ops->get_identifier =
- sandesha2_sequence_get_identifier;
- sequence_impl->sequence.ops->set_last_msg =
- sandesha2_sequence_set_last_msg;
- sequence_impl->sequence.ops->get_last_msg =
- sandesha2_sequence_get_last_msg;
- sequence_impl->sequence.ops->set_must_understand =
- sandesha2_sequence_set_must_understand;
- sequence_impl->sequence.ops->is_must_understand =
- sandesha2_sequence_is_must_understand;
- sequence_impl->sequence.part.element.ops->free = sandesha2_sequence_free;
+ seq_impl->seq.part.element.ops->get_namespace_value =
+ sandesha2_seq_get_namespace_value;
+ seq_impl->seq.part.element.ops->from_om_node =
+ sandesha2_seq_from_om_node;
+ seq_impl->seq.part.element.ops->to_om_node =
+ sandesha2_seq_to_om_node;
+ seq_impl->seq.part.element.ops->is_namespace_supported =
+ sandesha2_seq_is_namespace_supported;
+ seq_impl->seq.ops->set_identifier =
+ sandesha2_seq_set_identifier;
+ seq_impl->seq.ops->get_identifier =
+ sandesha2_seq_get_identifier;
+ seq_impl->seq.ops->set_last_msg =
+ sandesha2_seq_set_last_msg;
+ seq_impl->seq.ops->get_last_msg =
+ sandesha2_seq_get_last_msg;
+ seq_impl->seq.ops->set_must_understand =
+ sandesha2_seq_set_must_understand;
+ seq_impl->seq.ops->is_must_understand =
+ sandesha2_seq_is_must_understand;
+ seq_impl->seq.part.element.ops->free = sandesha2_seq_free;
- return &(sequence_impl->sequence);
+ return &(seq_impl->seq);
}
axis2_status_t AXIS2_CALL
-sandesha2_sequence_free (sandesha2_iom_rm_element_t *sequence,
+sandesha2_seq_free (sandesha2_iom_rm_element_t *seq,
const axis2_env_t *env)
{
- sandesha2_sequence_impl_t *sequence_impl = NULL;
+ sandesha2_seq_impl_t *seq_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- sequence_impl = SANDESHA2_INTF_TO_IMPL(sequence);
+ seq_impl = SANDESHA2_INTF_TO_IMPL(seq);
- if(NULL != sequence_impl->ns_val)
+ if(NULL != seq_impl->ns_val)
{
- AXIS2_FREE(env->allocator, sequence_impl->ns_val);
- sequence_impl->ns_val = NULL;
+ AXIS2_FREE(env->allocator, seq_impl->ns_val);
+ seq_impl->ns_val = NULL;
}
- sequence_impl->identifier = NULL;
- sequence_impl->msg_num = NULL;
- sequence_impl->last_msg = NULL;
- if(NULL != sequence->ops)
- AXIS2_FREE(env->allocator, sequence->ops);
+ seq_impl->identifier = NULL;
+ seq_impl->msg_num = NULL;
+ seq_impl->last_msg = NULL;
+ if(NULL != seq->ops)
+ AXIS2_FREE(env->allocator, seq->ops);
- AXIS2_FREE(env->allocator, SANDESHA2_INTF_TO_IMPL(sequence));
+ AXIS2_FREE(env->allocator, SANDESHA2_INTF_TO_IMPL(seq));
return AXIS2_SUCCESS;
}
axis2_char_t* AXIS2_CALL
-sandesha2_sequence_get_namespace_value (sandesha2_iom_rm_element_t *sequence,
+sandesha2_seq_get_namespace_value (sandesha2_iom_rm_element_t *seq,
const axis2_env_t *env)
{
- sandesha2_sequence_impl_t *sequence_impl = NULL;
+ sandesha2_seq_impl_t *seq_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
- sequence_impl = SANDESHA2_INTF_TO_IMPL(sequence);
- return sequence_impl->ns_val;
+ seq_impl = SANDESHA2_INTF_TO_IMPL(seq);
+ return seq_impl->ns_val;
}
void* AXIS2_CALL
-sandesha2_sequence_from_om_node(sandesha2_iom_rm_element_t *sequence,
+sandesha2_seq_from_om_node(sandesha2_iom_rm_element_t *seq,
const axis2_env_t *env, axiom_node_t *om_node)
{
- sandesha2_sequence_impl_t *sequence_impl = NULL;
+ sandesha2_seq_impl_t *seq_impl = NULL;
axiom_element_t *om_element = NULL;
axiom_element_t *seq_part = NULL;
axiom_element_t *lm_part = NULL;
@@ -241,7 +241,7 @@
AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, om_node, NULL);
- sequence_impl = SANDESHA2_INTF_TO_IMPL(sequence);
+ seq_impl = SANDESHA2_INTF_TO_IMPL(seq);
om_element = AXIOM_NODE_GET_DATA_ELEMENT(om_node, env);
if(NULL == om_element)
{
@@ -249,8 +249,8 @@
AXIS2_FAILURE);
return NULL;
}
- seq_qname = axis2_qname_create(env, SANDESHA2_WSRM_COMMON_SEQUENCE,
- sequence_impl->ns_val, NULL);
+ seq_qname = axis2_qname_create(env, SANDESHA2_WSRM_COMMON_SEQ,
+ seq_impl->ns_val, NULL);
if(NULL == seq_qname)
{
return NULL;
@@ -263,24 +263,24 @@
AXIS2_FAILURE);
return NULL;
}
- sequence_impl->identifier = sandesha2_identifier_create(env,
- sequence_impl->ns_val);
- if(NULL == sequence_impl->identifier)
+ seq_impl->identifier = sandesha2_identifier_create(env,
+ seq_impl->ns_val);
+ if(NULL == seq_impl->identifier)
{
return NULL;
}
SANDESHA2_IOM_RM_ELEMENT_FROM_OM_NODE(((sandesha2_iom_rm_element_t*)
- sequence_impl->identifier), env, seq_node);
- sequence_impl->msg_num= sandesha2_msg_number_create(env,
- sequence_impl->ns_val);
- if(NULL == sequence_impl->msg_num)
+ seq_impl->identifier), env, seq_node);
+ seq_impl->msg_num= sandesha2_msg_number_create(env,
+ seq_impl->ns_val);
+ if(NULL == seq_impl->msg_num)
{
return NULL;
}
SANDESHA2_IOM_RM_ELEMENT_FROM_OM_NODE(((sandesha2_iom_rm_element_t*)
- sequence_impl->msg_num), env, seq_node);
+ seq_impl->msg_num), env, seq_node);
lm_qname = axis2_qname_create(env, SANDESHA2_WSRM_COMMON_LAST_MSG,
- sequence_impl->ns_val, NULL);
+ seq_impl->ns_val, NULL);
if(NULL == lm_qname)
{
return NULL;
@@ -289,24 +289,24 @@
lm_qname, seq_node, &lm_node);
if(NULL != lm_part)
{
- sequence_impl->last_msg = sandesha2_last_msg_create(env,
- sequence_impl->ns_val);
- if(NULL == sequence_impl->last_msg)
+ seq_impl->last_msg = sandesha2_last_msg_create(env,
+ seq_impl->ns_val);
+ if(NULL == seq_impl->last_msg)
{
return NULL;
}
SANDESHA2_IOM_RM_ELEMENT_FROM_OM_NODE(((sandesha2_iom_rm_element_t*)
- sequence_impl->last_msg), env, lm_node);
+ seq_impl->last_msg), env, lm_node);
}
- return sequence;
+ return seq;
}
axiom_node_t* AXIS2_CALL
-sandesha2_sequence_to_om_node(sandesha2_iom_rm_element_t *sequence,
+sandesha2_seq_to_om_node(sandesha2_iom_rm_element_t *seq,
const axis2_env_t *env, void *om_node)
{
- sandesha2_sequence_impl_t *sequence_impl = NULL;
+ sandesha2_seq_impl_t *seq_impl = NULL;
axiom_namespace_t *rm_ns = NULL;
axiom_soap_header_t *soap_header = NULL;
axiom_soap_header_block_t *seq_block = NULL;
@@ -315,49 +315,49 @@
AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, om_node, NULL);
- sequence_impl = SANDESHA2_INTF_TO_IMPL(sequence);
+ seq_impl = SANDESHA2_INTF_TO_IMPL(seq);
soap_header = (axiom_soap_header_t*)om_node;
- if(NULL == sequence_impl->identifier || NULL == sequence_impl->msg_num)
+ if(NULL == seq_impl->identifier || NULL == seq_impl->msg_num)
{
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_TO_OM_NULL_ELEMENT,
AXIS2_FAILURE);
return NULL;
}
- rm_ns = axiom_namespace_create(env, sequence_impl->ns_val,
+ rm_ns = axiom_namespace_create(env, seq_impl->ns_val,
SANDESHA2_WSRM_COMMON_NS_PREFIX_RM);
if(NULL == rm_ns)
{
return NULL;
}
seq_block = AXIOM_SOAP_HEADER_ADD_HEADER_BLOCK(soap_header, env,
- SANDESHA2_WSRM_COMMON_SEQUENCE, rm_ns);
+ SANDESHA2_WSRM_COMMON_SEQ, rm_ns);
if(NULL == seq_block)
{
return NULL;
}
AXIOM_SOAP_HEADER_BLOCK_SET_MUST_UNDERSTAND_WITH_BOOL(seq_block, env,
- sequence_impl->must_understand);
+ seq_impl->must_understand);
seq_node = AXIOM_SOAP_HEADER_BLOCK_GET_BASE_NODE(seq_block, env);
SANDESHA2_IOM_RM_ELEMENT_TO_OM_NODE(((sandesha2_iom_rm_element_t*)
- sequence_impl->identifier), env, seq_node);
+ seq_impl->identifier), env, seq_node);
SANDESHA2_IOM_RM_ELEMENT_TO_OM_NODE(((sandesha2_iom_rm_element_t*)
- sequence_impl->msg_num), env, seq_node);
- if(NULL != sequence_impl->last_msg)
+ seq_impl->msg_num), env, seq_node);
+ if(NULL != seq_impl->last_msg)
{
SANDESHA2_IOM_RM_ELEMENT_TO_OM_NODE(((sandesha2_iom_rm_element_t*)
- sequence_impl->last_msg), env, seq_node);
+ seq_impl->last_msg), env, seq_node);
}
return seq_node;
}
axis2_bool_t AXIS2_CALL
-sandesha2_sequence_is_namespace_supported(sandesha2_iom_rm_element_t *sequence,
+sandesha2_seq_is_namespace_supported(sandesha2_iom_rm_element_t *seq,
const axis2_env_t *env, axis2_char_t *namespace)
{
- sandesha2_sequence_impl_t *sequence_impl = NULL;
+ sandesha2_seq_impl_t *seq_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- sequence_impl = SANDESHA2_INTF_TO_IMPL(sequence);
+ seq_impl = SANDESHA2_INTF_TO_IMPL(seq);
if(0 == AXIS2_STRCMP(namespace, SANDESHA2_SPEC_2005_02_NS_URI))
{
return AXIS2_TRUE;
@@ -370,126 +370,126 @@
}
sandesha2_identifier_t * AXIS2_CALL
-sandesha2_sequence_get_identifier(sandesha2_sequence_t *element,
+sandesha2_seq_get_identifier(sandesha2_seq_t *element,
const axis2_env_t *env)
{
- sandesha2_sequence_impl_t *sequence_impl = NULL;
+ sandesha2_seq_impl_t *seq_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
- sequence_impl = SANDESHA2_INTF_TO_IMPL(element);
+ seq_impl = SANDESHA2_INTF_TO_IMPL(element);
- return sequence_impl->identifier;
+ return seq_impl->identifier;
}
axis2_status_t AXIS2_CALL
-sandesha2_sequence_set_identifier(sandesha2_sequence_t *sequence,
+sandesha2_seq_set_identifier(sandesha2_seq_t *seq,
const axis2_env_t *env,
sandesha2_identifier_t *identifier)
{
- sandesha2_sequence_impl_t *sequence_impl = NULL;
+ sandesha2_seq_impl_t *seq_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- sequence_impl = SANDESHA2_INTF_TO_IMPL(sequence);
- sequence_impl->identifier = identifier;
+ seq_impl = SANDESHA2_INTF_TO_IMPL(seq);
+ seq_impl->identifier = identifier;
return AXIS2_SUCCESS;
}
sandesha2_msg_number_t * AXIS2_CALL
-sandesha2_sequence_get_msg_num(sandesha2_sequence_t *sequence,
+sandesha2_seq_get_msg_num(sandesha2_seq_t *seq,
const axis2_env_t *env)
{
- sandesha2_sequence_impl_t *sequence_impl = NULL;
+ sandesha2_seq_impl_t *seq_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
- sequence_impl = SANDESHA2_INTF_TO_IMPL(sequence);
+ seq_impl = SANDESHA2_INTF_TO_IMPL(seq);
- return sequence_impl->msg_num;
+ return seq_impl->msg_num;
}
axis2_status_t AXIS2_CALL
-sandesha2_sequence_set_msg_num(sandesha2_sequence_t *sequence,
+sandesha2_seq_set_msg_num(sandesha2_seq_t *seq,
const axis2_env_t *env, sandesha2_msg_number_t *msg_num)
{
- sandesha2_sequence_impl_t *sequence_impl = NULL;
+ sandesha2_seq_impl_t *seq_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- sequence_impl = SANDESHA2_INTF_TO_IMPL(sequence);
- sequence_impl->msg_num = msg_num;
+ seq_impl = SANDESHA2_INTF_TO_IMPL(seq);
+ seq_impl->msg_num = msg_num;
return AXIS2_SUCCESS;
}
sandesha2_last_msg_t * AXIS2_CALL
-sandesha2_sequence_get_last_msg(sandesha2_sequence_t *sequence,
+sandesha2_seq_get_last_msg(sandesha2_seq_t *seq,
const axis2_env_t *env)
{
- sandesha2_sequence_impl_t *sequence_impl = NULL;
+ sandesha2_seq_impl_t *seq_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
- sequence_impl = SANDESHA2_INTF_TO_IMPL(sequence);
+ seq_impl = SANDESHA2_INTF_TO_IMPL(seq);
- return sequence_impl->last_msg;
+ return seq_impl->last_msg;
}
axis2_status_t AXIS2_CALL
-sandesha2_sequence_set_last_msg(sandesha2_sequence_t *sequence,
+sandesha2_seq_set_last_msg(sandesha2_seq_t *seq,
const axis2_env_t *env, sandesha2_last_msg_t *last_msg)
{
- sandesha2_sequence_impl_t *sequence_impl = NULL;
+ sandesha2_seq_impl_t *seq_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- sequence_impl = SANDESHA2_INTF_TO_IMPL(sequence);
- sequence_impl->last_msg = last_msg;
+ seq_impl = SANDESHA2_INTF_TO_IMPL(seq);
+ seq_impl->last_msg = last_msg;
return AXIS2_SUCCESS;
}
axis2_bool_t AXIS2_CALL
-sandesha2_sequence_is_must_understand(sandesha2_sequence_t *sequence,
+sandesha2_seq_is_must_understand(sandesha2_seq_t *seq,
const axis2_env_t *env)
{
- sandesha2_sequence_impl_t *sequence_impl = NULL;
+ sandesha2_seq_impl_t *seq_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
- sequence_impl = SANDESHA2_INTF_TO_IMPL(sequence);
- return sequence_impl->must_understand;
+ seq_impl = SANDESHA2_INTF_TO_IMPL(seq);
+ return seq_impl->must_understand;
}
axis2_status_t AXIS2_CALL
-sandesha2_sequence_set_must_understand(sandesha2_sequence_t *sequence,
+sandesha2_seq_set_must_understand(sandesha2_seq_t *seq,
const axis2_env_t *env, axis2_bool_t mu)
{
- sandesha2_sequence_impl_t *sequence_impl = NULL;
+ sandesha2_seq_impl_t *seq_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- sequence_impl = SANDESHA2_INTF_TO_IMPL(sequence);
- sequence_impl->must_understand = mu;
+ seq_impl = SANDESHA2_INTF_TO_IMPL(seq);
+ seq_impl->must_understand = mu;
return AXIS2_SUCCESS;
}
axis2_status_t AXIS2_CALL
-sandesha2_sequence_to_soap_env(sandesha2_iom_rm_part_t *sequence,
+sandesha2_seq_to_soap_env(sandesha2_iom_rm_part_t *seq,
const axis2_env_t *env, axiom_soap_envelope_t *envelope)
{
- sandesha2_sequence_impl_t *sequence_impl = NULL;
+ sandesha2_seq_impl_t *seq_impl = NULL;
axiom_soap_header_t *soap_header = NULL;
axis2_qname_t *seq_qname = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, envelope, AXIS2_FAILURE);
- sequence_impl = SANDESHA2_INTF_TO_IMPL(sequence);
+ seq_impl = SANDESHA2_INTF_TO_IMPL(seq);
soap_header = AXIOM_SOAP_ENVELOPE_GET_HEADER(envelope, env);
/**
* Remove if old exists
*/
- seq_qname = axis2_qname_create(env, SANDESHA2_WSRM_COMMON_SEQUENCE,
- sequence_impl->ns_val, NULL);
+ seq_qname = axis2_qname_create(env, SANDESHA2_WSRM_COMMON_SEQ,
+ seq_impl->ns_val, NULL);
if(NULL == seq_qname)
{
return AXIS2_FAILURE;
}
AXIOM_SOAP_HEADER_REMOVE_HEADER_BLOCK(soap_header, env, seq_qname);
- sandesha2_sequence_to_om_node((sandesha2_iom_rm_element_t*)sequence, env,
+ sandesha2_seq_to_om_node((sandesha2_iom_rm_element_t*)seq, env,
soap_header);
return AXIS2_SUCCESS;
}
Modified: webservices/sandesha/trunk/c/src/wsrm/terminate_seq.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/terminate_seq.c?rev=420822&r1=420821&r2=420822&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/terminate_seq.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/terminate_seq.c Tue Jul 11 05:42:25 2006
@@ -220,7 +220,7 @@
AXIS2_FAILURE);
return NULL;
}
- ts_qname = axis2_qname_create(env, SANDESHA2_WSRM_COMMON_TERMINATE_SEQUENCE,
+ ts_qname = axis2_qname_create(env, SANDESHA2_WSRM_COMMON_TERMINATE_SEQ,
terminate_seq_impl->ns_val, NULL);
if(NULL == ts_qname)
{
@@ -272,7 +272,7 @@
return NULL;
}
ts_element = axiom_element_create(env, NULL,
- SANDESHA2_WSRM_COMMON_TERMINATE_SEQUENCE, rm_ns,
+ SANDESHA2_WSRM_COMMON_TERMINATE_SEQ, rm_ns,
&ts_node);
if(NULL == ts_element)
{
@@ -350,7 +350,7 @@
* Remove if old exists
*/
ts_qname = axis2_qname_create(env,
- SANDESHA2_WSRM_COMMON_TERMINATE_SEQUENCE,
+ SANDESHA2_WSRM_COMMON_TERMINATE_SEQ,
terminate_seq_impl->ns_val, NULL);
if(NULL == ts_qname)
{
Modified: webservices/sandesha/trunk/c/src/wsrm/terminate_seq_res.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/terminate_seq_res.c?rev=420822&r1=420821&r2=420822&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/terminate_seq_res.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/terminate_seq_res.c Tue Jul 11 05:42:25 2006
@@ -237,7 +237,7 @@
return NULL;
}
tsr_qname = axis2_qname_create(env,
- SANDESHA2_WSRM_COMMON_TERMINATE_SEQUENCE_RESPONSE,
+ SANDESHA2_WSRM_COMMON_TERMINATE_SEQ_RESPONSE,
terminate_seq_res_impl->ns_val, NULL);
if(NULL == tsr_qname)
{
@@ -290,7 +290,7 @@
return NULL;
}
tsr_element = axiom_element_create(env, NULL,
- SANDESHA2_WSRM_COMMON_TERMINATE_SEQUENCE_RESPONSE,
+ SANDESHA2_WSRM_COMMON_TERMINATE_SEQ_RESPONSE,
rm_ns, &tsr_node);
if(NULL == tsr_element)
{
@@ -368,7 +368,7 @@
* Remove if old exists
*/
tsr_qname = axis2_qname_create(env,
- SANDESHA2_WSRM_COMMON_TERMINATE_SEQUENCE_RESPONSE,
+ SANDESHA2_WSRM_COMMON_TERMINATE_SEQ_RESPONSE,
terminate_seq_res_impl->ns_val, NULL);
if(NULL == tsr_qname)
{
---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org