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 2007/03/07 12:18:37 UTC
svn commit: r515534 - in /webservices/sandesha/trunk/c: include/
samples/rm_echo_single_1_0/ src/client/ src/handlers/ src/msgprocessors/
src/polling/ src/transport/ src/util/ src/workers/ src/wsrm/
Author: damitha
Date: Wed Mar 7 03:18:30 2007
New Revision: 515534
URL: http://svn.apache.org/viewvc?view=rev&rev=515534
Log:
Please refer axis2c-545. The change sandesha_sender_worker is to
fix this problem. The other changes are just replacing SANDESHA2_VALUE_TRUE
and SANDESHA2_VALUE_FALSE with AXIS2_VALUE_TRUE and AXIS2_VALUE_FALSE
respectively.
Modified:
webservices/sandesha/trunk/c/include/sandesha2_constants.h
webservices/sandesha/trunk/c/samples/rm_echo_single_1_0/rm_echo_single.c
webservices/sandesha/trunk/c/src/client/client.c
webservices/sandesha/trunk/c/src/handlers/sandesha2_global_in_handler.c
webservices/sandesha/trunk/c/src/handlers/sandesha2_in_handler.c
webservices/sandesha/trunk/c/src/handlers/sandesha2_out_handler.c
webservices/sandesha/trunk/c/src/msgprocessors/ack_msg_processor.c
webservices/sandesha/trunk/c/src/msgprocessors/ack_req_msg_processor.c
webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c
webservices/sandesha/trunk/c/src/msgprocessors/close_seq_msg_processor.c
webservices/sandesha/trunk/c/src/msgprocessors/create_seq_msg_processor.c
webservices/sandesha/trunk/c/src/msgprocessors/make_connection_msg_processor.c
webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c
webservices/sandesha/trunk/c/src/polling/polling_mgr.c
webservices/sandesha/trunk/c/src/transport/sandesha2_transport_sender.c
webservices/sandesha/trunk/c/src/util/ack_mgr.c
webservices/sandesha/trunk/c/src/util/fault_mgr.c
webservices/sandesha/trunk/c/src/util/msg_creator.c
webservices/sandesha/trunk/c/src/util/property_mgr.c
webservices/sandesha/trunk/c/src/util/sandesha2_utils.c
webservices/sandesha/trunk/c/src/util/terminate_mgr.c
webservices/sandesha/trunk/c/src/workers/in_order_invoker.c
webservices/sandesha/trunk/c/src/workers/sender_worker.c
webservices/sandesha/trunk/c/src/wsrm/msg_pending.c
Modified: webservices/sandesha/trunk/c/include/sandesha2_constants.h
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/include/sandesha2_constants.h?view=diff&rev=515534&r1=515533&r2=515534
==============================================================================
--- webservices/sandesha/trunk/c/include/sandesha2_constants.h (original)
+++ webservices/sandesha/trunk/c/include/sandesha2_constants.h Wed Mar 7 03:18:30 2007
@@ -439,10 +439,6 @@
#define SANDESHA2_VALUE_EMPTY "empty"
- #define SANDESHA2_VALUE_TRUE "true"
-
- #define SANDESHA2_VALUE_FALSE "false"
-
#define SANDESHA2_MESSAGE_STORE_KEY "Sandesha2MessageStoreKey"
#define SANDESHA2_ORIGINAL_TRANSPORT_OUT_DESC "Sandesha2OriginalTransportSender"
@@ -504,7 +500,6 @@
#define SANDESHA2_BUSY_WAIT_TIME 8
#define SANDESHA2_IS_SVR_SIDE "is_svr_side"
#define SANDESHA2_DB "sandesha2_db"
- #define SANDESHA2_HANDLER_ALREADY_VISITED "sandesha2_visited"
/** @} */
#ifdef __cplusplus
}
Modified: webservices/sandesha/trunk/c/samples/rm_echo_single_1_0/rm_echo_single.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/samples/rm_echo_single_1_0/rm_echo_single.c?view=diff&rev=515534&r1=515533&r2=515534
==============================================================================
--- webservices/sandesha/trunk/c/samples/rm_echo_single_1_0/rm_echo_single.c (original)
+++ webservices/sandesha/trunk/c/samples/rm_echo_single_1_0/rm_echo_single.c Wed Mar 7 03:18:30 2007
@@ -220,7 +220,6 @@
payload = build_om_payload_for_echo_svc(env, "echo2", "sequence1");
result = AXIS2_SVC_CLIENT_SEND_RECEIVE(svc_client, env, payload);
- /*result = sandesha2_client_get_response_envelope(env, conf_ctx, svc_client, 2);*/
if(result)
{
axis2_char_t *om_str = NULL;
@@ -248,7 +247,6 @@
AXIS2_OPTIONS_SET_PROPERTY(options, env, "Sandesha2LastMessage", property);
payload = build_om_payload_for_echo_svc(env, "echo3", "sequence1");
result = AXIS2_SVC_CLIENT_SEND_RECEIVE(svc_client, env, payload);
- /*result = sandesha2_client_get_response_envelope(env, conf_ctx, svc_client, 3);*/
if(result)
{
axis2_char_t *om_str = NULL;
Modified: webservices/sandesha/trunk/c/src/client/client.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/client/client.c?view=diff&rev=515534&r1=515533&r2=515534
==============================================================================
--- webservices/sandesha/trunk/c/src/client/client.c (original)
+++ webservices/sandesha/trunk/c/src/client/client.c Wed Mar 7 03:18:30 2007
@@ -265,7 +265,7 @@
within_transaction_str = (axis2_char_t *) AXIS2_PROPERTY_GET_VALUE(
property, env);
if(within_transaction_str && 0 == axis2_strcmp(within_transaction_str,
- SANDESHA2_VALUE_TRUE))
+ AXIS2_VALUE_TRUE))
{
within_transaction = AXIS2_TRUE;
}
@@ -435,7 +435,7 @@
within_transaction_str = (axis2_char_t *) AXIS2_PROPERTY_GET_VALUE(
property, env);
if(within_transaction_str && 0 == axis2_strcmp(within_transaction_str,
- SANDESHA2_VALUE_TRUE))
+ AXIS2_VALUE_TRUE))
{
within_transaction = AXIS2_TRUE;
}
@@ -582,10 +582,10 @@
property);
}
AXIS2_OPTIONS_SET_PROPERTY(options, env, SANDESHA2_CLIENT_DUMMY_MESSAGE,
- SANDESHA2_VALUE_TRUE);
+ AXIS2_VALUE_TRUE);
AXIS2_SVC_CLIENT_FIRE_AND_FORGET(svc_client, env, NULL);
AXIS2_OPTIONS_SET_PROPERTY(options, env, SANDESHA2_CLIENT_DUMMY_MESSAGE,
- SANDESHA2_VALUE_FALSE);
+ AXIS2_VALUE_FALSE);
return AXIS2_SUCCESS;
}
@@ -1360,7 +1360,7 @@
seq_terminated_bean = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr, env,
out_seq_id, SANDESHA2_SEQ_PROP_SEQ_TERMINATED);
value = sandesha2_seq_property_bean_get_value(seq_terminated_bean, env);
- if(seq_terminated_bean != NULL && 0 == axis2_strcmp(SANDESHA2_VALUE_TRUE, value))
+ if(seq_terminated_bean != NULL && 0 == axis2_strcmp(AXIS2_VALUE_TRUE, value))
{
return AXIS2_TRUE;
}
@@ -1402,7 +1402,7 @@
seq_terminated_bean = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr, env,
out_seq_id, SANDESHA2_SEQ_PROP_SEQ_TIMED_OUT);
value = sandesha2_seq_property_bean_get_value(seq_terminated_bean, env);
- if(seq_terminated_bean != NULL && 0 == axis2_strcmp(SANDESHA2_VALUE_TRUE, value))
+ if(seq_terminated_bean != NULL && 0 == axis2_strcmp(AXIS2_VALUE_TRUE, value))
{
return AXIS2_TRUE;
}
@@ -1597,7 +1597,7 @@
within_transaction_str = (axis2_char_t *) AXIS2_PROPERTY_GET_VALUE(
property, env);
if(within_transaction_str && 0 == axis2_strcmp(within_transaction_str,
- SANDESHA2_VALUE_TRUE))
+ AXIS2_VALUE_TRUE))
{
within_transaction = AXIS2_TRUE;
}
@@ -1983,7 +1983,7 @@
within_transaction_str = (axis2_char_t *) AXIS2_PROPERTY_GET_VALUE(
property, env);
if(within_transaction_str && 0 == axis2_strcmp(within_transaction_str,
- SANDESHA2_VALUE_TRUE))
+ AXIS2_VALUE_TRUE))
{
within_transaction = AXIS2_TRUE;
}
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?view=diff&rev=515534&r1=515533&r2=515534
==============================================================================
--- webservices/sandesha/trunk/c/src/handlers/sandesha2_global_in_handler.c (original)
+++ webservices/sandesha/trunk/c/src/handlers/sandesha2_global_in_handler.c Wed Mar 7 03:18:30 2007
@@ -20,6 +20,7 @@
#include <axis2_svc.h>
#include <axis2_msg_ctx.h>
#include <axis2_property.h>
+#include <axis2_const.h>
#include <axis2_conf_ctx.h>
#include <sandesha2_storage_mgr.h>
#include <sandesha2_msg_ctx.h>
@@ -123,16 +124,6 @@
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "Not a global RM Message");
return AXIS2_SUCCESS;
}
- property = axis2_msg_ctx_get_property(msg_ctx, env,
- SANDESHA2_HANDLER_ALREADY_VISITED, AXIS2_FALSE);
- if(property)
- {
- axis2_char_t *value = axis2_property_get_value(property, env);
- if(0 == axis2_strcmp(SANDESHA2_VALUE_TRUE, value))
- {
- return AXIS2_SUCCESS;
- }
- }
conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(msg_ctx, env);
if(!conf_ctx)
{
@@ -163,7 +154,7 @@
AXIS2_FALSE);
if(property)
reinjected_msg = (axis2_char_t *) AXIS2_PROPERTY_GET_VALUE(property, env);
- if(reinjected_msg && 0 == AXIS2_STRCMP(SANDESHA2_VALUE_TRUE, reinjected_msg))
+ if(reinjected_msg && 0 == AXIS2_STRCMP(AXIS2_VALUE_TRUE, reinjected_msg))
{
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[sandesha2] Detected"
" reinjected_msg");
@@ -182,7 +173,7 @@
if(property)
within_transaction_str = (axis2_char_t *) AXIS2_PROPERTY_GET_VALUE(
property, env);
- if(within_transaction_str && 0 == AXIS2_STRCMP(SANDESHA2_VALUE_TRUE,
+ if(within_transaction_str && 0 == AXIS2_STRCMP(AXIS2_VALUE_TRUE,
within_transaction_str))
{
within_transaction = AXIS2_TRUE;
@@ -193,7 +184,7 @@
transaction = sandesha2_storage_mgr_get_transaction(storage_mgr, env);
prop = axis2_property_create_with_args(env, AXIS2_SCOPE_REQUEST,
- AXIS2_FALSE, 0, SANDESHA2_VALUE_TRUE);
+ AXIS2_FALSE, 0, AXIS2_VALUE_TRUE);
axis2_ctx_set_property(ctx, env, SANDESHA2_WITHIN_TRANSACTION, prop,
AXIS2_FALSE);
}
@@ -207,7 +198,7 @@
axis2_property_t *prop = NULL;
sandesha2_transaction_rollback(transaction, env);
prop = axis2_property_create_with_args(env, AXIS2_SCOPE_REQUEST,
- AXIS2_FALSE, 0, SANDESHA2_VALUE_FALSE);
+ AXIS2_FALSE, 0, AXIS2_VALUE_FALSE);
axis2_ctx_set_property(ctx, env, SANDESHA2_WITHIN_TRANSACTION,
prop, AXIS2_FALSE);
rolled_back = AXIS2_TRUE;
@@ -250,7 +241,7 @@
axis2_property_t *prop = NULL;
sandesha2_transaction_rollback(transaction, env);
prop = axis2_property_create_with_args(env, AXIS2_SCOPE_REQUEST,
- AXIS2_FALSE, 0, SANDESHA2_VALUE_FALSE);
+ AXIS2_FALSE, 0, AXIS2_VALUE_FALSE);
axis2_ctx_set_property(ctx, env, SANDESHA2_WITHIN_TRANSACTION,
prop, AXIS2_FALSE);
rolled_back = AXIS2_TRUE;
@@ -267,13 +258,10 @@
axis2_property_t *prop = NULL;
sandesha2_transaction_commit(transaction, env);
prop = axis2_property_create_with_args(env, AXIS2_SCOPE_REQUEST,
- AXIS2_FALSE, 0, SANDESHA2_VALUE_FALSE);
+ AXIS2_FALSE, 0, AXIS2_VALUE_FALSE);
axis2_ctx_set_property(ctx, env, SANDESHA2_WITHIN_TRANSACTION, prop,
AXIS2_FALSE);
}
- property = axis2_property_create_with_args(env, 0, 0, 0, SANDESHA2_VALUE_TRUE);
- axis2_msg_ctx_set_property(msg_ctx, env, SANDESHA2_HANDLER_ALREADY_VISITED,
- property, AXIS2_FALSE);
AXIS2_LOG_INFO(env->log,
"[sandesha2]Exit sandesha2 global in handler ......");
Modified: webservices/sandesha/trunk/c/src/handlers/sandesha2_in_handler.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/handlers/sandesha2_in_handler.c?view=diff&rev=515534&r1=515533&r2=515534
==============================================================================
--- webservices/sandesha/trunk/c/src/handlers/sandesha2_in_handler.c (original)
+++ webservices/sandesha/trunk/c/src/handlers/sandesha2_in_handler.c Wed Mar 7 03:18:30 2007
@@ -113,7 +113,7 @@
SANDESHA2_APPLICATION_PROCESSING_DONE, AXIS2_FALSE);
if(temp_prop)
str_done = (axis2_char_t *) AXIS2_PROPERTY_GET_VALUE(temp_prop, env);
- if(str_done && 0 == AXIS2_STRCMP(SANDESHA2_VALUE_TRUE, str_done))
+ if(str_done && 0 == AXIS2_STRCMP(AXIS2_VALUE_TRUE, str_done))
{
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
"[sandesha2] Exit: sandesha2_in_handler::invoke, Application " \
@@ -125,7 +125,7 @@
if(temp_prop)
reinjected_msg = (axis2_char_t *) AXIS2_PROPERTY_GET_VALUE(temp_prop,
env);
- if(reinjected_msg && 0 == AXIS2_STRCMP(SANDESHA2_VALUE_TRUE, reinjected_msg))
+ if(reinjected_msg && 0 == AXIS2_STRCMP(AXIS2_VALUE_TRUE, reinjected_msg))
{
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
"[sandesha2] Exit: sandesha2_in_handler::invoke, reinjected_msg");
@@ -140,7 +140,7 @@
if(temp_prop)
within_transaction_str = (axis2_char_t *) AXIS2_PROPERTY_GET_VALUE(
temp_prop, env);
- if(within_transaction_str && 0 == AXIS2_STRCMP(SANDESHA2_VALUE_TRUE,
+ if(within_transaction_str && 0 == AXIS2_STRCMP(AXIS2_VALUE_TRUE,
within_transaction_str))
{
within_transaction = AXIS2_TRUE;
@@ -149,7 +149,7 @@
{
axis2_property_t *prop = NULL;
transaction = sandesha2_storage_mgr_get_transaction(storage_mgr, env);
- prop = axis2_property_create_with_args(env, 0, 0, 0, SANDESHA2_VALUE_TRUE);
+ prop = axis2_property_create_with_args(env, 0, 0, 0, AXIS2_VALUE_TRUE);
axis2_ctx_set_property(ctx, env, SANDESHA2_WITHIN_TRANSACTION, prop,
AXIS2_FALSE);
}
@@ -161,7 +161,7 @@
axis2_property_t *prop = NULL;
sandesha2_transaction_rollback(transaction, env);
prop = axis2_property_create_with_args(env, 0, 0, 0,
- SANDESHA2_VALUE_FALSE);
+ AXIS2_VALUE_FALSE);
axis2_ctx_set_property(ctx, env, SANDESHA2_WITHIN_TRANSACTION,
prop, AXIS2_FALSE);
rolled_back = AXIS2_TRUE;
@@ -183,7 +183,7 @@
sandesha2_transaction_rollback(transaction, env);
prop = axis2_property_create_with_args(env, 0, 0, 0,
- SANDESHA2_VALUE_FALSE);
+ AXIS2_VALUE_FALSE);
axis2_ctx_set_property(ctx, env, SANDESHA2_WITHIN_TRANSACTION,
prop, AXIS2_FALSE);
rolled_back = AXIS2_TRUE;
@@ -194,7 +194,7 @@
axis2_property_t *prop = NULL;
sandesha2_transaction_commit(transaction, env);
prop = axis2_property_create_with_args(env, 0, 0, 0,
- SANDESHA2_VALUE_FALSE);
+ AXIS2_VALUE_FALSE);
axis2_ctx_set_property(ctx, env, SANDESHA2_WITHIN_TRANSACTION,
prop, AXIS2_FALSE);
}
@@ -236,7 +236,7 @@
sandesha2_transaction_commit(transaction, env);
prop = axis2_property_create_with_args(env, 0, 0, 0,
- SANDESHA2_VALUE_FALSE);
+ AXIS2_VALUE_FALSE);
axis2_ctx_set_property(ctx, env, SANDESHA2_WITHIN_TRANSACTION,
prop, AXIS2_FALSE);
}
Modified: webservices/sandesha/trunk/c/src/handlers/sandesha2_out_handler.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/handlers/sandesha2_out_handler.c?view=diff&rev=515534&r1=515533&r2=515534
==============================================================================
--- webservices/sandesha/trunk/c/src/handlers/sandesha2_out_handler.c (original)
+++ webservices/sandesha/trunk/c/src/handlers/sandesha2_out_handler.c Wed Mar 7 03:18:30 2007
@@ -151,14 +151,14 @@
SANDESHA2_APPLICATION_PROCESSING_DONE, AXIS2_FALSE);
if(temp_prop)
str_done = (axis2_char_t *) AXIS2_PROPERTY_GET_VALUE(temp_prop, env);
- if(str_done && 0 == AXIS2_STRCMP(SANDESHA2_VALUE_TRUE, str_done))
+ if(str_done && 0 == AXIS2_STRCMP(AXIS2_VALUE_TRUE, str_done))
{
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
"[sandesha2] Exit: sandesha2_out_handler::invoke, Application \
Processing Done");
return AXIS2_SUCCESS;
}
- temp_prop = axis2_property_create_with_args(env, 0, 0, 0, SANDESHA2_VALUE_TRUE);
+ temp_prop = axis2_property_create_with_args(env, 0, 0, 0, AXIS2_VALUE_TRUE);
axis2_msg_ctx_set_property(msg_ctx, env, SANDESHA2_APPLICATION_PROCESSING_DONE,
temp_prop, AXIS2_FALSE);
conf = AXIS2_CONF_CTX_GET_CONF(conf_ctx, env);
@@ -168,7 +168,7 @@
if(temp_prop)
within_transaction_str = (axis2_char_t *) AXIS2_PROPERTY_GET_VALUE(
temp_prop, env);
- if(within_transaction_str && 0 == AXIS2_STRCMP(SANDESHA2_VALUE_TRUE,
+ if(within_transaction_str && 0 == AXIS2_STRCMP(AXIS2_VALUE_TRUE,
within_transaction_str))
{
within_transaction = AXIS2_TRUE;
@@ -178,7 +178,7 @@
axis2_property_t *prop = NULL;
transaction = sandesha2_storage_mgr_get_transaction(storage_mgr, env);
prop = axis2_property_create_with_args(env, 0, 0, 0,
- SANDESHA2_VALUE_TRUE);
+ AXIS2_VALUE_TRUE);
axis2_msg_ctx_set_property(msg_ctx, env, SANDESHA2_WITHIN_TRANSACTION, prop,
AXIS2_FALSE);
}
@@ -188,7 +188,7 @@
AXIS2_FALSE);
if(NULL != temp_prop)
dummy_msg_str = (axis2_char_t *) AXIS2_PROPERTY_GET_VALUE(temp_prop, env);
- if(dummy_msg_str && 0 == AXIS2_STRCMP(SANDESHA2_VALUE_TRUE, dummy_msg_str))
+ if(dummy_msg_str && 0 == AXIS2_STRCMP(AXIS2_VALUE_TRUE, dummy_msg_str))
{
dummy_msg = AXIS2_TRUE;
}
@@ -241,7 +241,7 @@
axis2_property_t *prop = NULL;
sandesha2_transaction_rollback(transaction, env);
prop = axis2_property_create_with_args(env, 0, 0, 0,
- SANDESHA2_VALUE_FALSE);
+ AXIS2_VALUE_FALSE);
axis2_msg_ctx_set_property(msg_ctx, env, SANDESHA2_WITHIN_TRANSACTION,
prop, AXIS2_FALSE);
rolled_back = AXIS2_TRUE;
@@ -256,7 +256,7 @@
axis2_property_t *prop = NULL;
sandesha2_transaction_commit(transaction, env);
prop = axis2_property_create_with_args(env, 0, 0, 0,
- SANDESHA2_VALUE_FALSE);
+ AXIS2_VALUE_FALSE);
axis2_msg_ctx_set_property(msg_ctx, env, SANDESHA2_WITHIN_TRANSACTION,
prop, AXIS2_FALSE);
}
@@ -265,7 +265,7 @@
SANDESHA2_APPLICATION_PROCESSING_DONE, AXIS2_FALSE);
if(temp_prop)
axis2_property_set_value(temp_prop, env, AXIS2_STRDUP(
- SANDESHA2_VALUE_FALSE, env));
+ AXIS2_VALUE_FALSE, env));
AXIS2_LOG_INFO(env->log, "[sandesha2] Exit: sandesha2_out_handler::invoke");
return AXIS2_SUCCESS;
}
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?view=diff&rev=515534&r1=515533&r2=515534
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/ack_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/ack_msg_processor.c Wed Mar 7 03:18:30 2007
@@ -230,7 +230,7 @@
if(int_seq_id)
sandesha2_seq_mgr_update_last_activated_time(env, int_seq_id,
storage_mgr);
- property = axis2_property_create_with_args(env, 0, 0, 0, SANDESHA2_VALUE_TRUE);
+ property = axis2_property_create_with_args(env, 0, 0, 0, AXIS2_VALUE_TRUE);
AXIS2_MSG_CTX_SET_PROPERTY(msg_ctx, env, SANDESHA2_ACK_PROCSSED, property,
AXIS2_FALSE);
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?view=diff&rev=515534&r1=515533&r2=515534
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/ack_req_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/ack_req_msg_processor.c Wed Mar 7 03:18:30 2007
@@ -214,7 +214,7 @@
}
ack_msg_ctx = sandesha2_utils_create_new_related_msg_ctx(env, rm_msg_ctx,
ack_op);
- property = axis2_property_create_with_args(env, 0, 0, 0, SANDESHA2_VALUE_TRUE);
+ property = axis2_property_create_with_args(env, 0, 0, 0, AXIS2_VALUE_TRUE);
AXIS2_MSG_CTX_SET_PROPERTY(ack_msg_ctx, env,
SANDESHA2_APPLICATION_PROCESSING_DONE, property, AXIS2_FALSE);
ack_rm_msg = sandesha2_msg_init_init_msg(env, ack_msg_ctx);
@@ -269,7 +269,7 @@
axis2_op_ctx_set_response_written(op_ctx, env, AXIS2_TRUE);
property = axis2_property_create_with_args(env, 0, 0, 0,
- SANDESHA2_VALUE_TRUE);
+ AXIS2_VALUE_TRUE);
AXIS2_MSG_CTX_SET_PROPERTY(msg_ctx, env, SANDESHA2_ACK_WRITTEN,
property, AXIS2_FALSE);
@@ -309,7 +309,7 @@
sandesha2_sender_bean_set_msg_type(ack_bean, env, SANDESHA2_MSG_TYPE_ACK);
property = axis2_property_create_with_args(env, 0, 0, 0,
- SANDESHA2_VALUE_FALSE);
+ AXIS2_VALUE_FALSE);
AXIS2_MSG_CTX_SET_PROPERTY(ack_msg_ctx, env,
SANDESHA2_QUALIFIED_FOR_SENDING, property, AXIS2_FALSE);
@@ -364,7 +364,7 @@
AXIS2_FALSE);
property = axis2_property_create_with_args(env, 0, 0, 0,
- SANDESHA2_VALUE_TRUE);
+ AXIS2_VALUE_TRUE);
AXIS2_MSG_CTX_SET_PROPERTY(ack_msg_ctx, env,
SANDESHA2_SET_SEND_TO_TRUE, property, AXIS2_FALSE);
Modified: webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c?view=diff&rev=515534&r1=515533&r2=515534
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c Wed Mar 7 03:18:30 2007
@@ -498,7 +498,7 @@
msg_no, str_seq_id, AXIS2_FALSE);
sandesha2_invoker_mgr_insert(storage_map_mgr, env, invoker_bean);
property = axis2_property_create_with_args(env, 0, 0, 0,
- SANDESHA2_VALUE_TRUE);
+ AXIS2_VALUE_TRUE);
/* To avoid performing application processing more than once. */
sandesha2_msg_ctx_set_property(rm_msg_ctx, env,
SANDESHA2_APPLICATION_PROCESSING_DONE, property);
@@ -710,7 +710,7 @@
SANDESHA2_CLIENT_LAST_MESSAGE, AXIS2_FALSE);
if(property)
last_app_msg = axis2_property_get_value(property, env);
- if(last_app_msg && 0 == axis2_strcmp(last_app_msg, SANDESHA2_VALUE_TRUE))
+ if(last_app_msg && 0 == axis2_strcmp(last_app_msg, AXIS2_VALUE_TRUE))
{
axis2_char_t *spec_ver = NULL;
spec_ver = sandesha2_utils_get_rm_version(env, internal_seq_id,
@@ -770,7 +770,7 @@
SANDESHA2_CLIENT_DUMMY_MESSAGE, AXIS2_FALSE);
if(property)
dummy_msg_str = axis2_property_get_value(property, env);
- if(dummy_msg_str && 0 == axis2_strcmp(dummy_msg_str, SANDESHA2_VALUE_TRUE))
+ if(dummy_msg_str && 0 == axis2_strcmp(dummy_msg_str, AXIS2_VALUE_TRUE))
dummy_msg = AXIS2_TRUE;
if(!dummy_msg)
sandesha2_app_msg_processor_set_next_msg_no(env, internal_seq_id,
@@ -891,7 +891,7 @@
res_create_seq_added = sandesha2_seq_property_bean_create_with_data(
env, internal_seq_id, SANDESHA2_SEQ_PROP_OUT_CREATE_SEQ_SENT,
- SANDESHA2_VALUE_TRUE);
+ AXIS2_VALUE_TRUE);
sandesha2_seq_property_mgr_insert(seq_prop_mgr, env,
res_create_seq_added);
if(AXIS2_MSG_CTX_GET_SVC_CTX(msg_ctx, env))
@@ -965,7 +965,7 @@
AXIS2_FALSE);
if(property)
written = axis2_property_get_value(property, env);
- if(!written || 0 != axis2_strcmp(written, SANDESHA2_VALUE_TRUE))
+ if(!written || 0 != axis2_strcmp(written, AXIS2_VALUE_TRUE))
{
if (op_ctx)
{
@@ -1158,7 +1158,7 @@
AXIS2_MSG_CTX_SET_RELATES_TO(create_seq_msg, env, NULL);
/* Set that the create sequence message is part of a transaction. */
property = axis2_property_create_with_args(env, 0, 0, 0,
- SANDESHA2_VALUE_TRUE);
+ AXIS2_VALUE_TRUE);
axis2_msg_ctx_set_property(create_seq_msg, env, SANDESHA2_WITHIN_TRANSACTION,
property, AXIS2_FALSE);
create_seq_bean = sandesha2_create_seq_bean_create_with_data(env,
@@ -1193,7 +1193,7 @@
sandesha2_sender_bean_set_internal_seq_id(create_seq_entry, env,
internal_seq_id);
sandesha2_sender_bean_set_send(create_seq_entry, env, AXIS2_TRUE);
- property = axis2_property_create_with_args(env, 0, 0, 0, SANDESHA2_VALUE_FALSE);
+ property = axis2_property_create_with_args(env, 0, 0, 0, AXIS2_VALUE_FALSE);
axis2_msg_ctx_set_property(create_seq_msg, env,
SANDESHA2_QUALIFIED_FOR_SENDING, property, AXIS2_FALSE);
sandesha2_sender_bean_set_msg_type(create_seq_entry, env,
@@ -1209,7 +1209,7 @@
axis2_msg_ctx_set_property(create_seq_msg, env,
SANDESHA2_ORIGINAL_TRANSPORT_OUT_DESC, property, AXIS2_FALSE);
trans_out = sandesha2_utils_get_transport_out(env);
- property = axis2_property_create_with_args(env, 0, 0, 0, SANDESHA2_VALUE_TRUE);
+ property = axis2_property_create_with_args(env, 0, 0, 0, AXIS2_VALUE_TRUE);
axis2_msg_ctx_set_property(create_seq_msg, env, SANDESHA2_SET_SEND_TO_TRUE,
property, AXIS2_FALSE);
AXIS2_MSG_CTX_SET_TRANSPORT_OUT_DESC(create_seq_msg, env, trans_out);
@@ -1361,7 +1361,7 @@
if(property)
{
axis2_char_t *value = axis2_property_get_value(property, env);
- if(value && 0 == axis2_strcmp(value, SANDESHA2_VALUE_TRUE))
+ if(value && 0 == axis2_strcmp(value, AXIS2_VALUE_TRUE))
{
if(sandesha2_spec_specific_consts_is_last_msg_indicator_reqd
(env, rm_version))
@@ -1446,7 +1446,7 @@
{
sandesha2_sender_bean_set_send(app_msg_entry, env, AXIS2_TRUE);
property = axis2_property_create_with_args(env, 0, 0, 0,
- SANDESHA2_VALUE_TRUE);
+ AXIS2_VALUE_TRUE);
axis2_msg_ctx_set_property(app_msg_ctx, env,
SANDESHA2_SET_SEND_TO_TRUE, property, AXIS2_FALSE);
}
@@ -1454,7 +1454,7 @@
sandesha2_storage_mgr_store_msg_ctx(storage_mgr, env, storage_key, app_msg_ctx);
sandesha2_sender_mgr_insert(retrans_mgr, env, app_msg_entry);
- property = axis2_property_create_with_args(env, 0, 0, 0, SANDESHA2_VALUE_FALSE);
+ property = axis2_property_create_with_args(env, 0, 0, 0, AXIS2_VALUE_FALSE);
axis2_msg_ctx_set_property(app_msg_ctx, env,
SANDESHA2_QUALIFIED_FOR_SENDING, property, AXIS2_FALSE);
trs_sender = AXIS2_TRANSPORT_OUT_DESC_GET_SENDER(
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?view=diff&rev=515534&r1=515533&r2=515534
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/close_seq_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/close_seq_msg_processor.c Wed Mar 7 03:18:30 2007
@@ -181,7 +181,7 @@
sandesha2_seq_property_bean_set_name(close_seq_bean, env,
SANDESHA2_SEQ_PROP_SEQ_CLOSED);
sandesha2_seq_property_bean_set_value(close_seq_bean, env,
- SANDESHA2_VALUE_TRUE);
+ AXIS2_VALUE_TRUE);
sandesha2_seq_property_mgr_insert(seq_prop_mgr, env, close_seq_bean);
ack_rm_msg = sandesha2_ack_mgr_generate_ack_msg(env, rm_msg_ctx, seq_id,
@@ -208,7 +208,7 @@
(sandesha2_iom_rm_part_t*)seq_ack);
sandesha2_msg_ctx_set_flow(close_seq_res_rm_msg, env, AXIS2_OUT_FLOW);
property = axis2_property_create_with_args(env, 0, 0, 0,
- SANDESHA2_VALUE_TRUE);
+ AXIS2_VALUE_TRUE);
sandesha2_msg_ctx_set_property(close_seq_res_rm_msg, env,
SANDESHA2_APPLICATION_PROCESSING_DONE, property);
/*AXIS2_MSG_CTX_SET_RESPONSE_WRITTEN(close_seq_res_msg, env, AXIS2_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?view=diff&rev=515534&r1=515533&r2=515534
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/create_seq_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/create_seq_msg_processor.c Wed Mar 7 03:18:30 2007
@@ -211,7 +211,7 @@
axis2_msg_ctx_set_flow(out_msg_ctx, env, AXIS2_OUT_FLOW);
property = axis2_property_create_with_args(env, 0, 0, 0,
- SANDESHA2_VALUE_TRUE);
+ AXIS2_VALUE_TRUE);
/* For making sure that this won't be processed again */
sandesha2_msg_ctx_set_property(create_seq_res_msg, env,
SANDESHA2_APPLICATION_PROCESSING_DONE, property);
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?view=diff&rev=515534&r1=515533&r2=515534
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/make_connection_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/make_connection_msg_processor.c Wed Mar 7 03:18:30 2007
@@ -317,7 +317,7 @@
if(property)
qualified_for_sending = axis2_property_get_value(property, env);
if(qualified_for_sending && 0 != axis2_strcmp(
- qualified_for_sending, SANDESHA2_VALUE_TRUE))
+ qualified_for_sending, AXIS2_VALUE_TRUE))
{
printf("not qualified for sending as reply ot MakeConnection\n");
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
Modified: webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c?view=diff&rev=515534&r1=515533&r2=515534
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c Wed Mar 7 03:18:30 2007
@@ -229,7 +229,7 @@
sandesha2_seq_property_bean_set_name(term_rcvd_bean, env,
SANDESHA2_SEQ_PROP_TERMINATE_RECEIVED);
sandesha2_seq_property_bean_set_value(term_rcvd_bean, env,
- SANDESHA2_VALUE_TRUE);
+ AXIS2_VALUE_TRUE);
sandesha2_seq_property_mgr_insert(seq_prop_mgr, env, term_rcvd_bean);
spec_version = sandesha2_msg_ctx_get_rm_spec_ver(rm_msg_ctx, env);
@@ -242,7 +242,7 @@
sandesha2_terminate_mgr_clean_recv_side_after_terminate_msg(env, conf_ctx,
seq_id, storage_mgr);
transmit_bean = sandesha2_seq_property_bean_create_with_data(env, seq_id,
- SANDESHA2_SEQ_PROP_SEQ_TERMINATED, SANDESHA2_VALUE_TRUE);
+ SANDESHA2_SEQ_PROP_SEQ_TERMINATED, AXIS2_VALUE_TRUE);
sandesha2_seq_property_mgr_insert(seq_prop_mgr, env, transmit_bean);
sandesha2_seq_mgr_update_last_activated_time(env, seq_id, storage_mgr);
@@ -389,7 +389,7 @@
sandesha2_msg_ctx_set_flow(out_rm_msg, env, AXIS2_OUT_FLOW);
property = axis2_property_create_with_args(env, 0, 0, 0,
- SANDESHA2_VALUE_TRUE);
+ AXIS2_VALUE_TRUE);
axis2_msg_ctx_set_property(out_msg_ctx, env,
SANDESHA2_APPLICATION_PROCESSING_DONE, property, AXIS2_FALSE);
@@ -419,7 +419,7 @@
sandesha2_sender_bean_set_send(term_res_bean, env, AXIS2_TRUE);
property = axis2_property_create_with_args(env, 0, 0, 0,
- SANDESHA2_VALUE_TRUE);
+ AXIS2_VALUE_TRUE);
axis2_msg_ctx_set_property(msg_ctx, env, SANDESHA2_QUALIFIED_FOR_SENDING,
property, AXIS2_FALSE);
sandesha2_sender_bean_set_resend(term_res_bean, env, AXIS2_FALSE);
@@ -522,7 +522,7 @@
rm_msg_ctx, env), op_ctx);
axis2_allocator_switch_to_local_pool(env->allocator);
- if(terminated && 0 == AXIS2_STRCMP(terminated, SANDESHA2_VALUE_TRUE))
+ if(terminated && 0 == AXIS2_STRCMP(terminated, AXIS2_VALUE_TRUE))
{
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[sandesha2] Terminate was "
"added previously");
@@ -533,7 +533,7 @@
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);
- property = axis2_property_create_with_args(env, 0, 0, 0, SANDESHA2_VALUE_TRUE);
+ property = axis2_property_create_with_args(env, 0, 0, 0, AXIS2_VALUE_TRUE);
axis2_msg_ctx_set_property(msg_ctx, env, SANDESHA2_APPLICATION_PROCESSING_DONE,
property, AXIS2_FALSE);
AXIS2_MSG_CTX_SET_TO(msg_ctx, env, axis2_endpoint_ref_create(env, to_address));
@@ -575,7 +575,7 @@
sandesha2_sender_bean_set_send(term_bean, env, AXIS2_TRUE);
property = axis2_property_create_with_args(env, 0, 0, 0,
- SANDESHA2_VALUE_TRUE);
+ AXIS2_VALUE_TRUE);
axis2_msg_ctx_set_property(msg_ctx, env, SANDESHA2_QUALIFIED_FOR_SENDING,
property, AXIS2_FALSE);
sandesha2_sender_bean_set_resend(term_bean, env, AXIS2_FALSE);
@@ -586,7 +586,7 @@
sandesha2_seq_property_bean_set_name(term_added, env,
SANDESHA2_SEQ_PROP_TERMINATE_ADDED);
sandesha2_seq_property_bean_set_seq_id(term_added, env, out_seq_id);
- sandesha2_seq_property_bean_set_value(term_added, env, SANDESHA2_VALUE_TRUE);
+ sandesha2_seq_property_bean_set_value(term_added, env, AXIS2_VALUE_TRUE);
sandesha2_seq_property_mgr_insert(seq_prop_mgr, env, term_added);
sandesha2_terminate_mgr_terminate_sending_side(env, conf_ctx, int_seq_id,
AXIS2_MSG_CTX_GET_SERVER_SIDE(msg_ctx, env), storage_mgr);
Modified: webservices/sandesha/trunk/c/src/polling/polling_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/polling/polling_mgr.c?view=diff&rev=515534&r1=515533&r2=515534
==============================================================================
--- webservices/sandesha/trunk/c/src/polling/polling_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/polling/polling_mgr.c Wed Mar 7 03:18:30 2007
@@ -370,7 +370,7 @@
* it is sent through the sandesha2_transport_sender
*/
property = axis2_property_create_with_args(env, 0, 0, 0,
- SANDESHA2_VALUE_FALSE);
+ AXIS2_VALUE_FALSE);
sandesha2_msg_ctx_set_property(make_conn_rm_msg_ctx, env,
SANDESHA2_QUALIFIED_FOR_SENDING, property);
if(sender_bean_mgr)
Modified: webservices/sandesha/trunk/c/src/transport/sandesha2_transport_sender.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/transport/sandesha2_transport_sender.c?view=diff&rev=515534&r1=515533&r2=515534
==============================================================================
--- webservices/sandesha/trunk/c/src/transport/sandesha2_transport_sender.c (original)
+++ webservices/sandesha/trunk/c/src/transport/sandesha2_transport_sender.c Wed Mar 7 03:18:30 2007
@@ -182,7 +182,7 @@
conf = AXIS2_CONF_CTX_GET_CONF(conf_ctx, env);
storage_man = sandesha2_utils_get_storage_mgr(env, conf_ctx, conf);
- property = axis2_property_create_with_args(env, 0, 0, 0, SANDESHA2_VALUE_TRUE);
+ property = axis2_property_create_with_args(env, 0, 0, 0, AXIS2_VALUE_TRUE);
AXIS2_MSG_CTX_SET_PROPERTY(msg_ctx, env, SANDESHA2_QUALIFIED_FOR_SENDING,
property, AXIS2_FALSE);
sandesha2_storage_mgr_update_msg_ctx(storage_man, env, key, msg_ctx);
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?view=diff&rev=515534&r1=515533&r2=515534
==============================================================================
--- webservices/sandesha/trunk/c/src/util/ack_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/util/ack_mgr.c Wed Mar 7 03:18:30 2007
@@ -101,7 +101,7 @@
ack_op);
property = axis2_property_create_with_args(env, AXIS2_SCOPE_REQUEST,
- AXIS2_FALSE, 0, SANDESHA2_VALUE_TRUE);
+ AXIS2_FALSE, 0, AXIS2_VALUE_TRUE);
if(property)
{
axis2_msg_ctx_set_property(ack_msg_ctx, env,
@@ -157,7 +157,7 @@
axis2_op_ctx_set_response_written(op_ctx, env, AXIS2_TRUE);
property = axis2_property_create_with_args(env, AXIS2_SCOPE_REQUEST,
- AXIS2_FALSE, 0, SANDESHA2_VALUE_TRUE);
+ AXIS2_FALSE, 0, AXIS2_VALUE_TRUE);
axis2_msg_ctx_set_property(ref_msg, env, SANDESHA2_ACK_WRITTEN, property,
AXIS2_FALSE);
axis2_msg_ctx_set_server_side(ack_msg_ctx, env, AXIS2_TRUE);
@@ -190,7 +190,7 @@
sandesha2_sender_bean_set_send(ack_bean, env, AXIS2_TRUE);
property = axis2_property_create_with_args(env, AXIS2_SCOPE_REQUEST,
- AXIS2_FALSE, 0, SANDESHA2_VALUE_FALSE);
+ AXIS2_FALSE, 0, AXIS2_VALUE_FALSE);
axis2_msg_ctx_set_property(ack_msg_ctx, env,
SANDESHA2_QUALIFIED_FOR_SENDING, property, AXIS2_FALSE);
sandesha2_sender_bean_set_msg_type(ack_bean, env,
@@ -240,7 +240,7 @@
AXIS2_FALSE);
property = axis2_property_create_with_args(env, AXIS2_SCOPE_REQUEST,
- AXIS2_FALSE, 0, SANDESHA2_VALUE_TRUE);
+ AXIS2_FALSE, 0, AXIS2_VALUE_TRUE);
axis2_msg_ctx_set_property(ack_msg_ctx, env,
SANDESHA2_SET_SEND_TO_TRUE, property, AXIS2_FALSE);
Modified: webservices/sandesha/trunk/c/src/util/fault_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/fault_mgr.c?view=diff&rev=515534&r1=515533&r2=515534
==============================================================================
--- webservices/sandesha/trunk/c/src/util/fault_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/util/fault_mgr.c Wed Mar 7 03:18:30 2007
@@ -360,7 +360,7 @@
storage_man, env);
closed_bean = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr, env,
seq_id, SANDESHA2_SEQ_PROP_SEQ_CLOSED);
- if(closed_bean && 0 == AXIS2_STRCMP(SANDESHA2_VALUE_TRUE,
+ if(closed_bean && 0 == AXIS2_STRCMP(AXIS2_VALUE_TRUE,
sandesha2_seq_property_bean_get_value(closed_bean, env)))
{
seq_closed = AXIS2_TRUE;
Modified: webservices/sandesha/trunk/c/src/util/msg_creator.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/msg_creator.c?view=diff&rev=515534&r1=515533&r2=515534
==============================================================================
--- webservices/sandesha/trunk/c/src/util/msg_creator.c (original)
+++ webservices/sandesha/trunk/c/src/util/msg_creator.c Wed Mar 7 03:18:30 2007
@@ -950,7 +950,7 @@
SANDESHA2_SEQ_PROP_SEQ_CLOSED);
if(seq_closed_bean)
str_value = sandesha2_seq_property_bean_get_value(seq_closed_bean, env);
- if(seq_closed_bean && 0 == AXIS2_STRCMP(SANDESHA2_VALUE_TRUE, str_value))
+ if(seq_closed_bean && 0 == AXIS2_STRCMP(AXIS2_VALUE_TRUE, str_value))
{
axis2_bool_t is_allowed = AXIS2_FALSE;
Modified: webservices/sandesha/trunk/c/src/util/property_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/property_mgr.c?view=diff&rev=515534&r1=515533&r2=515534
==============================================================================
--- webservices/sandesha/trunk/c/src/util/property_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/util/property_mgr.c Wed Mar 7 03:18:30 2007
@@ -254,7 +254,7 @@
AXIS2_PARAM_CHECK(env->error, property_bean, AXIS2_FAILURE);
str = sandesha2_utils_trim_string(env, value);
- if(0 == axis2_strcmp(str, SANDESHA2_VALUE_TRUE))
+ if(0 == axis2_strcmp(str, AXIS2_VALUE_TRUE))
sandesha2_property_bean_set_exp_backoff(property_bean, env, AXIS2_TRUE);
else
sandesha2_property_bean_set_exp_backoff(property_bean, env,
@@ -382,7 +382,7 @@
AXIS2_PARAM_CHECK(env->error, property_bean, AXIS2_FAILURE);
str = sandesha2_utils_trim_string(env, value);
- if(0 == axis2_strcmp(str, SANDESHA2_VALUE_TRUE))
+ if(0 == axis2_strcmp(str, AXIS2_VALUE_TRUE))
sandesha2_property_bean_set_in_order(property_bean, env, AXIS2_TRUE);
else
sandesha2_property_bean_set_in_order(property_bean, env, AXIS2_FALSE);
Modified: webservices/sandesha/trunk/c/src/util/sandesha2_utils.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/sandesha2_utils.c?view=diff&rev=515534&r1=515533&r2=515534
==============================================================================
--- webservices/sandesha/trunk/c/src/util/sandesha2_utils.c (original)
+++ webservices/sandesha/trunk/c/src/util/sandesha2_utils.c Wed Mar 7 03:18:30 2007
@@ -1242,7 +1242,7 @@
SANDESHA2_ORIGINAL_TRANSPORT_OUT_DESC, property, AXIS2_FALSE);
property = axis2_property_create_with_args(env, AXIS2_SCOPE_REQUEST,
- AXIS2_FALSE, 0, SANDESHA2_VALUE_TRUE);
+ AXIS2_FALSE, 0, AXIS2_VALUE_TRUE);
AXIS2_MSG_CTX_SET_PROPERTY(msg_ctx, env, SANDESHA2_SET_SEND_TO_TRUE,
property, AXIS2_FALSE);
sandesha2_transport_out = sandesha2_utils_get_transport_out(env);
Modified: webservices/sandesha/trunk/c/src/util/terminate_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/terminate_mgr.c?view=diff&rev=515534&r1=515533&r2=515534
==============================================================================
--- webservices/sandesha/trunk/c/src/util/terminate_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/util/terminate_mgr.c Wed Mar 7 03:18:30 2007
@@ -370,7 +370,7 @@
seq_prop_mgr = sandesha2_storage_mgr_get_seq_property_mgr(storage_mgr, env);
seq_term_bean = sandesha2_seq_property_bean_create_with_data(env, seq_id,
- SANDESHA2_SEQ_PROP_SEQ_TERMINATED, SANDESHA2_VALUE_TRUE);
+ SANDESHA2_SEQ_PROP_SEQ_TERMINATED, AXIS2_VALUE_TRUE);
sandesha2_seq_property_mgr_insert(seq_prop_mgr, env, seq_term_bean);
sandesha2_terminate_mgr_clean_sending_side_data(env, conf_ctx, seq_id,
@@ -465,7 +465,7 @@
seq_prop_mgr = sandesha2_storage_mgr_get_seq_property_mgr(storage_mgr, env);
seq_term_bean = sandesha2_seq_property_bean_create_with_data(env, seq_id,
- SANDESHA2_SEQ_PROP_SEQ_TIMED_OUT, SANDESHA2_VALUE_TRUE);
+ SANDESHA2_SEQ_PROP_SEQ_TIMED_OUT, AXIS2_VALUE_TRUE);
sandesha2_seq_property_mgr_insert(seq_prop_mgr, env, seq_term_bean);
sandesha2_terminate_mgr_clean_sending_side_data(env, conf_ctx, seq_id,
@@ -654,7 +654,7 @@
terminated = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr, env,
out_seq_id, SANDESHA2_SEQ_PROP_TERMINATE_ADDED);
if(terminated && sandesha2_seq_property_bean_get_value(terminated, env)
- && 0 == axis2_strcmp(SANDESHA2_VALUE_TRUE,
+ && 0 == axis2_strcmp(AXIS2_VALUE_TRUE,
sandesha2_seq_property_bean_get_value(terminated, env)))
{
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[sandesha2] Terminate was"
@@ -663,7 +663,7 @@
terminate_rm_msg = sandesha2_msg_creator_create_terminate_seq_msg(env,
rm_msg_ctx, out_seq_id, int_seq_id, storage_mgr);
sandesha2_msg_ctx_set_flow(terminate_rm_msg, env, AXIS2_OUT_FLOW);
- property = axis2_property_create_with_args(env, 0, 0, 0, SANDESHA2_VALUE_TRUE);
+ property = axis2_property_create_with_args(env, 0, 0, 0, AXIS2_VALUE_TRUE);
sandesha2_msg_ctx_set_property(terminate_rm_msg, env,
SANDESHA2_APPLICATION_PROCESSING_DONE, property);
@@ -748,7 +748,7 @@
sandesha2_msg_ctx_get_msg_id(terminate_rm_msg, env));
sandesha2_sender_bean_set_send(terminate_bean, env, AXIS2_TRUE);
- property = axis2_property_create_with_args(env, 0, 0, 0, SANDESHA2_VALUE_FALSE);
+ property = axis2_property_create_with_args(env, 0, 0, 0, AXIS2_VALUE_FALSE);
sandesha2_msg_ctx_set_property(terminate_rm_msg, env,
SANDESHA2_QUALIFIED_FOR_SENDING, property);
@@ -762,7 +762,7 @@
SANDESHA2_SEQ_PROP_TERMINATE_ADDED);
sandesha2_seq_property_bean_set_seq_id(terminate_added, env, out_seq_id);
sandesha2_seq_property_bean_set_value(terminate_added, env,
- SANDESHA2_VALUE_TRUE);
+ AXIS2_VALUE_TRUE);
sandesha2_seq_property_mgr_insert(seq_prop_mgr, env, terminate_added);
@@ -779,7 +779,7 @@
property, AXIS2_FALSE);
property = axis2_property_create_with_args(env, 0, 0, 0,
- SANDESHA2_VALUE_TRUE);
+ AXIS2_VALUE_TRUE);
axis2_msg_ctx_set_property(msg_ctx1, env, SANDESHA2_SET_SEND_TO_TRUE,
property, AXIS2_FALSE);
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?view=diff&rev=515534&r1=515533&r2=515534
==============================================================================
--- webservices/sandesha/trunk/c/src/workers/in_order_invoker.c (original)
+++ webservices/sandesha/trunk/c/src/workers/in_order_invoker.c Wed Mar 7 03:18:30 2007
@@ -229,7 +229,7 @@
AXIS2_MSG_CTX_SET_MESSAGE_ID(msg_ctx, env, NULL);
AXIS2_MSG_CTX_SET_TO(msg_ctx, env, NULL);
AXIS2_MSG_CTX_SET_WSA_ACTION(msg_ctx, env, NULL);
- property = axis2_property_create_with_args(env, 0, 0, 0, SANDESHA2_VALUE_TRUE);
+ property = axis2_property_create_with_args(env, 0, 0, 0, AXIS2_VALUE_TRUE);
AXIS2_MSG_CTX_SET_PROPERTY(msg_ctx, env, SANDESHA2_REINJECTED_MESSAGE,
property, AXIS2_FALSE);
return AXIS2_SUCCESS;
@@ -363,7 +363,7 @@
*/
sandesha2_transaction_commit(transaction, env);
property = axis2_property_create_with_args(env, 0, 0, 0,
- SANDESHA2_VALUE_TRUE);
+ AXIS2_VALUE_TRUE);
AXIS2_MSG_CTX_SET_PROPERTY(msg_to_invoke, env,
SANDESHA2_WITHIN_TRANSACTION, property, AXIS2_FALSE);
@@ -372,7 +372,7 @@
if(property)
post_failure_str = AXIS2_PROPERTY_GET_VALUE(property, env);
if(post_failure_str && 0 == AXIS2_STRCMP(
- post_failure_str, SANDESHA2_VALUE_TRUE))
+ post_failure_str, AXIS2_VALUE_TRUE))
post_failure_invocation = AXIS2_TRUE;
engine = axis2_engine_create(env, invoker->conf_ctx);
if(AXIS2_TRUE == post_failure_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?view=diff&rev=515534&r1=515533&r2=515534
==============================================================================
--- webservices/sandesha/trunk/c/src/workers/sender_worker.c (original)
+++ webservices/sandesha/trunk/c/src/workers/sender_worker.c Wed Mar 7 03:18:30 2007
@@ -310,11 +310,11 @@
property = axis2_msg_ctx_get_property(msg_ctx, env,
SANDESHA2_WITHIN_TRANSACTION, AXIS2_FALSE);
if(property)
- AXIS2_PROPERTY_SET_VALUE(property, env, SANDESHA2_VALUE_TRUE);
+ AXIS2_PROPERTY_SET_VALUE(property, env, AXIS2_VALUE_TRUE);
else
{
property = axis2_property_create_with_args(env, 0, 0, 0,
- SANDESHA2_VALUE_TRUE);
+ AXIS2_VALUE_TRUE);
axis2_msg_ctx_set_property(msg_ctx, env, SANDESHA2_WITHIN_TRANSACTION,
property, AXIS2_FALSE);
}
@@ -341,7 +341,7 @@
if(property)
qualified_for_sending = AXIS2_PROPERTY_GET_VALUE(property, env);
if(qualified_for_sending && 0 != AXIS2_STRCMP(
- qualified_for_sending, SANDESHA2_VALUE_TRUE))
+ qualified_for_sending, AXIS2_VALUE_TRUE))
{
printf("not qualified for sending\n");
sandesha2_transaction_rollback(transaction, env);
@@ -426,11 +426,11 @@
property = axis2_msg_ctx_get_property(msg_ctx, env,
SANDESHA2_WITHIN_TRANSACTION, AXIS2_FALSE);
if(property)
- AXIS2_PROPERTY_SET_VALUE(property, env, SANDESHA2_VALUE_FALSE);
+ AXIS2_PROPERTY_SET_VALUE(property, env, AXIS2_VALUE_FALSE);
else
{
property = axis2_property_create_with_args(env, 0, 0, 0,
- SANDESHA2_VALUE_FALSE);
+ AXIS2_VALUE_FALSE);
axis2_msg_ctx_set_property(msg_ctx, env,
SANDESHA2_WITHIN_TRANSACTION, property, AXIS2_FALSE);
}
@@ -447,11 +447,11 @@
property = axis2_msg_ctx_get_property(msg_ctx, env,
SANDESHA2_WITHIN_TRANSACTION, AXIS2_FALSE);
if(property)
- AXIS2_PROPERTY_SET_VALUE(property, env, SANDESHA2_VALUE_TRUE);
+ AXIS2_PROPERTY_SET_VALUE(property, env, AXIS2_VALUE_TRUE);
else
{
property = axis2_property_create_with_args(env, 0, 0, 0,
- SANDESHA2_VALUE_TRUE);
+ AXIS2_VALUE_TRUE);
axis2_msg_ctx_set_property(msg_ctx, env,
SANDESHA2_WITHIN_TRANSACTION, property, AXIS2_FALSE);
}
@@ -514,11 +514,11 @@
property = axis2_msg_ctx_get_property(msg_ctx, env,
SANDESHA2_WITHIN_TRANSACTION, AXIS2_FALSE);
if(property)
- AXIS2_PROPERTY_SET_VALUE(property, env, SANDESHA2_VALUE_FALSE);
+ AXIS2_PROPERTY_SET_VALUE(property, env, AXIS2_VALUE_FALSE);
else
{
property = axis2_property_create_with_args(env, 0, 0, 0,
- SANDESHA2_VALUE_FALSE);
+ AXIS2_VALUE_FALSE);
axis2_msg_ctx_set_property(msg_ctx, env,
SANDESHA2_WITHIN_TRANSACTION, property, AXIS2_FALSE);
}
@@ -655,6 +655,10 @@
else
AXIS2_ENGINE_RECEIVE(engine, env, res_msg_ctx);
}
+ /* To avoid a second passing through incoming handlers at mep_client */
+ property = axis2_property_create_with_args(env, 0, 0, 0, AXIS2_VALUE_TRUE);
+ axis2_msg_ctx_set_property(msg_ctx, env, AXIS2_HANDLER_ALREADY_VISITED,
+ property, AXIS2_FALSE);
return AXIS2_SUCCESS;
}
Modified: webservices/sandesha/trunk/c/src/wsrm/msg_pending.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/msg_pending.c?view=diff&rev=515534&r1=515533&r2=515534
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/msg_pending.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/msg_pending.c Wed Mar 7 03:18:30 2007
@@ -18,6 +18,7 @@
#include <sandesha2_constants.h>
#include <axiom_soap_header.h>
#include <axiom_soap_header_block.h>
+#include <axis2_const.h>
/**
* @brief Message Pending struct impl
@@ -217,9 +218,9 @@
AXIS2_FAILURE);
}
value = AXIOM_ATTRIBUTE_GET_VALUE(pending_attr, env);
- if(0 == AXIS2_STRCMP(value, SANDESHA2_VALUE_TRUE))
+ if(0 == AXIS2_STRCMP(value, AXIS2_VALUE_TRUE))
pending = AXIS2_TRUE;
- if(0 == AXIS2_STRCMP(value, SANDESHA2_VALUE_FALSE))
+ if(0 == AXIS2_STRCMP(value, AXIS2_VALUE_FALSE))
pending = AXIS2_FALSE;
else
{
@@ -270,9 +271,9 @@
env);
msg_pending_element = AXIOM_NODE_GET_DATA_ELEMENT(msg_pending_node, env);
if(pending)
- attr_value = SANDESHA2_VALUE_TRUE;
+ attr_value = AXIS2_VALUE_TRUE;
else if(!pending)
- attr_value = SANDESHA2_VALUE_FALSE;
+ attr_value = AXIS2_VALUE_FALSE;
pending_attr = axiom_attribute_create(env,
SANDESHA2_WSRM_COMMON_PENDING, attr_value, NULL);
AXIOM_ELEMENT_ADD_ATTRIBUTE(msg_pending_element, env, pending_attr,
---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org